Merge branch 'master' of lhm/kmall-haikong into master

kmall-admin/src/main/java/com/kmall/admin/dao/PickUpCodeDao.java

@@ -38,4 +38,6 @@ public interface PickUpCodeDao extends BaseDao<PickUpCodeEntity> {
     void updatePickUpCodeStatusByOrderSn(@Param("orderSn") String orderSn, @Param("pickUpCodeStatus") String pickUpCodeStatus);
 
     void updatePickUpCode(Map<String, String> pickUpCodeMap);
+
+    void updateBatchPickUpCodeStatus(@Param("orderSnList") List<String> orderSnList, @Param("pickUpCodeStatus") String pickUpCodeStatus);
 }

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.dto.*;
 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.HaiKongSendOrderInfoRecordService;
 import com.kmall.admin.utils.jackson.JacksonUtil;
+import com.kmall.common.constant.Dict;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -42,6 +44,9 @@ public class SendOrderInfoTask {
     private HaiKongSendOrderInfoDetailRecordService haiKongSendOrderInfoDetailRecordService;
 
     @Autowired
+    private PickUpCodeService pickUpCodeService;
+
+    @Autowired
     private VmcShopTemplate vmcShopTemplate;
 
     @Scheduled(cron = "0 0/1 * * * ?")
@@ -104,6 +109,8 @@ public class SendOrderInfoTask {
 
         if (!CollectionUtils.isEmpty(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)) {

kmall-admin/src/main/java/com/kmall/admin/service/PickUpCodeService.java

@@ -80,4 +80,6 @@ public interface PickUpCodeService {
     void updatePickUpCodeStatusByOrderSn(String orderSn, String pickUpCodeStatus);
 
     void updatePickUpCode(Map<String,String> pickUpCodeMap);
+
+    void updateBatchPickUpCodeStatus(List<String> orderSnList, String pickUpCodeStatus);
 }

kmall-admin/src/main/java/com/kmall/admin/service/impl/PickUpCodeServiceImpl.java

@@ -110,4 +110,9 @@ public class PickUpCodeServiceImpl implements PickUpCodeService {
     public void updatePickUpCode(Map<String, String> pickUpCodeMap) {
         pickUpCodeDao.updatePickUpCode(pickUpCodeMap);
     }
+
+    @Override
+    public void updateBatchPickUpCodeStatus(List<String> orderSnList, String pickUpCodeStatus) {
+        pickUpCodeDao.updateBatchPickUpCodeStatus(orderSnList, pickUpCodeStatus);
+    }
 }

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

@@ -2,12 +2,16 @@ package com.kmall.admin.service.impl.haikong;
 
 import com.kmall.admin.dao.haikong.HaiKongSendOrderInfoRecordDao;
 import com.kmall.admin.entity.haikong.HaiKongSendOrderInfoRecordEntity;
+import com.kmall.admin.service.PickUpCodeService;
 import com.kmall.admin.service.haikong.HaiKongSendOrderInfoRecordService;
+import com.kmall.common.constant.Dict;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 
 /**

kmall-admin/src/main/resources/mybatis/mapper/PickUpCodeDao.xml

@@ -217,4 +217,12 @@
 		where order_sn = #{orderSn}
 	</update>
 
+    <update id="updateBatchPickUpCodeStatus">
+		update mall_pick_up_code set pick_up_code_status = #{pickUpCodeStatus}
+		where order_sn in
+		<foreach collection="list" item="item" open="(" separator="," close=")">
+			#{item}
+		</foreach>
+	</update>
+
 </mapper>