소스 검색

更新同步任务,防止之前的订单卡死

yuhongqi 1 개월 전
부모
커밋
6922687df1

+ 5 - 5
fs-admin/src/main/java/com/fs/task/StoreTask.java

@@ -4,6 +4,7 @@ import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONUtil;
 import com.fs.common.annotation.QuartzRunnable;
 import com.fs.common.core.redis.RedisCache;
+import com.fs.common.utils.DateUtils;
 import com.fs.common.utils.StringUtils;
 import com.fs.huifuPay.domain.HuiFuQueryOrderResult;
 import com.fs.huifuPay.dto.*;
@@ -55,10 +56,7 @@ import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 import static com.fs.store.constants.StoreConstants.DELIVERY;
 
@@ -253,8 +251,10 @@ public class StoreTask {
     @QuartzRunnable(name = "发货任务")
     public void deliveryOp() {
         List<FsStoreOrder> list = orderService.selectDeliverPenddingData();
-
+        Date nowDate = DateUtils.getNowDate();
         for (FsStoreOrder order: list) {
+            order.setUpdateTime(nowDate);
+            orderService.updateFsStoreOrderDb(order);
             String orderCode = order.getOrderCode();
             ErpOrderQueryRequert request = new ErpOrderQueryRequert();
             request.setCode(order.getExtendOrderId());

+ 2 - 0
fs-service-system/src/main/java/com/fs/store/service/IFsStoreOrderService.java

@@ -308,4 +308,6 @@ public interface IFsStoreOrderService
     R getInfo2(Long id, Integer type);
 
     List<FsStoreOrder> selectBankOrder();
+
+    void updateFsStoreOrderDb(FsStoreOrder order);
 }

+ 5 - 0
fs-service-system/src/main/java/com/fs/store/service/impl/FsStoreOrderServiceImpl.java

@@ -1985,6 +1985,11 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
         return fsStoreOrderMapper.selectBankOrder();
     }
 
+    @Override
+    public void updateFsStoreOrderDb(FsStoreOrder order) {
+        fsStoreOrderMapper.updateFsStoreOrder(order);
+    }
+
     @Override
     @Transactional(rollbackFor = Throwable.class,propagation = Propagation.REQUIRED)
     //类型1支付回调 类型2货到付款

+ 1 - 1
fs-service-system/src/main/resources/mapper/store/FsStoreOrderMapper.xml

@@ -466,7 +466,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         GROUP BY t.type
     </select>
     <select id="selectDeliverPendingData" resultType="com.fs.store.domain.FsStoreOrder">
-        select * from fs_store_order where extend_order_id is not null and `status`=1
+        select * from fs_store_order where extend_order_id is not null and `status`=1 order by update_time
     </select>
     <select id="selectFsOutDateOrder" resultType="com.fs.store.domain.FsStoreOrder">
         SELECT id