会员修改
This commit is contained in:
@@ -1,5 +1,6 @@
|
|||||||
package com.czg.market.vo;
|
package com.czg.market.vo;
|
||||||
|
|
||||||
|
import com.czg.account.entity.ShopUser;
|
||||||
import com.czg.market.dto.MemberConfigDTO;
|
import com.czg.market.dto.MemberConfigDTO;
|
||||||
import com.czg.market.entity.MemberLevelConfig;
|
import com.czg.market.entity.MemberLevelConfig;
|
||||||
import jakarta.validation.Valid;
|
import jakarta.validation.Valid;
|
||||||
@@ -27,4 +28,5 @@ public class UMemberConfigVO implements Serializable {
|
|||||||
private Map<String, Object> conditionMap;
|
private Map<String, Object> conditionMap;
|
||||||
private MemberLevelVO memberLevel;
|
private MemberLevelVO memberLevel;
|
||||||
private List<MemberLevelVO> memberLevelList;
|
private List<MemberLevelVO> memberLevelList;
|
||||||
|
private ShopUser shopUser;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ import com.czg.order.entity.OrderInfo;
|
|||||||
import com.czg.order.entity.OrderPayment;
|
import com.czg.order.entity.OrderPayment;
|
||||||
import com.czg.order.service.OrderInfoService;
|
import com.czg.order.service.OrderInfoService;
|
||||||
import com.czg.order.service.OrderPaymentService;
|
import com.czg.order.service.OrderPaymentService;
|
||||||
|
import com.czg.sa.StpKit;
|
||||||
import com.czg.service.market.enums.OrderStatusEnums;
|
import com.czg.service.market.enums.OrderStatusEnums;
|
||||||
import com.czg.service.market.mapper.TbMemberConfigMapper;
|
import com.czg.service.market.mapper.TbMemberConfigMapper;
|
||||||
import com.czg.utils.AssertUtil;
|
import com.czg.utils.AssertUtil;
|
||||||
@@ -142,6 +143,7 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
|
|||||||
}
|
}
|
||||||
|
|
||||||
configVO.setMemberLevelList(levelConfigService.listInfo(shopId));
|
configVO.setMemberLevelList(levelConfigService.listInfo(shopId));
|
||||||
|
configVO.setShopUser(shopUserInfo);
|
||||||
return configVO;
|
return configVO;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -489,6 +491,7 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
memberOrder.setStatus(OrderStatusEnums.DONE.getCode());
|
memberOrder.setStatus(OrderStatusEnums.DONE.getCode());
|
||||||
memberOrderService.updateById(memberOrder);
|
memberOrderService.updateById(memberOrder);
|
||||||
if (shopUser.getMemberLevelId() == null) {
|
if (shopUser.getMemberLevelId() == null) {
|
||||||
|
|||||||
Reference in New Issue
Block a user