Merge remote-tracking branch 'origin/master'

mjava-huagao/src/main/java/com/malk/huagao/controller/KdHuagaoController.java

@@ -1,12 +1,20 @@
 package com.malk.huagao.controller;
 
+import cn.hutool.core.date.DateUtil;
 import com.malk.huagao.service.KdHuaGaoService;
 import com.malk.server.common.McR;
+import com.malk.utils.UtilHttp;
+import com.malk.utils.UtilMap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
 @RestController
 @RequestMapping("/kd")
 public class KdHuagaoController {
@@ -22,5 +30,12 @@ public class KdHuagaoController {
         return McR.success();
     }
 
+    //更新采购订单
+    @RequestMapping("/syncPUROrder")
+    @ResponseBody
+    public McR syncPUROrder(String userId){
+        kdHuaGaoService.syncPUROrder(userId);
 
+        return McR.success();
+    }
 }

mjava-huagao/src/main/java/com/malk/huagao/schedule/KdScheduleTask.java

@@ -52,6 +52,6 @@ public class KdScheduleTask {
     //每天00：02定时同步采购订单
     @Scheduled(cron = "0 2 0 * * ?")
     public void syncPUROrder(){
-        kdHuaGaoService.syncPUROrder();
+        kdHuaGaoService.syncPUROrder(null);
     }
 }

mjava-huagao/src/main/java/com/malk/huagao/service/KdHuaGaoService.java

@@ -13,5 +13,5 @@ public interface KdHuaGaoService {
 
     void syncDLVNotice(String userId);
 
-    void syncPUROrder();
+    void syncPUROrder(String userId);
 }

mjava-huagao/src/main/java/com/malk/huagao/service/impl/EqbServiceImpl.java

@@ -295,6 +295,7 @@ public class EqbServiceImpl implements EqbService {
                 .build(), YDConf.FORM_OPERATION.remarks);
 
         if ("双方签章".equals(signType)){
+            System.out.println("获取对方签署地址");
             JSONObject reqBodyObj4 = new JSONObject();
             Map operator2 = new HashMap();
             operator2.put("psnAccount", jbrdh);

mjava-huagao/src/main/java/com/malk/huagao/service/impl/KdHuaGaoServiceImpl.java

@@ -920,7 +920,7 @@ public class KdHuaGaoServiceImpl implements KdHuaGaoService {
     }
 
     @Override
-    public void syncPUROrder() {
+    public void syncPUROrder(String userId) {
         MDC.put("MDC_KEY_PID","1003");
 
         log.info("开始同步采购订单");
@@ -1057,6 +1057,10 @@ public class KdHuaGaoServiceImpl implements KdHuaGaoService {
             }
 
 
+            //发送工作通知
+            if (Objects.nonNull(userId)){
+                sendDdMsg(ddClient.getAccessToken(),ddConf.getAgentId(),userId,"更新采购订单完成  时间：" + DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss"));
+            }
 
         }catch (Exception e){
             throw new RuntimeException(e);

mjava-huagao/src/test/java/com/malk/huagao/KdTest.java

@@ -229,7 +229,7 @@ public void test50() throws Exception {
 
     @Test
     public void test10(){
-        kdHuaGaoService.syncPUROrder();
+        kdHuaGaoService.syncPUROrder(null);
     }
 
     private IdentifyInfo initIden(){