diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkRewardCouponDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkRewardCouponDTO.java index 038f602f..d20cc373 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkRewardCouponDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkRewardCouponDTO.java @@ -3,10 +3,12 @@ package com.czg.market.dto; import jakarta.validation.constraints.Min; import jakarta.validation.constraints.NotNull; import lombok.Data; +import lombok.experimental.Accessors; import java.io.Serializable; @Data +@Accessors(chain = true) public class MkRewardCouponDTO implements Serializable { @NotNull(message = "用户ID不能为空") private Long userId; diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java index 28ccbb44..60250f60 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java @@ -9,12 +9,9 @@ import com.alibaba.fastjson2.JSONObject; import com.czg.constant.TableValueConstant; import com.czg.exception.ApiNotPrintException; import com.czg.exception.CzgException; -import com.czg.market.dto.MemberConfigDTO; -import com.czg.market.dto.MemberLevelDTO; +import com.czg.market.dto.*; import com.czg.account.entity.*; import com.czg.account.service.*; -import com.czg.market.dto.MemberOrderDTO; -import com.czg.market.dto.MkCouponGiftDTO; import com.czg.market.entity.*; import com.czg.market.service.*; import com.czg.market.vo.MemberConfigVO; @@ -24,6 +21,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; @@ -70,7 +68,7 @@ public class TbMemberConfigServiceImpl extends ServiceImpl giftDTOS = new ArrayList<>(); -// JSONArray.parseArray(memberOrder.getCouponList()).toJavaList(MemberConfigDTO.ConfigCoupon.class).forEach(item -> { -// giftDTOS.add(new MkCouponGiftDTO().setCouponId(item.getCoupon().getId()) -// .setCouponId(item.getCoupon().getId()) -// .setCouponName(item.getCoupon().getTitle()) -// .setSourceName("会员开通赠券") -// .setSourceId(memberOrderId) -// .setType(1) -// .setNum(item.getNum())); -// }); -// couponGiftService.addCouponGift(memberOrderId, "会员开通赠券", 1, giftDTOS); + JSONArray.parseArray(memberOrder.getCouponList()).toJavaList(MemberConfigDTO.ConfigCoupon.class).forEach(item -> { + shopCouponRecordService.grant(shopId, new MkRewardCouponDTO().setCouponId(item.getCoupon().getId()) + .setNum(item.getNum()) + .setUserId(shopUser.getUserId()) + .setShopId(shopId)); + + }); } memberOrder.setStatus(OrderStatusEnums.DONE.getCode());