1

src/main/java/net/chenlin/dp/modules/TaskDemo.java

@@ -1,9 +1,13 @@
 package net.chenlin.dp.modules;
 
+import com.taobao.api.ApiException;
 import net.chenlin.dp.common.openapi4j.exception.OpenAPIException;
 import net.chenlin.dp.common.openapi4j.service.SaleOrderService;
 import net.chenlin.dp.common.utils.DateUtils;
 import net.chenlin.dp.modules.api.controller.DingdingOpenInterface;
+import net.chenlin.dp.modules.api.controller.PayrequestController;
+import net.chenlin.dp.modules.api.controller.PurchaseOrderController;
+import net.chenlin.dp.modules.api.controller.SaleOrderController;
 import net.chenlin.dp.modules.api.service.PettyCashService;
 import net.chenlin.dp.modules.api.service.ReimbursementService;
 import org.springframework.stereotype.Component;
@@ -39,8 +43,10 @@ public class TaskDemo {
     /**
      * 定时任务 销售订单同步至 钉钉
      */
-    public static void autoSaleToDingJob(){
+    public static void autoSaleToDingJob() throws OpenAPIException, ApiException {
         System.out.println("==================================");
+        SaleOrderController saleOrderController=new SaleOrderController();
+        saleOrderController.dingSaleOrder();
         System.out.println("===========销售订单同步至钉钉定时任务执行 "+ DateUtils.getNowTime()+" ============" );
         System.out.println("==================================");
     }
@@ -48,8 +54,10 @@ public class TaskDemo {
     /**
      * 定时任务 采购订单同步至 钉钉
      */
-    public static void autoOrderToDingJob(){
+    public static void autoOrderToDingJob() throws OpenAPIException, ApiException {
         System.out.println("==================================");
+        PurchaseOrderController purchaseOrderController=new PurchaseOrderController();
+        purchaseOrderController.dingPurchaseOrder();
         System.out.println("===========采购订单同步至钉钉定时任务执行 "+ DateUtils.getNowTime()+" ============" );
         System.out.println("==================================");
     }
@@ -57,8 +65,10 @@ public class TaskDemo {
     /**
      * 定时任务 付款申请单同步至 钉钉
      */
-    public static void autoFkdToDingJob(){
+    public static void autoFkdToDingJob() throws OpenAPIException, ApiException {
         System.out.println("==================================");
+        PayrequestController payrequestController=new PayrequestController();
+        payrequestController.dingPayrequest();
         System.out.println("===========付款申请单同步至钉钉定时任务执行 "+ DateUtils.getNowTime()+" ============" );
         System.out.println("==================================");
     }
@@ -66,24 +76,30 @@ public class TaskDemo {
     /**
      * 定时任务 钉钉销售订单审核回写至U8
      */
-    public static void autoSaleToU8Job(){
+    public static void autoSaleToU8Job() throws OpenAPIException {
         System.out.println("==================================");
+        SaleOrderController saleOrderController=new SaleOrderController();
+        saleOrderController.saleOrderShenhe();
         System.out.println("===========钉钉销售订单回写至U8定时任务执行 "+ DateUtils.getNowTime()+" ============" );
         System.out.println("==================================");
     }
     /**
      * 定时任务 钉钉采购订单回写至U8
      */
-    public static void autoOrderToU8Job(){
+    public static void autoOrderToU8Job() throws OpenAPIException {
         System.out.println("==================================");
+        PurchaseOrderController purchaseOrderController=new PurchaseOrderController();
+        purchaseOrderController.purchaseOrderShenhe();
         System.out.println("===========钉钉采购订单回写至U8定时任务执行 "+ DateUtils.getNowTime()+" ============" );
         System.out.println("==================================");
     }
    /**
      * 定时任务 钉钉付款申请单回写至U8
      */
-    public static void autoFkdToU8Job(){
+    public static void autoFkdToU8Job() throws OpenAPIException {
         System.out.println("==================================");
+        PayrequestController payrequestController=new PayrequestController();
+        payrequestController.PayrequestOrderShenhe();
         System.out.println("===========钉钉付款申请单回写至U8定时任务执行 "+ DateUtils.getNowTime()+" ============" );
         System.out.println("==================================");
     }

src/main/java/net/chenlin/dp/modules/api/controller/PayrequestController.java

@@ -2,7 +2,9 @@ package net.chenlin.dp.modules.api.controller;
 
 import com.taobao.api.ApiException;
 import net.chenlin.dp.common.openapi4j.exception.OpenAPIException;
+import net.chenlin.dp.common.openapi4j.util.PropUtil;
 import net.chenlin.dp.common.support.orm.db.DynamicDataSource;
+import net.chenlin.dp.common.utils.SpringContextUtils;
 import net.chenlin.dp.modules.api.service.PayrequestService;
 import net.chenlin.dp.modules.api.vo.Payrequest;
 import net.chenlin.dp.modules.api.vo.SaleOrderRest;
@@ -10,15 +12,12 @@ import net.chenlin.dp.modules.sys.service.SysUserService;
 import net.chenlin.dp.modules.sys.service.impl.SysUserServiceImpl;
 
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 public class PayrequestController {
     private PayrequestService payrequestService=new PayrequestService();
     private  DingdingOpenInterface dingdingOpenInterface=new DingdingOpenInterface();
-    private SysUserService sysUserService=new SysUserServiceImpl();
+    private SysUserService sysUserService= SpringContextUtils.getBean("sysUserService",SysUserService.class);
 
 
     /**
@@ -28,13 +27,15 @@ public class PayrequestController {
      */
     public void dingPayrequest() throws OpenAPIException, ApiException {
         payrequestService.getToaccount();
+        Properties prop = PropUtil.getProperties("/config.properties");
+        String processCode= prop.getProperty("fksqd_process_code");
         Map<String,String>map=new HashMap<>();
         List<Payrequest> payrequests = payrequestService.yonyouQueryPayrequest(map);
         if(payrequests!=null){
             for (Payrequest payrequest:payrequests){
                 Payrequest payrequest1 = payrequestService.yonyouGetPayrequest(payrequest.getCvouchid());
                 if (payrequest1!=null){
-                    payrequestService.createPayrequest("PROC-D9555820-0053-4EC0-AB51-688E5545123C",1306561711L,"manager5914",-1L,payrequest1);
+                    payrequestService.createPayrequest(processCode,1313665313L,"20264331162691",412163022L,payrequest1);
                 }
 
             }
@@ -48,7 +49,9 @@ public class PayrequestController {
      */
     public void PayrequestOrderShenhe() throws OpenAPIException {
         DingdingOpenInterface.getToken();
-        List<String> orderIdList = dingdingOpenInterface.getOrderIdList("PROC-D9555820-0053-4EC0-AB51-688E5545123C");
+        Properties prop = PropUtil.getProperties("/config.properties");
+        String processCode= prop.getProperty("fksqd_process_code");
+        List<String> orderIdList = dingdingOpenInterface.getOrderIdList(processCode);
         if (orderIdList!=null&&!orderIdList.equals("")){
             for (String id:orderIdList){
                 Map<String, Object> orderDetails = dingdingOpenInterface.getOrderDetails(id);
@@ -60,7 +63,7 @@ public class PayrequestController {
                         SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//设置日期格式
                         String format = df.format(new Date());
                         DynamicDataSource.setDataSource("slave-data-source");
-                        sysUserService.Payrequestshenhe("",format,format,"demo");
+                        sysUserService.Payrequestshenhe(code.toString(),format,format,"demo");
                         DynamicDataSource.setDataSource("");
                     }
                 }

src/main/java/net/chenlin/dp/modules/api/controller/PurchaseOrderController.java

@@ -2,7 +2,9 @@ package net.chenlin.dp.modules.api.controller;
 
 import com.taobao.api.ApiException;
 import net.chenlin.dp.common.openapi4j.exception.OpenAPIException;
+import net.chenlin.dp.common.openapi4j.util.PropUtil;
 import net.chenlin.dp.common.support.orm.db.DynamicDataSource;
+import net.chenlin.dp.common.utils.SpringContextUtils;
 import net.chenlin.dp.modules.api.service.PurchaseOrderService;
 import net.chenlin.dp.modules.api.vo.SaleOrderRest;
 import net.chenlin.dp.modules.api.vo.YonyouPurchaseOrder;
@@ -11,16 +13,13 @@ import net.chenlin.dp.modules.sys.service.SysUserService;
 import net.chenlin.dp.modules.sys.service.impl.SysUserServiceImpl;
 
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 public class PurchaseOrderController {
 
     private PurchaseOrderService purchaseOrderService=new PurchaseOrderService();
     private  DingdingOpenInterface dingdingOpenInterface=new DingdingOpenInterface();
-    private SysUserService sysUserService=new SysUserServiceImpl();
+    private SysUserService sysUserService= SpringContextUtils.getBean("sysUserService",SysUserService.class);
 
     /**
      * 获取U8采购订单创建钉钉采购订单审批实列
@@ -29,13 +28,15 @@ public class PurchaseOrderController {
      */
     public void dingPurchaseOrder() throws OpenAPIException, ApiException {
         Map<String,String> map=new HashMap<>();
+        Properties prop = PropUtil.getProperties("/config.properties");
+        String processCode= prop.getProperty("cgdd_process_code");
         purchaseOrderService.getToaccount();
         List<YonyouPurchaseOrder> list = purchaseOrderService.yonyouQueryPurchaseOrder(map);
         if (list!=null){
             for (YonyouPurchaseOrder purchaseOrders:list){
                 YonyouPurchaseOrder purchaseOrder = purchaseOrderService.yonyouGetPurchaseOrder(purchaseOrders.getCode());
                 if (purchaseOrder!=null){
-                    purchaseOrderService.createPurchaseOrder("PROC-971173C9-46DF-4FA8-BEBB-94D3477ADB97",1306561711L,"manager5914",-1L,purchaseOrder);
+                    purchaseOrderService.createPurchaseOrder(processCode,1313665313L,"20264331162691",412163022L,purchaseOrder);
                 }
             }
         }
@@ -48,8 +49,10 @@ public class PurchaseOrderController {
      * @throws OpenAPIException
      */
     public void purchaseOrderShenhe() throws OpenAPIException {
+        Properties prop = PropUtil.getProperties("/config.properties");
+        String processCode= prop.getProperty("cgdd_process_code");
         DingdingOpenInterface.getToken();
-        List<String> orderIdList = dingdingOpenInterface.getOrderIdList("PROC-971173C9-46DF-4FA8-BEBB-94D3477ADB97");
+        List<String> orderIdList = dingdingOpenInterface.getOrderIdList(processCode);
         if (orderIdList!=null&&!orderIdList.equals("")){
             for (String id:orderIdList){
                 Map<String, Object> orderDetails = dingdingOpenInterface.getOrderDetails(id);
@@ -61,7 +64,7 @@ public class PurchaseOrderController {
                         SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//设置日期格式
                         String format = df.format(new Date());
                         DynamicDataSource.setDataSource("slave-data-source");
-                        sysUserService.Purchaseshenhe("XSDD210930005",format,format,"1","demo");
+                        sysUserService.Purchaseshenhe(code.toString(),format,format,"2","demo");
                         DynamicDataSource.setDataSource("");
                     }
                 }

src/main/java/net/chenlin/dp/modules/api/controller/SaleOrderController.java

@@ -2,8 +2,10 @@ package net.chenlin.dp.modules.api.controller;
 
 import com.taobao.api.ApiException;
 import net.chenlin.dp.common.openapi4j.exception.OpenAPIException;
+import net.chenlin.dp.common.openapi4j.util.PropUtil;
 import net.chenlin.dp.common.support.orm.db.DynamicDataSource;
 import net.chenlin.dp.common.utils.DateUtils;
+import net.chenlin.dp.common.utils.SpringContextUtils;
 import net.chenlin.dp.modules.api.service.SaleOrderService;
 import net.chenlin.dp.modules.api.vo.SaleOrderRest;
 import net.chenlin.dp.modules.api.vo.YonyouSaleOrder;
@@ -12,16 +14,14 @@ import net.chenlin.dp.modules.sys.service.impl.SysUserServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 public class SaleOrderController {
+    @Autowired
     private SaleOrderService service=new SaleOrderService();
     private  DingdingOpenInterface dingdingOpenInterface=new DingdingOpenInterface();
-    @Autowired
-    private SysUserService sysUserService;
+
+    private SysUserService sysUserService= SpringContextUtils.getBean("sysUserService",SysUserService.class);
 
 
     /**
@@ -30,6 +30,8 @@ public class SaleOrderController {
      * @throws ApiException
      */
     public void  dingSaleOrder() throws OpenAPIException, ApiException {
+        Properties prop = PropUtil.getProperties("/config.properties");
+        String processCode= prop.getProperty("xsdd_process_code");
         Map<String,String>map=new HashMap<>();
         service.getToaccount();
         List<YonyouSaleOrder> list = service.yonyouQuerySaleOrder(map);
@@ -37,7 +39,7 @@ public class SaleOrderController {
             for (YonyouSaleOrder saleOrder:list){
                 YonyouSaleOrder yonyouSaleOrder = service.yonyouGetSaleOrder(saleOrder.getCode());
                 if (yonyouSaleOrder!=null){
-                    service.createOrder("PROC-4B526252-017E-4531-91A0-4DEAC6883952",1306561711L,"manager5914",-1L,yonyouSaleOrder);
+                    service.createOrder(processCode,1313665313L,"20264331162691",412163022L,yonyouSaleOrder);
                 }
             }
         }
@@ -51,7 +53,9 @@ public class SaleOrderController {
      */
     public void saleOrderShenhe() throws OpenAPIException {
         DingdingOpenInterface.getToken();
-        List<String> orderIdList = dingdingOpenInterface.getOrderIdList("PROC-4B526252-017E-4531-91A0-4DEAC6883952");
+        Properties prop = PropUtil.getProperties("/config.properties");
+      String processCode= prop.getProperty("xsdd_process_code");
+        List<String> orderIdList = dingdingOpenInterface.getOrderIdList(processCode);
         if (orderIdList!=null&&!orderIdList.equals("")){
           for (String id:orderIdList){
               Map<String, Object> orderDetails = dingdingOpenInterface.getOrderDetails(id);
@@ -63,7 +67,7 @@ public class SaleOrderController {
                       SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//设置日期格式
                       String format = df.format(new Date());
                       DynamicDataSource.setDataSource("slave-data-source");
-                      sysUserService.Ordershenhe("XSDD210930005",format,format,"1","demo");
+                      sysUserService.Ordershenhe(code.toString(),format,format,"1","demo");
                       DynamicDataSource.setDataSource("");
                   }
               }

src/main/java/net/chenlin/dp/modules/api/service/PayrequestService.java

@@ -95,6 +95,7 @@ public class PayrequestService extends BaseService {
      */
     public List<Payrequest> yonyouQueryPayrequest(Map<String,String>map) throws OpenAPIException {
         map.put("to_account", getToaccount);
+//        map.put("to_account", getToaccount);
         try {
             JSONObject jsonObject = batchGet(map);
             HashMap hashMap = JSONObject.parseObject(jsonObject.toString(), HashMap.class);

src/main/java/net/chenlin/dp/modules/api/service/PurchaseOrderService.java

@@ -62,6 +62,7 @@ public class PurchaseOrderService {
      */
     public List<YonyouPurchaseOrder> yonyouQueryPurchaseOrder(Map<String,String>map) throws OpenAPIException {
         map.put("to_account", getToaccount);
+        map.put("state","开立");
         try {
             JSONObject jsonObject = purchaseOrderService.batchGet(map);
             HashMap hashMap = JSONObject.parseObject(jsonObject.toString(), HashMap.class);

src/main/java/net/chenlin/dp/modules/api/service/SaleOrderService.java

@@ -65,6 +65,7 @@ public class SaleOrderService {
      */
     public List<YonyouSaleOrder> yonyouQuerySaleOrder(Map<String,String>map) throws OpenAPIException {
         map.put("to_account", getToaccount);
+        map.put("state","Opening");
         try {
             JSONObject jsonObject = saleOrderService.batchGet(map);
             HashMap hashMap = JSONObject.parseObject(jsonObject.toString(), HashMap.class);
@@ -169,6 +170,12 @@ public class SaleOrderService {
         req.setOriginatorUserId(userid);
         req.setDeptId(deptid);
         req.setCcPosition("START");
+        List<OapiProcessinstanceCreateRequest.ProcessInstanceApproverVo> processInstanceApproverVoList = new ArrayList<OapiProcessinstanceCreateRequest.ProcessInstanceApproverVo>();
+        OapiProcessinstanceCreateRequest.ProcessInstanceApproverVo processInstanceApproverVo = new OapiProcessinstanceCreateRequest.ProcessInstanceApproverVo();
+        processInstanceApproverVoList.add(processInstanceApproverVo);
+        processInstanceApproverVo.setTaskActionType("NONE");
+        processInstanceApproverVo.setUserIds(Arrays.asList("20264331162691"));
+        req.setApproversV2(processInstanceApproverVoList);
         if (so!=null){
             List<OapiProcessinstanceCreateRequest.FormComponentValueVo> formComponentValueVoList = new ArrayList<OapiProcessinstanceCreateRequest.FormComponentValueVo>();
             OapiProcessinstanceCreateRequest.FormComponentValueVo formComponentValueVo = new OapiProcessinstanceCreateRequest.FormComponentValueVo();