Merge branch 'dev' into pre-production

blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IOrderClient.java

@@ -61,5 +61,9 @@ public interface IOrderClient {
 	@GetMapping(API_PREFIX + "/getTotalCountByInventory")
 	Integer getTotalCountByInventory(@RequestParam String param, @RequestParam Integer oldWarehouseId);
 
+	@GetMapping(API_PREFIX + "/findOrderCodeListByPageWithInventoryId")
 	List<String> findOrderCodeListByPageWithInventoryId(@RequestParam String param, @RequestParam Integer oldWarehouseId, @RequestParam Integer pageNum, @RequestParam Integer pageSize);
+
+	@GetMapping(API_PREFIX + "/updateStatusWithTableName")
+	void updateStatusWithTableName(@RequestParam int isUpdate, @RequestParam String orderCode, @RequestParam String tableName);
 }

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/OrderClient.java

@@ -81,4 +81,9 @@ public class OrderClient implements IOrderClient {
 	public List<String> findOrderCodeListByPageWithInventoryId(String param, Integer oldWarehouseId, Integer pageNum, Integer pageSize) {
 		return orderService.findOrderCodeListByPageWithInventoryId(param,oldWarehouseId,pageNum,pageSize);
 	}
+
+	@Override
+	public void updateStatusWithTableName(int isUpdate, String orderCode, String tableName) {
+		orderService.updateStatusWithTableName(isUpdate,orderCode,tableName);
+	}
 }

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/OrderMapper.java

@@ -43,4 +43,6 @@ public interface OrderMapper extends BaseMapper<OrderEntity> {
 	Integer getTotalCountByInventory(@Param("param") String param, @Param("oldWarehouseId") Integer oldWarehouseId);
 
 	List<String> findOrderCodeListByPageWithInventoryId(@Param("param") String param, @Param("oldWarehouseId") Integer oldWarehouseId, @Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize);
+
+	void updateStatusWithTableName(@Param("isUpdate") int isUpdate, @Param("orderCode") String orderCode, @Param("tableName") String tableName);
 }

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/OrderMapper.xml

@@ -77,8 +77,6 @@
         `i`.`update_time` DESC
     </select>
 
-
-
     <select id="findOrderCodeListByPageWithInventoryId" resultType="java.lang.String">
         SELECT
         `i`.`orderSelfNum`
@@ -99,7 +97,7 @@
         `i`.`id` ASC
         LIMIT #{pageNum},#{pageSize}
     </select>
-    findOrderCodeListByPage
+
     <select id="findOrderCodeListByPage" resultType="java.lang.String">
         select t.orderSelfNum
         from ${tableName} `o`
@@ -180,4 +178,10 @@
         LIMIT #{pageNum},#{pageSize}
     </select>
 
+    <update id="updateStatusWithTableName">
+        update ${tableName}
+        set is_update = #{isUpdate}
+        where order_code = #{orderCode}
+    </update>
+
 </mapper>

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/IOrderService.java

@@ -23,4 +23,6 @@ public interface IOrderService {
 	Integer getTotalCountByInventory(String param, Integer oldWarehouseId);
 
 	List<String> findOrderCodeListByPageWithInventoryId(String param, Integer oldWarehouseId, Integer pageNum, Integer pageSize);
+
+	void updateStatusWithTableName(int isUpdate, String orderCode, String tableName);
 }

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/OrderServiceImpl.java

@@ -68,4 +68,9 @@ public class OrderServiceImpl implements IOrderService {
 	public List<String> findOrderCodeListByPageWithInventoryId(String param, Integer oldWarehouseId, Integer pageNum, Integer pageSize) {
 		return orderMapper.findOrderCodeListByPageWithInventoryId(param,oldWarehouseId,pageNum,pageSize);
 	}
+
+	@Override
+	public void updateStatusWithTableName(int isUpdate, String orderCode, String tableName) {
+		orderMapper.updateStatusWithTableName(isUpdate,orderCode,tableName);
+	}
 }

blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncOrderInfoToPlatform.java

@@ -133,7 +133,7 @@ public class SyncOrderInfoToPlatform {
 				try{
 					List<String> orderCodeList = orderClient.findOrderCodeListByPage(param,oldWarehouseId,j,pageSize,tableName);
 
-					syncOrderInfoService.handleData(orderCodeList,oldWarehouseId,newWarehouseId);
+					syncOrderInfoService.handleData(orderCodeList,oldWarehouseId,newWarehouseId,tableName);
 
 					log.info("################syncOrderInfo: 同步成功{}个订单",orderCodeList.size());
 					one.setCurrentPage(j+1);

blade-service/logpm-patch/src/main/java/com/logpm/patch/service/ISyncOrderInfoService.java

@@ -3,7 +3,7 @@ package com.logpm.patch.service;
 import java.util.List;
 
 public interface ISyncOrderInfoService {
-	void handleData(List<String> orderCodeList,Integer oldWarehouseId,Long newWarehouseId);
+	void handleData(List<String> orderCodeList,Integer oldWarehouseId,Long newWarehouseId,String tableName);
 
 	void handleDataZero(List<String> orderCodeList, Integer oldWarehouseId, Long newWarehouseId);
 

blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java

@@ -84,7 +84,7 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService {
 
 	@Transactional(rollbackFor = Exception.class)
 	@Override
-	public void handleData(List<String> orderCodeList,Integer oldWarehouseId,Long newWarehouseId) {
+	public void handleData(List<String> orderCodeList,Integer oldWarehouseId,Long newWarehouseId,String tableName) {
 		log.info("#############handleData: 处理订单开始");
 		for (String orderCode:orderCodeList){
 			log.info("#############handleData: 当前处理orderCode={}的订单 ",orderCode);
@@ -105,10 +105,14 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService {
 
 					saveTrayTypeInfoPackage(orderCode,oldWarehouseId,newWarehouseId);
 
+					orderClient.updateStatusWithTableName(1,orderCode,tableName);
+
 				}catch (CustomerException e){
 					log.error("同步订单"+orderCode+"失败: "+e.message,e);
+					orderClient.updateStatusWithTableName(2,orderCode,tableName);
 				}catch (Exception e){
 					log.error("同步订单"+orderCode+"失败",e);
+					orderClient.updateStatusWithTableName(2,orderCode,tableName);
 				}
 
 //			}