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