兑换码

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/CdKeyMgrController.java

@@ -165,15 +165,9 @@ public class CdKeyMgrController extends BaseController {
         long cashedCount = cdKeyList.stream().filter(cdKey -> CdKeyStatusEnum.CASHED.getValue().equals(cdKey.getStatus())).count();
         List<CdKeyExchangeVO> exchangeVOList = mapperFacade.mapAsList(cdKeyList, CdKeyExchangeVO.class);
         exchangeVOList.forEach(cdKeyExchangeVO -> {
-                    cdKeyExchangeVO.setRemainQty((int) unCashedCount);
-                    cdKeyExchangeVO.setCashedQty((int) cashedCount);
-            if (cdKeyExchangeVO.getRefId() == null) {
-                // 盲豆
-                cdKeyExchangeVO.setGoodsName("盲豆");
-            }else {
-                List<CdKeyGroupGoods> goodsList = cdKeyGroupGoodsService.list(new QueryWrapper<CdKeyGroupGoods>().eq("ref_id", cdKeyExchangeVO.getRefId()));
-                cdKeyExchangeVO.setGoodsName(goodsList.get(0).getTitle());
-            }});
+            cdKeyExchangeVO.setRemainQty((int) unCashedCount);
+            cdKeyExchangeVO.setCashedQty((int) cashedCount);
+        });
         TableDataInfo resp = getDataTable(cdKeyList);
         resp.setRows(exchangeVOList);
         return resp;

mp-service/src/main/java/com/qs/mp/admin/domain/CdKey.java

@@ -46,6 +46,14 @@ public class CdKey implements Serializable {
     @TableField("ref_id")
     private String refId;
 
+    @ApiModelProperty("商品名称")
+    @TableField("goods_name")
+    private String goodsName;
+
+    @ApiModelProperty("商品价值")
+    @TableField("value")
+    private Integer value;
+
     /**
      * 商品类型 goods 实物商品 coupon优惠券 coin平台代币 coupon_pkg券包
      */

mp-service/src/main/java/com/qs/mp/admin/domain/vo/CdKeyExchangeVO.java

@@ -23,7 +23,4 @@ public class CdKeyExchangeVO extends CdKey{
 
     @ApiModelProperty("未兑数量")
     private Integer remainQty;
-
-    @ApiModelProperty("商品名称")
-    private String goodsName;
 }

mp-service/src/main/java/com/qs/mp/admin/service/impl/CdKeyGroupServiceImpl.java

@@ -155,15 +155,17 @@ public class CdKeyGroupServiceImpl extends ServiceImpl<CdKeyGroupMapper, CdKeyGr
         QueryWrapper<CdKeyGroupGoods> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("group_id", groupId);
         List<CdKeyGroupGoods> list = cdKeyGroupGoodsService.list(queryWrapper);
-        List<CdKey> cdKeyList = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(list)) {
             for (CdKeyGroupGoods cdKeyGroupGoods : list) {
+                List<CdKey> cdKeyList = new ArrayList<>();
                 for (int i = 0; i < cdKeyGroupGoods.getQuantity(); i++) {
                     // 为每一个商品生成兑换码
                     CdKey cdKey = new CdKey();
                     cdKey.setGroupId(groupId);
                     cdKey.setRefId(cdKeyGroupGoods.getRefId());
                     cdKey.setType(cdKeyGroupGoods.getType());
+                    cdKey.setGoodsName(cdKeyGroupGoods.getTitle());
+                    cdKey.setValue(cdKeyGroupGoods.getValue());
                     cdKey.setPicUrl(cdKeyGroupGoods.getPicUrl());
                     cdKey.setStatus(CdKeyStatusEnum.UNCASHED.getValue());
                     cdKey.setCdKey(cdKeyGenerate());