czg_team
/
cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

超级会员相关

This commit is contained in:
张松 2025-09-11 18:15:39 +08:00
parent 8ad76d3844
commit 9c728249f7
4 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cash-common/cash-common-service/src/main/java/com/czg/market/dto/MemberConfigDTO.java
View File

@ -20,7 +20,7 @@ public class MemberConfigDTO {
public static class ConfigCoupon { public static class ConfigCoupon {
@Min(value = 1, message = "数量不能小于1") @Min(value = 1, message = "数量不能小于1")
private Integer num; private Integer num;
private ShopCoupon shopCoupon; private ShopCoupon coupon;
} }
@Data @Data

2
cash-common/cash-common-service/src/main/java/com/czg/market/service/TbMemberConfigService.java
View File

@ -34,7 +34,7 @@ public interface TbMemberConfigService extends IService<TbMemberConfig> {
* @param userId 用户id * @param userId 用户id
* @return 是否加入成功 * @return 是否加入成功
*/ */
boolean joinMember(Long shopId, Long userId); boolean joinMember(Long shopId, Long userId, Long memberOrderId);
/** /**
* 发放会员奖励 * 发放会员奖励

25
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java
View File

@ -17,6 +17,7 @@ import com.czg.market.entity.ShopCoupon;
import com.czg.market.entity.TbMemberConfig; import com.czg.market.entity.TbMemberConfig;
import com.czg.market.service.MemberLevelConfigService; import com.czg.market.service.MemberLevelConfigService;
import com.czg.market.service.TbMemberConfigService; import com.czg.market.service.TbMemberConfigService;
import com.czg.order.entity.MemberOrder;
import com.czg.order.entity.OrderInfo; 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;
@ -106,10 +107,10 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
memberConfig.setConfigList(JSONObject.toJSONString(memberDTO.getConfigList())); memberConfig.setConfigList(JSONObject.toJSONString(memberDTO.getConfigList()));
} }
if (memberConfig.getConfigList() != null && !memberConfig.getConfigList().isEmpty() && // if (memberConfig.getConfigList() != null && !memberConfig.getConfigList().isEmpty() &&
(memberConfig.getConditionList() != null || !memberConfig.getConditionList().isEmpty())) { // (memberConfig.getConditionList() != null || !memberConfig.getConditionList().isEmpty())) {
throw new CzgException("会员开通方式为单选条件"); // throw new CzgException("会员开通方式为单选条件");
} // }
if (memberDTO.getConditionList() != null && !memberDTO.getConditionList().isEmpty()) { if (memberDTO.getConditionList() != null && !memberDTO.getConditionList().isEmpty()) {
// ArrayList<String> conditionList = CollUtil.newArrayList(conditionMap); // ArrayList<String> conditionList = CollUtil.newArrayList(conditionMap);
@ -238,7 +239,7 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
} }
@Override @Override
public boolean joinMember(Long shopId, Long userId) { public boolean joinMember(Long shopId, Long userId, Long memberOrderId) {
MemberConfigVO memberConfigVO = detail(shopId); MemberConfigVO memberConfigVO = detail(shopId);
ShopUser shopUser = shopUserService.getOne(new QueryWrapper().eq(ShopUser::getShopId, shopId).eq(ShopUser::getUserId, userId)); ShopUser shopUser = shopUserService.getOne(new QueryWrapper().eq(ShopUser::getShopId, shopId).eq(ShopUser::getUserId, userId));
if (shopUser == null) { if (shopUser == null) {
@ -246,8 +247,15 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
return false; return false;
} }
boolean canOpen = false; boolean canOpen = false;
// 条件开通 // 购买开通
if (memberConfigVO.getOpenAmount() == null) { if (memberOrderId != null) {
// MemberOrder memberOrder = memberOrderService.getOne(new QueryWrapper().eq(MemberOrder::getId, payment.getRelatedId()));
// if (memberOrder == null) {
// log.warn("会员购买支付失败，会员订单不存在，会员订单id：{}", payment.getRelatedId());
// return;
// }
// 条件开通
} else if ("CONDITION".equals(memberConfigVO.getOpenType())){
for (MemberConfigDTO.condition item : memberConfigVO.getConditionList()) { for (MemberConfigDTO.condition item : memberConfigVO.getConditionList()) {
canOpen = switch (item.getCode()) { canOpen = switch (item.getCode()) {
case "BIND_PHONE" -> StrUtil.isNotBlank(shopUser.getPhone()); case "BIND_PHONE" -> StrUtil.isNotBlank(shopUser.getPhone());
@ -266,9 +274,6 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
}; };
} }
// 购买开通
} else {
} }
if (canOpen) { if (canOpen) {

8
cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
View File

@ -23,10 +23,7 @@ import com.czg.exception.CzgException;
import com.czg.exception.OrderCancelException; import com.czg.exception.OrderCancelException;
import com.czg.market.service.TbMemberConfigService; import com.czg.market.service.TbMemberConfigService;
import com.czg.order.dto.*; import com.czg.order.dto.*;
import com.czg.order.entity.CashierCart; import com.czg.order.entity.*;
import com.czg.order.entity.OrderDetail;
import com.czg.order.entity.OrderInfo;
import com.czg.order.entity.OrderPayment;
import com.czg.order.enums.PayEnums; import com.czg.order.enums.PayEnums;
import com.czg.order.service.*; import com.czg.order.service.*;
import com.czg.order.vo.*; import com.czg.order.vo.*;
@ -701,7 +698,8 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
} }
}else if ("memberPay".equals(payment.getPayType())) { }else if ("memberPay".equals(payment.getPayType())) {
// memberConfigService.joinMember()
memberConfigService.joinMember(payment.getShopId(), payment.getSourceId(), payment.getRelatedId());
} }
} }
} }