update sql

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

@@ -34,6 +34,7 @@ public interface GoblinNftExSkuMapper extends BaseMapper<GoblinNftExSku> {
      */
     List<GoblinNftExSku> selectGoblinNftExSkuByActivityIds(@Param("activityIds")String activityIds);
 
-    List<GoblinNftExCodeNumDto> selectExCodeNum(@Param("oldActivityId") String oldActivityId, @Param("unbox") String unbox);
+    List<GoblinNftExCodeNumDto> selectExCodeNumAll(@Param("oldActivityId") String oldActivityId);
+    List<GoblinNftExCodeNumDto> selectExCodeNumBox(@Param("oldActivityId") String oldActivityId, @Param("skuId") String skuId);
 
 }

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

@@ -22,7 +22,7 @@
             #{activityId,jdbcType=VARCHAR}
         </foreach>
     </select>
-    <select id="selectExCodeNum" resultType="com.liquidnet.service.goblin.dto.GoblinNftExCodeNumDto">
+    <select id="selectExCodeNumAll" 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.sku_id =
@@ -30,16 +30,20 @@
         <where>
             gnes.activity_id = #{oldActivityId}
             and (gnec.state = 3 or (gnec.state = 1 and gnes.ex_stop_time <![CDATA[<]]> NOW()))
-            <if test="unbox != '' ">
-                and gnes.unbox = #{unbox}
-            </if>
-
-            <if test="unbox == '' ">
             group by gnes.sku_id
-            </if>
-            <if test="unbox == '1' ">
+        </where>
+    </select>
+    <select id="selectExCodeNumBox" 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.sku_id =
+        gnec.sku_id
+        <where>
+            gnes.activity_id = #{oldActivityId}
+            and gnes.sku_id = #{skuId}
+            and (gnec.state = 3 or (gnec.state = 1 and gnes.ex_stop_time <![CDATA[<]]> NOW()))
+            and gnes.unbox = '1'
             group by gnec.box_sku_id
-            </if>
         </where>
     </select>
 

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

@@ -414,8 +414,8 @@ public class GoblinNftExActivityServiceImpl implements IGoblinNftExActivityServi
                 Wrappers.lambdaUpdate(GoblinNftExActivity.class).eq(GoblinNftExActivity::getActivityId, oldActivityId)
         );
 
-        // 查询出所有过期的码 明盒
-        List<GoblinNftExCodeNumDto> exCodeNum = goblinNftExSkuMapper.selectExCodeNum(oldActivityId, "");
+        // 查询出所有过期的码 所有
+        List<GoblinNftExCodeNumDto> exCodeNum = goblinNftExSkuMapper.selectExCodeNumAll(oldActivityId);
         // 重新生成
         List<GoblinNftExCodeTask> goblinNftExCodeTasks = ObjectUtil.getGoblinNftExCodeTaskArrayList();
         for (GoblinNftExCodeNumDto goblinNftExCodeNumDto : exCodeNum) {
@@ -428,8 +428,8 @@ public class GoblinNftExActivityServiceImpl implements IGoblinNftExActivityServi
             goblinNftExCodeTask.setCreatedAt(now);
             if (goblinNftExCodeNumDto.getUnbox().equals("1")) {
                 ArrayList<GoblinNftExCodeTaskRelation> goblinNftExCodeTaskRelations = ObjectUtil.getGoblinNftExCodeTaskRelationArrayList();
-                // 查询出所有过期的码 盲盒盒
-                List<GoblinNftExCodeNumDto> exCodeNumBox = goblinNftExSkuMapper.selectExCodeNum(oldActivityId, "1");
+                // 查询出所有过期的码 盲盒
+                List<GoblinNftExCodeNumDto> exCodeNumBox = goblinNftExSkuMapper.selectExCodeNumBox(oldActivityId, goblinNftExCodeNumDto.getSkuId());
                 Integer sNumber = 0;
                 for (GoblinNftExCodeNumDto codeNumBox : exCodeNumBox) {
                     GoblinNftExCodeTaskRelation goblinNftExCodeTaskRelation = GoblinNftExCodeTaskRelation.getNew();