优化

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/couponrecord/service/impl/BizCouponRecordServiceImpl.java

@@ -24,6 +24,8 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import vip.xiaonuo.auth.core.util.StpLoginUserUtil;
+import vip.xiaonuo.biz.modular.couponconfig.entity.CouponConfig;
+import vip.xiaonuo.biz.modular.couponconfig.service.CouponConfigService;
 import vip.xiaonuo.biz.modular.rechargerecord.entity.BizRechargeRecord;
 import vip.xiaonuo.biz.modular.rechargerecord.service.BizRechargeRecordService;
 import vip.xiaonuo.common.enums.CommonSortOrderEnum;
@@ -52,6 +54,8 @@ public class BizCouponRecordServiceImpl extends ServiceImpl<BizCouponRecordMappe
 
     @Resource
     private BizRechargeRecordService bizRechargeRecordService;
+    @Resource
+    private CouponConfigService couponConfigService;
 
     @Override
     public Page<BizCouponRecord> page(BizCouponRecordPageParam bizCouponRecordPageParam) {
@@ -159,9 +163,14 @@ public class BizCouponRecordServiceImpl extends ServiceImpl<BizCouponRecordMappe
         if(ObjectUtil.isNull(bizCouponRecord)){
             throw new CommonException("蛋糕券已核销！");
         }
-        BizRechargeRecord rechargeRecord = bizRechargeRecordService.getById(bizCouponRecord.getRechargeRecordId());
+        /*BizRechargeRecord rechargeRecord = bizRechargeRecordService.getById(bizCouponRecord.getRechargeRecordId());
         if(ObjectUtil.isNotNull(rechargeRecord)){
             bizCouponRecord.setCouponAmount(rechargeRecord.getCouponAmount());
+        }*/
+        CouponConfig couponConfig = couponConfigService.getById(bizCouponRecord.getCouponId());
+        if(ObjectUtil.isNotNull(couponConfig)){
+            bizCouponRecord.setCouponAmount(couponConfig.getCouponAmount());
+            bizCouponRecord.setCouponType(couponConfig.getCouponType());
         }
         return bizCouponRecord;
     }