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

用户端兑换相关

This commit is contained in:
张松 2025-10-22 10:36:14 +08:00
parent 45fe70f28d
commit f210284292
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cash-common/cash-common-service/src/main/java/com/czg/market/vo/MkCouponRedemptionConfigVO.java
View File

@ -1,5 +1,6 @@
package com.czg.market.vo; package com.czg.market.vo;
import com.czg.market.dto.CouponInfoDTO;
import com.czg.market.entity.MkRechargeRedemptionConfig; import com.czg.market.entity.MkRechargeRedemptionConfig;
import com.mybatisflex.annotation.Column; import com.mybatisflex.annotation.Column;
import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.Id;
@ -32,7 +33,7 @@ public class MkCouponRedemptionConfigVO implements Serializable {
/** /**
* 赠送金额 * 赠送金额
*/ */
private List<CouponInfoVO> couponInfoList; private List<CouponInfoDTO> couponInfoList;
/** /**
* 优惠券数量 * 优惠券数量
*/ */

9
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkCouponRedemptionConfigServiceImpl.java
View File

@ -13,6 +13,7 @@ import com.czg.account.service.ShopUserService;
import com.czg.constant.TableValueConstant; import com.czg.constant.TableValueConstant;
import com.czg.enums.ShopUserFlowBizEnum; import com.czg.enums.ShopUserFlowBizEnum;
import com.czg.exception.CzgException; import com.czg.exception.CzgException;
import com.czg.market.dto.CouponInfoDTO;
import com.czg.market.dto.MkCouponRedemptionConfigDTO; import com.czg.market.dto.MkCouponRedemptionConfigDTO;
import com.czg.market.dto.MkRedemptionDTO; import com.czg.market.dto.MkRedemptionDTO;
import com.czg.market.dto.MkShopCouponGiftDTO; import com.czg.market.dto.MkShopCouponGiftDTO;
@ -75,7 +76,7 @@ public class MkCouponRedemptionConfigServiceImpl extends ServiceImpl<MkCouponRed
MkCouponRedemptionConfigVO infoList = BeanUtil.copyProperties(redemptionConfig, MkCouponRedemptionConfigVO.class, "couponInfoList"); MkCouponRedemptionConfigVO infoList = BeanUtil.copyProperties(redemptionConfig, MkCouponRedemptionConfigVO.class, "couponInfoList");
if (StrUtil.isNotBlank(redemptionConfig.getCouponInfoList())) { if (StrUtil.isNotBlank(redemptionConfig.getCouponInfoList())) {
infoList.setCouponInfoList(JSONArray.parseArray(redemptionConfig.getCouponInfoList(), CouponInfoVO.class)); infoList.setCouponInfoList(JSONArray.parseArray(redemptionConfig.getCouponInfoList(), CouponInfoDTO.class));
} }
return infoList; return infoList;
@ -104,8 +105,8 @@ public class MkCouponRedemptionConfigServiceImpl extends ServiceImpl<MkCouponRed
MkCouponRedemptionConfigVO config = BeanUtil.copyProperties(item, MkCouponRedemptionConfigVO.class, "couponInfoList"); MkCouponRedemptionConfigVO config = BeanUtil.copyProperties(item, MkCouponRedemptionConfigVO.class, "couponInfoList");
if (StrUtil.isNotBlank(item.getCouponInfoList())) { if (StrUtil.isNotBlank(item.getCouponInfoList())) {
config.setCouponInfoList(JSONArray.parseArray(item.getCouponInfoList(), CouponInfoVO.class)); config.setCouponInfoList(JSONArray.parseArray(item.getCouponInfoList(), CouponInfoDTO.class));
config.setCouponNum(config.getCouponInfoList().stream().map(CouponInfoVO::getNum).reduce(0, Integer::sum)); config.setCouponNum(config.getCouponInfoList().stream().map(CouponInfoDTO::getNum).reduce(0, Integer::sum));
} }
configList.add(config); configList.add(config);
}); });
@ -246,7 +247,7 @@ public class MkCouponRedemptionConfigServiceImpl extends ServiceImpl<MkCouponRed
if (config.getCouponInfoList() != null && !config.getCouponInfoList().isEmpty()) { if (config.getCouponInfoList() != null && !config.getCouponInfoList().isEmpty()) {
config.getCouponInfoList().forEach(item -> { config.getCouponInfoList().forEach(item -> {
MkShopCouponGiftDTO giftDTO = new MkShopCouponGiftDTO().setCouponId(item.getCoupon().getId()) MkShopCouponGiftDTO giftDTO = new MkShopCouponGiftDTO().setCouponId(item.getId())
.setShopId(mainShopId) .setShopId(mainShopId)
.setSourceId(redemptionCode.getId()) .setSourceId(redemptionCode.getId())
.setShopUserId(shopUserInfo.getId()) .setShopUserId(shopUserInfo.getId())