‘linchangsheng’ 6 mesiacov pred
rodič
commit
73166c0fb8

+ 1 - 8
mall-server-api/src/main/java/com/gree/mall/manager/bean/workorder/WorkerOrderSyncBean.java

@@ -9,14 +9,7 @@ public class WorkerOrderSyncBean {
     private String inDownloadBatchNo;
     private String inSynReqId;
     private String inWorkOrderId;
-
-    /*
- 执行结果
-  */
-    private boolean outSynStatus;
-    /*
-    错误信息
-     */
+    private Boolean outSynStatus;
     private String outSynErrMsg;
 
     public static WorkerOrderSyncBean instance(String inDownloadBatchNo, String inSynReqId,String inWorkOrderId) {

+ 5 - 5
mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/workorder/SyncMapper.java

@@ -11,11 +11,11 @@ public interface SyncMapper {
 
 
     @Select({ "call TL_SynDataFrom_tbl_work_order_package("
-            + "#{sheetId,mode=IN,jdbcType=VARCHAR},"
-            + "#{flag,mode=IN,jdbcType=INTEGER},"
-            + "#{flag,mode=IN,jdbcType=INTEGER},"
-            + "#{status,mode=OUT,jdbcType=BOOLEAN},"
-            + "#{msg,mode=OUT,jdbcType=VARCHAR})"
+            + "#{inDownloadBatchNo,mode=IN,jdbcType=VARCHAR},"
+            + "#{inSynReqId,mode=IN,jdbcType=VARCHAR},"
+            + "#{inWorkOrderId,mode=IN,jdbcType=VARCHAR},"
+            + "#{outSynStatus,mode=OUT,jdbcType=BOOLEAN},"
+            + "#{outSynErrMsg,mode=OUT,jdbcType=VARCHAR})"
     })
     @Options(statementType = StatementType.CALLABLE)
     WorkerOrderSyncBean orderExecute(WorkerOrderSyncBean workerOrderSyncBean);

+ 29 - 0
mall-server-api/src/main/java/com/gree/mall/manager/logic/SyncOrderInfoLogic.java

@@ -19,6 +19,7 @@ import com.gree.mall.manager.bean.WorkOrderRelationBean;
 import com.gree.mall.manager.bean.WorkOrderSearchReq;
 
 import com.gree.mall.manager.bean.policy.ItfGreeSynDownloadRecBean;
+import com.gree.mall.manager.bean.workorder.WorkerOrderSyncBean;
 import com.gree.mall.manager.commonmapper.workorder.SyncMapper;
 import com.gree.mall.manager.constant.Constant;
 import com.gree.mall.manager.exception.RemoteServiceException;
@@ -527,7 +528,35 @@ public class SyncOrderInfoLogic {
     }
 
     public void task3() {
+        List<ItfTblWorkOrder> itfTblWorkOrderList = itfTblWorkOrderService.lambdaQuery()
+                .lt(ItfTblWorkOrder::getSynTimes, 10)
+                .eq(ItfTblWorkOrder::getSynStatus, 0)
+                .orderByAsc(ItfTblWorkOrder::getSynReqId).list();
 
+        if (CollectionUtils.isEmpty(itfTblWorkOrderList))
+            return;
+
+        for (ItfTblWorkOrder itfTblWorkOrder : itfTblWorkOrderList) {
+
+            try {
+                WorkerOrderSyncBean workerOrderSyncBean = new WorkerOrderSyncBean();
+                workerOrderSyncBean.setInWorkOrderId(itfTblWorkOrder.getId());
+                workerOrderSyncBean.setInSynReqId(Convert.toStr(itfTblWorkOrder.getSynReqId()));
+                workerOrderSyncBean.setInDownloadBatchNo(itfTblWorkOrder.getDownloadBatchNo());
+                WorkerOrderSyncBean workerOrderSyncBean1 = syncMapper.orderExecute(workerOrderSyncBean);
+                if (!workerOrderSyncBean1.getOutSynStatus()){
+                    itfTblWorkOrder.setSynTimes(itfTblWorkOrder.getSynTimes()+1);
+                    itfTblWorkOrder.setSynErrMsg(workerOrderSyncBean1.getOutSynErrMsg());
+                    itfTblWorkOrder.updateById();
+                }
+            }catch (Exception e){
+                itfTblWorkOrder.setSynTimes(itfTblWorkOrder.getSynTimes()+1);
+                itfTblWorkOrder.setSynErrMsg(e.getMessage());
+                itfTblWorkOrder.updateById();
+            }
+
+
+        }
 
 
     }

+ 1 - 1
mall-server-api/src/main/java/com/gree/mall/manager/logic/policy/WorkerManagerLogic.java

@@ -217,7 +217,7 @@ public class WorkerManagerLogic {
             }else {
                 List<WorkerPolicy> workerPolicyLists = workerPolicyList.stream()
                         .filter(item -> item.getId().equals(workerPolicy.getId())).collect(Collectors.toList());
-                if (CollectionUtils.isEmpty(workerPolicies))
+                if (CollectionUtils.isEmpty(workerPolicyLists))
                     continue;
 
                 WorkerPolicy workerPolicyOne = workerPolicyLists.get(0);