兑换码

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

@@ -121,7 +121,8 @@ public class CdKeyMgrController extends BaseController {
                 CdKeyGroupListVO cdKeyGroupListVO = new CdKeyGroupListVO();
                 BeanUtils.copyProperties(cdKeyGroup, cdKeyGroupListVO);
                 Channel channel = channelService.getById(cdKeyGroup.getChannelId());
-                cdKeyGroupListVO.setSiteName(channel.getSiteName() + channel.getMobile());
+                String siteName = channel.getSiteName() == null ? "" : channel.getName();
+                cdKeyGroupListVO.setSiteName(siteName + "(" + channel.getMobile() + ")");
                 return cdKeyGroupListVO;
             }).collect(Collectors.toList());
         }
@@ -187,9 +188,9 @@ public class CdKeyMgrController extends BaseController {
         cdKeyExportList.forEach(cdKey -> {
             CdKeyOrderExcel cdKeyOrderExcel = new CdKeyOrderExcel();
             cdKeyOrderExcel.setCdKey(cdKey.getCdKey());
-            CdKeyGroupGoods groupGoods = cdKeyGroupGoodsService.getOne(new QueryWrapper<CdKeyGroupGoods>().eq("ref_id", cdKey.getRefId()));
-            cdKeyOrderExcel.setGoodsName(groupGoods.getTitle());
-            String picUrl = "https://" + publicBucketName + ".cos." + region + ".myqcloud.com/" + groupGoods.getPicUrl();
+            List<CdKeyGroupGoods> goodsList = cdKeyGroupGoodsService.list(new QueryWrapper<CdKeyGroupGoods>().eq("ref_id", cdKey.getRefId()));
+            cdKeyOrderExcel.setGoodsName(goodsList.get(0).getTitle());
+            String picUrl = "https://" + publicBucketName + ".cos." + region + ".myqcloud.com/" + goodsList.get(0).getPicUrl();
             cdKeyOrderExcel.setPicUrl(picUrl);
             excelList.add(cdKeyOrderExcel);
         });

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

@@ -29,8 +29,8 @@ public class CdKey implements Serializable {
      * 主键
      */
     @ApiModelProperty("主键")
-    @TableId(value = "key_id", type = IdType.INPUT)
-    private String keyId;
+    @TableId(value = "key_id", type = IdType.AUTO)
+    private Long keyId;
 
     /**
      * 兑换码组id

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

@@ -155,13 +155,12 @@ public class CdKeyGroupServiceImpl extends ServiceImpl<CdKeyGroupMapper, CdKeyGr
                 for (int i = 0; i < cdKeyGroupGoods.getQuantity(); i++) {
                     // 为每一个商品生成兑换码
                     CdKey cdKey = new CdKey();
-                    cdKey.setKeyId(bizIdGenerator.newIdWithUidSharding(groupId));
                     cdKey.setGroupId(groupId);
                     cdKey.setRefId(cdKeyGroupGoods.getRefId());
                     cdKey.setType(cdKeyGroupGoods.getType());
                     cdKey.setPicUrl(cdKeyGroupGoods.getPicUrl());
                     cdKey.setStatus(CdKeyStatusEnum.UNCASHED.getValue());
-                    cdKey.setCdKey(cdKeyGenerate(cdKey.getKeyId()));
+                    cdKey.setCdKey(cdKeyGenerate());
                     cdKey.setCreateTime(new Date());
                     cdKeyList.add(cdKey);
                 }
@@ -177,7 +176,7 @@ public class CdKeyGroupServiceImpl extends ServiceImpl<CdKeyGroupMapper, CdKeyGr
 
     }
 
-    private String cdKeyGenerate(String keyId) {
+    private String cdKeyGenerate() {
         // 生成16位大写字母和数字的随机卡密码的逻辑
         // 可以使用随机数生成器或者其他方式实现
         String characters = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";