优化

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/couponconfig/service/impl/CouponConfigServiceImpl.java

@@ -90,8 +90,7 @@ public class CouponConfigServiceImpl extends ServiceImpl<CouponConfigMapper, Cou
 
     @Override
     public List<CouponConfig> getList(CouponConfigPageParam couponConfigPageParam) {
-        List<CouponConfig> couponConfigList = this.list(new QueryWrapper<CouponConfig>().lambda().
-                eq(CouponConfig::getRechargePlanId, couponConfigPageParam.getRechargePlanId()));
+        List<CouponConfig> couponConfigList = this.list();
         return couponConfigList;
     }
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/couponrecord/entity/BizCouponRecord.java

@@ -13,6 +13,8 @@
 package vip.xiaonuo.biz.modular.couponrecord.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.fhs.core.trans.anno.Trans;
+import com.fhs.core.trans.constant.TransType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.Setter;
@@ -98,4 +100,8 @@ public class BizCouponRecord extends CommonEntity {
 
     private String couponId;
 
+    //蛋糕券类型
+    @Trans(type = TransType.DICTIONARY, key = "coupon_type")
+    private String couponType;
+
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/couponrecord/mapper/mapping/BizCouponRecordMapper.xml

@@ -17,12 +17,14 @@
             su.phone,
             u.name destroyUserName,
             so.name destroyOrgName,
-            brr.coupon_amount
+            bcc.coupon_amount,
+            bcc.coupon_type
         from biz_coupon_record bcr
         left join biz_recharge_record brr on bcr.recharge_record_id = brr.id
         left join SYS_USER su on su.id = brr.user_id
         left join SYS_USER u on u.id = bcr.destroy_user
         left join SYS_ORG so on so.id = bcr.org_id
+        left join biz_coupon_config bcc on bcr.coupon_id = bcc.id
         ${ew.customSqlSegment}
     </select>
     <select id="getCouponNoList" resultType="vip.xiaonuo.biz.modular.couponrecord.entity.BizCouponRecord">