delay完善 sql

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

@@ -29,14 +29,18 @@
         gnec.activity_id
         <where>
             gnes.activity_id = #{oldActivityId}
+            and gnec.state = 3 or (gnec.state = 1 or gnes.ex_stop_time <![CDATA[<]]> NOW())
+            <if test="unbox != '' ">
                 and gnes.unbox = #{unbox}
-        </where>
-        <if test="unbox == '0' ">
+            </if>
+
+            <if test="unbox == '' ">
                 group by gnes.sku_id
             </if>
             <if test="unbox == '1' ">
                 group by gnec.box_sku_id
             </if>
+        </where>
     </select>
 
     <insert id="addGoblinNftExSkus">

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

@@ -23,6 +23,7 @@ import org.apache.poi.ss.usermodel.HorizontalAlignment;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.OutputStream;
@@ -357,6 +358,7 @@ public class GoblinNftExActivityServiceImpl implements IGoblinNftExActivityServi
         return response.getOutputStream();
     }
 
+    @Transactional
     @Override
     public ResponseDto delay(GoblinNftExActivityDelayParam delayParam) {
         // 结束时间不能大于开始时间
@@ -405,6 +407,7 @@ public class GoblinNftExActivityServiceImpl implements IGoblinNftExActivityServi
         for (GoblinNftExCodeNumDto goblinNftExCodeNumDto : exCodeNum) {
             // 定时任务对象构建
             GoblinNftExCodeTask goblinNftExCodeTask = GoblinNftExCodeTask.getNew().copy(goblinNftExCodeNumDto);
+            goblinNftExCodeTask.setActivityId(activityId);
             goblinNftExCodeTask.setTaskId(IDGenerator.nextSnowId());
             goblinNftExCodeTask.setExStartTime(delayParam.getStartTime());
             goblinNftExCodeTask.setExStopTime(delayParam.getEndTime());