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

src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java

@@ -1185,7 +1185,8 @@ public class IoCodeTempController extends BaseController {
     public void deleteEmptyBillNo(IoOrderEntity orderEntity) {
         boolean r1 = orderDetailBizService.isExit(orderEntity.getBillNo());
         boolean r2 = ioOrderDetailCodeService.isExit(orderEntity.getBillNo());
-        if (!r1 && !r2) {
+        boolean r3 = codeTempService.isExit(orderEntity.getBillNo());
+        if (!r1 && !r2 && !r3) {
             orderService.deleteByBillNo(orderEntity.getBillNo());
         }
     }

src/main/java/com/glxp/api/service/inout/IoCodeTempService.java

@@ -38,4 +38,6 @@ public interface IoCodeTempService {
      * @return
      */
     List<IoCodeTempResponse> findCodeList(FilterCodeRequest filterCodeRequest);
+
+    boolean isExit(String orderId);
 }

src/main/java/com/glxp/api/service/inout/impl/IoCodeTempServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageHelper;
 import com.glxp.api.dao.inout.IoCodeTempDao;
 import com.glxp.api.entity.inout.IoCodeTempEntity;
+import com.glxp.api.entity.inout.IoOrderDetailCodeEntity;
 import com.glxp.api.req.inout.FilterCodeRequest;
 import com.glxp.api.res.inout.IoCodeTempResponse;
 import com.glxp.api.service.inout.IoCodeTempService;
@@ -86,4 +87,9 @@ public class IoCodeTempServiceImpl implements IoCodeTempService {
         return ioCodeTempDao.selectCodeList(filterCodeRequest);
     }
 
+    @Override
+    public boolean isExit(String orderId) {
+        return ioCodeTempDao.exists(new QueryWrapper<IoCodeTempEntity>().eq("orderId", orderId));
+    }
+
 }

src/main/java/com/glxp/api/task/SyncHeartTask.java

@@ -20,8 +20,8 @@ import javax.annotation.Resource;
 import java.util.Arrays;
 
 
-@Component
-@EnableScheduling
+//@Component
+//@EnableScheduling
 public class SyncHeartTask implements SchedulingConfigurer {
 
     final Logger logger = LoggerFactory.getLogger(SyncHeartTask.class);