Compare commits
10 Commits
6bea1cbb97
...
dd6569c355
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
dd6569c355 | ||
|
|
2616ba4289 | ||
|
|
97f630e5b7 | ||
|
|
5eb68b8112 | ||
|
|
54b11fc32d | ||
|
|
7a1ca5d112 | ||
|
|
2066a55212 | ||
|
|
83fe3e707b | ||
|
|
bbd593e869 | ||
|
|
8a6579db7f |
@@ -7,7 +7,7 @@ import lombok.Getter;
|
|||||||
import lombok.Setter;
|
import lombok.Setter;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 申请信息封装
|
* 订单退货申请结果封装
|
||||||
* Created by macro on 2018/10/18.
|
* Created by macro on 2018/10/18.
|
||||||
*/
|
*/
|
||||||
public class OmsOrderReturnApplyResult extends OmsOrderReturnApply {
|
public class OmsOrderReturnApplyResult extends OmsOrderReturnApply {
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ public interface SmsHomeBrandService {
|
|||||||
int delete(List<Long> ids);
|
int delete(List<Long> ids);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 批量更新推荐状态
|
* 批量更新品牌推荐状态
|
||||||
*/
|
*/
|
||||||
int updateRecommendStatus(List<Long> ids, Integer recommendStatus);
|
int updateRecommendStatus(List<Long> ids, Integer recommendStatus);
|
||||||
|
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ public interface UmsAdminCacheService {
|
|||||||
void delResourceListByRoleIds(List<Long> roleIds);
|
void delResourceListByRoleIds(List<Long> roleIds);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 当资源信息改变时,删除资源项目后台用户缓存
|
* 当资源信息改变时,删除资源相关后台用户缓存
|
||||||
*/
|
*/
|
||||||
void delResourceListByResource(Long resourceId);
|
void delResourceListByResource(Long resourceId);
|
||||||
|
|
||||||
|
|||||||
@@ -62,7 +62,7 @@ public class UmsAdminServiceImpl implements UmsAdminService {
|
|||||||
//先从缓存中获取数据
|
//先从缓存中获取数据
|
||||||
UmsAdmin admin = getCacheService().getAdmin(username);
|
UmsAdmin admin = getCacheService().getAdmin(username);
|
||||||
if (admin != null) return admin;
|
if (admin != null) return admin;
|
||||||
//缓存中没有从数据库中获取
|
//缓存中没有再从数据库中获取
|
||||||
UmsAdminExample example = new UmsAdminExample();
|
UmsAdminExample example = new UmsAdminExample();
|
||||||
example.createCriteria().andUsernameEqualTo(username);
|
example.createCriteria().andUsernameEqualTo(username);
|
||||||
List<UmsAdmin> adminList = adminMapper.selectByExample(example);
|
List<UmsAdmin> adminList = adminMapper.selectByExample(example);
|
||||||
@@ -189,8 +189,8 @@ public class UmsAdminServiceImpl implements UmsAdminService {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int delete(Long id) {
|
public int delete(Long id) {
|
||||||
int count = adminMapper.deleteByPrimaryKey(id);
|
|
||||||
getCacheService().delAdmin(id);
|
getCacheService().delAdmin(id);
|
||||||
|
int count = adminMapper.deleteByPrimaryKey(id);
|
||||||
getCacheService().delResourceList(id);
|
getCacheService().delResourceList(id);
|
||||||
return count;
|
return count;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ public class UmsMenuServiceImpl implements UmsMenuService {
|
|||||||
//没有父菜单时为一级菜单
|
//没有父菜单时为一级菜单
|
||||||
umsMenu.setLevel(0);
|
umsMenu.setLevel(0);
|
||||||
} else {
|
} else {
|
||||||
//有父菜单时选择根据父菜单level设置
|
//有父菜单时为父菜单的level+1
|
||||||
UmsMenu parentMenu = menuMapper.selectByPrimaryKey(umsMenu.getParentId());
|
UmsMenu parentMenu = menuMapper.selectByPrimaryKey(umsMenu.getParentId());
|
||||||
if (parentMenu != null) {
|
if (parentMenu != null) {
|
||||||
umsMenu.setLevel(parentMenu.getLevel() + 1);
|
umsMenu.setLevel(parentMenu.getLevel() + 1);
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ public class GlobalCorsConfig {
|
|||||||
CorsConfiguration config = new CorsConfiguration();
|
CorsConfiguration config = new CorsConfiguration();
|
||||||
//允许所有域名进行跨域调用
|
//允许所有域名进行跨域调用
|
||||||
config.addAllowedOriginPattern("*");
|
config.addAllowedOriginPattern("*");
|
||||||
//允许跨越发送cookie
|
//允许跨域发送cookie
|
||||||
config.setAllowCredentials(true);
|
config.setAllowCredentials(true);
|
||||||
//放行全部原始头信息
|
//放行全部原始头信息
|
||||||
config.addAllowedHeader("*");
|
config.addAllowedHeader("*");
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ import lombok.Setter;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 购物车中带规格和SKU的商品信息
|
* 购物车中带商品属性和SKU库存的商品对象
|
||||||
* Created by macro on 2018/8/2.
|
* Created by macro on 2018/8/2.
|
||||||
*/
|
*/
|
||||||
@Getter
|
@Getter
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ import lombok.Setter;
|
|||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 购物车中促销信息的封装
|
* 带促销信息的购物车商品封装
|
||||||
* Created by macro on 2018/8/27.
|
* Created by macro on 2018/8/27.
|
||||||
*/
|
*/
|
||||||
@Getter
|
@Getter
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ import java.math.BigDecimal;
|
|||||||
public class FlashPromotionProduct extends PmsProduct{
|
public class FlashPromotionProduct extends PmsProduct{
|
||||||
@ApiModelProperty("秒杀价格")
|
@ApiModelProperty("秒杀价格")
|
||||||
private BigDecimal flashPromotionPrice;
|
private BigDecimal flashPromotionPrice;
|
||||||
@ApiModelProperty("用于秒杀到数量")
|
@ApiModelProperty("用于秒杀的数量")
|
||||||
private Integer flashPromotionCount;
|
private Integer flashPromotionCount;
|
||||||
@ApiModelProperty("秒杀限购数量")
|
@ApiModelProperty("秒杀限购数量")
|
||||||
private Integer flashPromotionLimit;
|
private Integer flashPromotionLimit;
|
||||||
|
|||||||
Reference in New Issue
Block a user