批量空投

liquidnet-bus-do/liquidnet-service-goblin-do/src/main/resources/com.liquidnet.service.goblin.mapper/GoblinNftExCodeMapper.xml

@@ -82,7 +82,7 @@
         select
         DISTINCT
         gnec.code,gnec.code_id,gnec.sku_id,gnec.box_sku_id,gnec.activity_id,gnec.state,gnec.redeem_uid,gnec.redeem_at,gnec.admin_uid,gnec.created_at
-        from goblin_nft_ex_code gnec inner join goblin_nft_ex_sku gnes on gnec.sku_id = gnes.sku_id
+        from goblin_nft_ex_code gnec inner join goblin_nft_ex_sku gnes on gnec.sku_id = gnes.sku_id and gnes.activity_id = gnec.activity_id
         <if test="code != null and code != ''">
             and gnec.code = #{code,jdbcType=VARCHAR}
         </if>
@@ -147,7 +147,7 @@
         select count(DISTINCT gnec.code)
         from goblin_nft_ex_code gnec inner join goblin_nft_ex_sku gnes
         on
-        gnec.sku_id = gnes.sku_id
+        gnec.sku_id = gnes.sku_id and gnes.activity_id = gnec.activity_id
         <if test="code != null and code != ''">
             and gnec.code = #{code,jdbcType=VARCHAR}
         </if>

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/goblin/GoblinNftExCodeServiceImpl.java

@@ -276,12 +276,10 @@ public class GoblinNftExCodeServiceImpl implements IGoblinNftExCodeService {
         StringBuffer skuIds = new StringBuffer();
         StringBuffer acticityIds = new StringBuffer();
         for (GoblinNftExCode gnc : goblinNftExCodes) {
-            if (StringUtil.isNotBlank(gnc.getSkuId())) {
             skuIds.append(gnc.getSkuId()).append(",");
-            } else {
+            if (StringUtil.isNotBlank(gnc.getBoxSkuId())) {
                 skuIds.append(gnc.getBoxSkuId()).append(",");
             }
-
             acticityIds.append(gnc.getActivityId()).append(",");
         }
 
@@ -292,18 +290,17 @@ public class GoblinNftExCodeServiceImpl implements IGoblinNftExCodeService {
             // 批量查询
             List<GoblinGoodsSku> goblinGoodsSkus = goblinGoodsSkuMapper.selectBySkuIds(skuIds.toString());
             for (GoblinNftExCode gnc : goblinNftExCodes) {
+                GoblinNftExCodeVo goblinNftExCodeVo = GoblinNftExCodeVo.getNew().copy(gnc);
                 for (GoblinGoodsSku goblinGoodsSku : goblinGoodsSkus) {
+                    if (goblinNftExCodeVo.getSkuId().equals(goblinGoodsSku.getSkuId())) {
+                        goblinNftExCodeVo.setSkuName(goblinGoodsSku.getName());
+                    }
 
-                    GoblinNftExCodeVo goblinNftExCodeVo = GoblinNftExCodeVo.getNew().copy(gnc);
+                    if (gnc.getState().equals(2)) {
                         if (StringUtil.isNotBlank(gnc.getBoxSkuId()) && gnc.getBoxSkuId().equals(goblinGoodsSku.getSkuId())) {
-                        goblinNftExCodeVo.setSkuName(goblinGoodsSku.getName());
-                        goblinNftExCodeArrayList.add(goblinNftExCodeVo);
-                        break;
-                    } else {
-                        if (StringUtil.isBlank(gnc.getBoxSkuId()) && gnc.getSkuId().equals(goblinGoodsSku.getSkuId())) {
-                            goblinNftExCodeVo.setSkuName(goblinGoodsSku.getName());
-                            goblinNftExCodeArrayList.add(goblinNftExCodeVo);
-                            break;
+                            goblinNftExCodeVo.setResultSkuName(goblinGoodsSku.getName());
+                        } else if (StringUtil.isBlank(gnc.getBoxSkuId()) && gnc.getSkuId().equals(goblinGoodsSku.getSkuId())) {
+                            goblinNftExCodeVo.setResultSkuName(goblinGoodsSku.getName());
                         }
                     }
                 }