Merge remote-tracking branch 'origin/jxl_2262_exchange_ext' into jxl_2262_exchange_ext

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

@@ -25,11 +25,11 @@
     <select id="selectExCodeNum" resultType="com.liquidnet.service.goblin.dto.GoblinNftExCodeNumDto">
         select gnes.activity_id, gnes.store_id, gnes.spu_id, gnes.sku_id, gnes.unbox, gnes.ex_start_time, gnes.ex_stop_time, count(*) as num, gnec.box_sku_id
         from goblin_nft_ex_sku as gnes
-        left join goblin_nft_ex_code as gnec on gnes.activity_id = gnec.activity_id and gnes.activity_id =
-        gnec.activity_id
+        left join goblin_nft_ex_code as gnec on gnes.activity_id = gnec.activity_id and gnes.sku_id =
+        gnec.sku_id
         <where>
             gnes.activity_id = #{oldActivityId}
-            and gnec.state = 3 or (gnec.state = 1 or gnes.ex_stop_time <![CDATA[<]]> NOW())
+            and (gnec.state = 3 or (gnec.state = 1 and gnes.ex_stop_time <![CDATA[<]]> NOW()))
             <if test="unbox != '' ">
                 and gnes.unbox = #{unbox}
             </if>

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

@@ -399,7 +399,7 @@ public class GoblinNftExActivityServiceImpl implements IGoblinNftExActivityServi
         goblinNftExActivity.setUid(uid);
         goblinNftExActivity.setTitle(title);
         goblinNftExActivity.setCreatedAt(now);
-//        goblinNftExActivityMapper.addGoblinNftExActivity(goblinNftExActivity);
+        goblinNftExActivityMapper.addGoblinNftExActivity(goblinNftExActivity);
         // TODO: 2022/6/2 是否需要更新活动标识 记录延期过
 
         // 查询出所有过期的码 明盒
@@ -428,14 +428,14 @@ public class GoblinNftExActivityServiceImpl implements IGoblinNftExActivityServi
                     goblinNftExCodeTaskRelations.add(goblinNftExCodeTaskRelation);
                     sNumber += codeNumBox.getNum();
                 }
-//                goblinNftExCodeTaskRelationMapper.inserts(goblinNftExCodeTaskRelations);
+                goblinNftExCodeTaskRelationMapper.inserts(goblinNftExCodeTaskRelations);
                 goblinNftExCodeTask.setExStock(sNumber);
             }
 
             goblinNftExCodeTasks.add(goblinNftExCodeTask);
         }
         if (goblinNftExCodeTasks.size() > 0) {
-//            goblinNftExCodeTaskMapper.addGoblinNftExCodeTasks(goblinNftExCodeTasks);
+            goblinNftExCodeTaskMapper.addGoblinNftExCodeTasks(goblinNftExCodeTasks);
         }
 
         return ResponseDto.success("操作成功");