1
0
فهرست منبع

fix bug:重推订单创建接口未更新小票码状态

lhm 3 سال پیش
والد
کامیت
fe0d52145d

+ 7 - 0
kmall-admin/src/main/java/com/kmall/admin/haikong/task/SendOrderInfoTask.java

@@ -8,9 +8,11 @@ import com.kmall.admin.haikong.client.VmcShopTemplate;
 import com.kmall.admin.haikong.constant.HaiKongMemberOrderResendStatusEnum;
 import com.kmall.admin.haikong.constant.HaiKongMemberOrderResendStatusEnum;
 import com.kmall.admin.haikong.dto.*;
 import com.kmall.admin.haikong.dto.*;
 import com.kmall.admin.haikong.utils.Response;
 import com.kmall.admin.haikong.utils.Response;
+import com.kmall.admin.service.PickUpCodeService;
 import com.kmall.admin.service.haikong.HaiKongSendOrderInfoDetailRecordService;
 import com.kmall.admin.service.haikong.HaiKongSendOrderInfoDetailRecordService;
 import com.kmall.admin.service.haikong.HaiKongSendOrderInfoRecordService;
 import com.kmall.admin.service.haikong.HaiKongSendOrderInfoRecordService;
 import com.kmall.admin.utils.jackson.JacksonUtil;
 import com.kmall.admin.utils.jackson.JacksonUtil;
+import com.kmall.common.constant.Dict;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanUtils;
@@ -42,6 +44,9 @@ public class SendOrderInfoTask {
     private HaiKongSendOrderInfoDetailRecordService haiKongSendOrderInfoDetailRecordService;
     private HaiKongSendOrderInfoDetailRecordService haiKongSendOrderInfoDetailRecordService;
 
 
     @Autowired
     @Autowired
+    private PickUpCodeService pickUpCodeService;
+
+    @Autowired
     private VmcShopTemplate vmcShopTemplate;
     private VmcShopTemplate vmcShopTemplate;
 
 
     @Scheduled(cron = "0 0/1 * * * ?")
     @Scheduled(cron = "0 0/1 * * * ?")
@@ -104,6 +109,8 @@ public class SendOrderInfoTask {
 
 
         if (!CollectionUtils.isEmpty(successList)) {
         if (!CollectionUtils.isEmpty(successList)) {
             haiKongSendOrderInfoRecordService.updateResendStatusBatch(successList);
             haiKongSendOrderInfoRecordService.updateResendStatusBatch(successList);
+            List<String> orderSnList = successList.stream().map(HaiKongSendOrderInfoRecordEntity::getOuterOrderNo).collect(Collectors.toList());
+            pickUpCodeService.updateBatchPickUpCodeStatus(orderSnList, Dict.PickUpCodeStatusEnum.item_0.getStatus());
         }
         }
 
 
         if (!CollectionUtils.isEmpty(failedList)) {
         if (!CollectionUtils.isEmpty(failedList)) {

+ 0 - 6
kmall-admin/src/main/java/com/kmall/admin/service/impl/haikong/HaikongSendOrderInfoRecordServiceImpl.java

@@ -26,9 +26,6 @@ public class HaikongSendOrderInfoRecordServiceImpl implements HaiKongSendOrderIn
     @Autowired
     @Autowired
     private HaiKongSendOrderInfoRecordDao haikongSendOrderInfoRecordDao;
     private HaiKongSendOrderInfoRecordDao haikongSendOrderInfoRecordDao;
 
 
-    @Autowired
-    private PickUpCodeService pickUpCodeService;
-
     @Override
     @Override
     public HaiKongSendOrderInfoRecordEntity queryObject(Integer id) {
     public HaiKongSendOrderInfoRecordEntity queryObject(Integer id) {
         return haikongSendOrderInfoRecordDao.queryObject(id);
         return haikongSendOrderInfoRecordDao.queryObject(id);
@@ -75,10 +72,7 @@ public class HaikongSendOrderInfoRecordServiceImpl implements HaiKongSendOrderIn
     }
     }
 
 
     @Override
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public void updateResendStatusBatch(List<HaiKongSendOrderInfoRecordEntity> entities) {
     public void updateResendStatusBatch(List<HaiKongSendOrderInfoRecordEntity> entities) {
         haikongSendOrderInfoRecordDao.updateResendStatusBatch(entities);
         haikongSendOrderInfoRecordDao.updateResendStatusBatch(entities);
-        List<String> orderSnList = entities.stream().map(HaiKongSendOrderInfoRecordEntity::getOuterOrderNo).collect(Collectors.toList());
-        pickUpCodeService.updateBatchPickUpCodeStatus(orderSnList, Dict.PickUpCodeStatusEnum.item_0.getStatus());
     }
     }
 }
 }