1

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

@@ -19,6 +19,7 @@ public class PayrequestController {
     private PayrequestService payrequestService=new PayrequestService();
     private  DingdingOpenInterface dingdingOpenInterface=new DingdingOpenInterface();
     private SysUserService sysUserService= SpringContextUtils.getBean("sysUserService",SysUserService.class);
+    private  Properties prop = PropUtil.getProperties("/config.properties");
 
 
     /**
@@ -28,7 +29,9 @@ public class PayrequestController {
      */
     public void dingPayrequest() throws OpenAPIException, ApiException {
         payrequestService.getToaccount();
-        Properties prop = PropUtil.getProperties("/config.properties");
+        String agentid = prop.getProperty("agentid");
+        String userid = prop.getProperty("userid");
+        String deptid = prop.getProperty("deptid");
         String processCode= prop.getProperty("fksqd_process_code");
         Map<String,String>map=new HashMap<>();
        // List<Payrequest> payrequests = payrequestService.yonyouQueryPayrequest(map);
@@ -44,7 +47,7 @@ public class PayrequestController {
                 Payrequest payrequest1 = payrequestService.yonyouGetPayrequest(payrequest);
                 if (payrequest1!=null){
                   //  payrequestService.createPayrequest(processCode,1313665313L,"20264331162691",412163022L,payrequest1);
-                    payrequestService.createPayrequest(processCode,1306561711L,"manager5914",-1L,payrequest1);
+                    payrequestService.createPayrequest(processCode,Long.valueOf(agentid),userid,Long.valueOf(deptid),payrequest1);
 
                 }
 
@@ -59,8 +62,8 @@ public class PayrequestController {
      */
     public void PayrequestOrderShenhe() throws OpenAPIException {
         DingdingOpenInterface.getToken();
-        Properties prop = PropUtil.getProperties("/config.properties");
         String processCode= prop.getProperty("fksqd_process_code");
+        String userid = prop.getProperty("u_shenhe_userid");
         List<String> orderIdList = dingdingOpenInterface.getOrderIdList(processCode);
         if (orderIdList!=null&&!orderIdList.equals("")){
             for (String id:orderIdList){
@@ -81,7 +84,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(codes.toString(),format,format,"demo");
+                        sysUserService.Payrequestshenhe(codes.toString(),format,format,userid);
                         DynamicDataSource.setDataSource("");
                     }
                 }

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

@@ -20,6 +20,7 @@ public class PurchaseOrderController {
     private PurchaseOrderService purchaseOrderService=new PurchaseOrderService();
     private  DingdingOpenInterface dingdingOpenInterface=new DingdingOpenInterface();
     private SysUserService sysUserService= SpringContextUtils.getBean("sysUserService",SysUserService.class);
+    private Properties prop = PropUtil.getProperties("/config.properties");
 
     /**
      * 获取U8采购订单创建钉钉采购订单审批实列
@@ -28,8 +29,10 @@ 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");
+        String agentid = prop.getProperty("agentid");
+        String userid = prop.getProperty("userid");
+        String deptid = prop.getProperty("deptid");
         purchaseOrderService.getToaccount();
         //List<YonyouPurchaseOrder> list = purchaseOrderService.yonyouQueryPurchaseOrder(map);
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -44,7 +47,7 @@ public class PurchaseOrderController {
                 YonyouPurchaseOrder purchaseOrder = purchaseOrderService.yonyouGetPurchaseOrder(purchaseOrders);
                 if (purchaseOrder!=null){
                    // purchaseOrderService.createPurchaseOrder(processCode,1313665313L,"20264331162691",412163022L,purchaseOrder);
-                    purchaseOrderService.createPurchaseOrder(processCode,1306561711L,"manager5914",-1L,purchaseOrder);
+                    purchaseOrderService.createPurchaseOrder(processCode,Long.valueOf(agentid),userid,Long.valueOf(deptid),purchaseOrder);
                 }
             }
         }
@@ -57,8 +60,8 @@ public class PurchaseOrderController {
      * @throws OpenAPIException
      */
     public void purchaseOrderShenhe() throws OpenAPIException {
-        Properties prop = PropUtil.getProperties("/config.properties");
         String processCode= prop.getProperty("cgdd_process_code");
+        String userid = prop.getProperty("u_shenhe_userid");
         DingdingOpenInterface.getToken();
         List<String> orderIdList = dingdingOpenInterface.getOrderIdList(processCode);
         if (orderIdList!=null&&!orderIdList.equals("")){
@@ -72,7 +75,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(code.toString(),format,format,"2","demo");
+                        sysUserService.Purchaseshenhe(code.toString(),format,format,"2",userid);
                         DynamicDataSource.setDataSource("");
                     }
                 }

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

@@ -20,7 +20,7 @@ public class SaleOrderController {
     @Autowired
     private SaleOrderService service=new SaleOrderService();
     private  DingdingOpenInterface dingdingOpenInterface=new DingdingOpenInterface();
-
+    private  Properties prop = PropUtil.getProperties("/config.properties");
     private SysUserService sysUserService= SpringContextUtils.getBean("sysUserService",SysUserService.class);
 
 
@@ -30,9 +30,12 @@ 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<>();
+        String agentid = prop.getProperty("agentid");
+        String userid = prop.getProperty("userid");
+        String deptid = prop.getProperty("deptid");
+        // Map<String,String>map=new HashMap<>();
         service.getToaccount();
        // List<YonyouSaleOrder> list = service.yonyouQuerySaleOrder(map);
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -47,7 +50,7 @@ public class SaleOrderController {
                 YonyouSaleOrder yonyouSaleOrder = service.yonyouGetSaleOrder(saleOrder);
                 if (yonyouSaleOrder!=null){
 //                    service.createOrder(processCode,1313665313L,"20264331162691",412163022L,yonyouSaleOrder);
-                    service.createOrder(processCode,1306561711L,"manager5914",-1L,yonyouSaleOrder);
+                    service.createOrder(processCode,Long.valueOf(agentid),userid,Long.valueOf(deptid),yonyouSaleOrder);
                 }
             }
         }
@@ -61,8 +64,8 @@ public class SaleOrderController {
      */
     public void saleOrderShenhe() throws OpenAPIException {
         DingdingOpenInterface.getToken();
-        Properties prop = PropUtil.getProperties("/config.properties");
       String processCode= prop.getProperty("xsdd_process_code");
+        String userid = prop.getProperty("u_shenhe_userid");
         List<String> orderIdList = dingdingOpenInterface.getOrderIdList(processCode);
         if (orderIdList!=null&&!orderIdList.equals("")){
           for (String id:orderIdList){
@@ -75,7 +78,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(code.toString(),format,format,"1","demo");
+                      sysUserService.Ordershenhe(code.toString(),format,format,"1",userid);
                       DynamicDataSource.setDataSource("");
                   }
               }
@@ -85,7 +88,8 @@ public class SaleOrderController {
 
     public static void main(String[] args) throws OpenAPIException, ApiException {
        SaleOrderController saleOrderController=new SaleOrderController();
-       saleOrderController.saleOrderShenhe();
+       saleOrderController.dingSaleOrder();
+      // saleOrderController.saleOrderShenhe();
     }
 
 }

src/main/java/net/chenlin/dp/modules/api/mapper/SaleOrderMapper.xml

@@ -43,7 +43,7 @@
 
 <!--销售报价单-->
 	<resultMap id="SaleOrderBJ" type="net.chenlin.dp.modules.api.vo.SaleOrderBJ">
-		<id column="ID" javaType="VARCHAR" property="ID"></id>
+		<result column="ID" jdbcType="VARCHAR" property="ID" />
 		<result column="dDate" jdbcType="VARCHAR" property="dDate" />
 		<result column="cCode" jdbcType="VARCHAR" property="cCode" />
 		<result column="cCusCode" jdbcType="VARCHAR" property="cCusCode" />
@@ -103,8 +103,8 @@
 
 
 
-	<select id="SaleOrderBJList" resultType="net.chenlin.dp.modules.api.vo.SaleOrderBJ">
-		select dDate,cCode,cCusCode,cDepCode,cPersonCode,cexch_name,iExchRate,iTaxRate,cMemo,cMaker,cVerifier,cCloser,cBusType
+	<select id="SaleOrderBJList" resultMap="SaleOrderBJ">
+		select ID,dDate,cCode,cCusCode,cDepCode,cPersonCode,cexch_name,iExchRate,iTaxRate,cMemo,cMaker,cVerifier,cCloser,cBusType
 		from  CRM_U8_SA_QuoMain
 
 	</select>

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

@@ -27,6 +27,7 @@ import java.util.*;
 
 public class PayrequestService extends BaseService {
     final static Logger logger = LoggerFactory.getLogger(PayrequestService.class);
+    private Properties prop = PropUtil.getProperties("/config.properties");
 
     public PayrequestService() {
 
@@ -197,11 +198,12 @@ public class PayrequestService extends BaseService {
         req.setOriginatorUserId(userid);
         req.setDeptId(deptid);
         req.setCcPosition("START");
+        String useridshenh = prop.getProperty("shenhe_userid");
         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"));
+        processInstanceApproverVo.setUserIds(Arrays.asList(useridshenh));
         req.setApproversV2(processInstanceApproverVoList);
         if (so!=null){
             List<OapiProcessinstanceCreateRequest.FormComponentValueVo> formComponentValueVoList = new ArrayList<OapiProcessinstanceCreateRequest.FormComponentValueVo>();

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

@@ -17,13 +17,14 @@ import net.chenlin.dp.modules.api.vo.YonyouPurchaseMaterial;
 import net.chenlin.dp.modules.api.vo.YonyouPurchaseOrder;
 import net.chenlin.dp.modules.api.vo.YonyouSaleOrder;
 
+import java.math.BigDecimal;
 import java.util.*;
 
 public class PurchaseOrderService {
 
     private net.chenlin.dp.common.openapi4j.service.PurchaseOrderService purchaseOrderService=new net.chenlin.dp.common.openapi4j.service.PurchaseOrderService();
     private DingdingOpenInterface dingdingOpenInterface=new DingdingOpenInterface();
-
+    private Properties prop = PropUtil.getProperties("/config.properties");
 
     private  static  String getToaccount="";
     /**
@@ -154,11 +155,13 @@ public class PurchaseOrderService {
         req.setOriginatorUserId(userid);
         req.setDeptId(deptid);
         req.setCcPosition("START");
+        String useridshenh = prop.getProperty("shenhe_userid");
+
         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"));
+        processInstanceApproverVo.setUserIds(Arrays.asList(useridshenh));
         req.setApproversV2(processInstanceApproverVoList);
         if (so!=null){
             List<OapiProcessinstanceCreateRequest.FormComponentValueVo> formComponentValueVoList = new ArrayList<OapiProcessinstanceCreateRequest.FormComponentValueVo>();
@@ -291,8 +294,11 @@ public class PurchaseOrderService {
 
                 OapiProcessinstanceCreateRequest.FormComponentValueVo fc11= new OapiProcessinstanceCreateRequest.FormComponentValueVo();
                 fc11.setName("税额");
-                if (s.getNattax()!=null&&!s.getNattax().equals("0E-10")){
-                    fc11.setValue(s.getNattax());
+                if (s.getMoney()!=null&&!s.getMoney().equals("0E-10")){
+                    BigDecimal sum=new BigDecimal(s.getSum());
+                    BigDecimal money=new BigDecimal(s.getMoney());
+                    BigDecimal subtract = sum.subtract(money);
+                    fc11.setValue(subtract.toString());
                 }else {
                     fc11.setValue("0");
                 }

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

@@ -22,6 +22,7 @@ import net.chenlin.dp.modules.sys.service.SysUserService;
 import net.chenlin.dp.modules.sys.service.impl.SysUserServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import java.math.BigDecimal;
 import java.util.*;
 
 public class SaleOrderService {
@@ -30,7 +31,7 @@ public class SaleOrderService {
     private DingdingOpenInterface dingdingOpenInterface=new DingdingOpenInterface();
     private ConsignmentService consignmentService=new ConsignmentService();
     private AcceptService acceptService=new AcceptService();
-
+    private  Properties prop = PropUtil.getProperties("/config.properties");
     private  static  String getToaccount="";
 
     /**
@@ -165,7 +166,7 @@ public class SaleOrderService {
      * @throws ApiException
      */
     public void createOrder(String processCode, Long agentid, String userid, Long deptid, YonyouSaleOrder so) throws ApiException {
-
+        String useridshenh = prop.getProperty("shenhe_userid");
         DingTalkClient client = new DefaultDingTalkClient("https://oapi.dingtalk.com/topapi/processinstance/create");
         OapiProcessinstanceCreateRequest req = new OapiProcessinstanceCreateRequest();
         req.setAgentId(agentid);
@@ -177,7 +178,7 @@ public class SaleOrderService {
         OapiProcessinstanceCreateRequest.ProcessInstanceApproverVo processInstanceApproverVo = new OapiProcessinstanceCreateRequest.ProcessInstanceApproverVo();
         processInstanceApproverVoList.add(processInstanceApproverVo);
         processInstanceApproverVo.setTaskActionType("NONE");
-        processInstanceApproverVo.setUserIds(Arrays.asList("20264331162691"));
+        processInstanceApproverVo.setUserIds(Arrays.asList(useridshenh));
         req.setApproversV2(processInstanceApproverVoList);
         if (so!=null){
             List<OapiProcessinstanceCreateRequest.FormComponentValueVo> formComponentValueVoList = new ArrayList<OapiProcessinstanceCreateRequest.FormComponentValueVo>();
@@ -192,7 +193,7 @@ public class SaleOrderService {
 
             OapiProcessinstanceCreateRequest.FormComponentValueVo fc = new OapiProcessinstanceCreateRequest.FormComponentValueVo();
             fc.setName("单据日期");
-            fc.setValue(so.getDate().toString());
+            fc.setValue(so.getDate());
             formComponentValueVoList.add(fc);
 
             OapiProcessinstanceCreateRequest.FormComponentValueVo fc2 = new OapiProcessinstanceCreateRequest.FormComponentValueVo();
@@ -295,8 +296,11 @@ public class SaleOrderService {
 
                 OapiProcessinstanceCreateRequest.FormComponentValueVo fc11= new OapiProcessinstanceCreateRequest.FormComponentValueVo();
                 fc11.setName("税额");
-                if (s.getTax()!=null&&!s.getTax().equals("0E-10")){
-                    fc11.setValue(s.getTax());
+                if (s.getSum()!=null&&!s.getSum().equals("0E-10")){
+                    BigDecimal sum=new BigDecimal(s.getSum());
+                    BigDecimal money=new BigDecimal(s.getMoney());
+                    BigDecimal subtract = sum.subtract(money);
+                    fc11.setValue(subtract.toString());
                 }else {
                     fc11.setValue("0");
                 }

src/main/java/net/chenlin/dp/modules/api/vo/SaleOrderBJ.java

@@ -22,6 +22,14 @@ public class SaleOrderBJ {
     private  String cCloser;//关闭人
     private  String cBusType;//业务类型
 
+    public String getID() {
+        return ID;
+    }
+
+    public void setID(String ID) {
+        this.ID = ID;
+    }
+
     private List<SaleOrderBJMin>list=new ArrayList<>();
 
     public String getdDate() {

src/main/resources/config.properties

@@ -1,13 +1,13 @@
 
 ################# U8接口参数 ####################
 #调用方id
-from_account=2019JCLW
+from_account=yuansh
 #提供方id
-to_account = 2019JCLW
+to_account = test_yuansh
 #应用key
-app_key=opa70efa97d69ebe39e
+app_key=opa57a53c32fcc8c23f
 #应用密钥
-app_secret=8cd1cb56cd534e049017b9fa171e1846
+app_secret=a9b18c123335483a84f8cb183323ba01
 #获取token的url
 api_url_token_get=https://api.yonyouup.com/system/token?from_account={from_account}&app_key={app_key}&app_secret={app_secret}
 #获取trade_id 的url
@@ -18,12 +18,42 @@ api_url_orderstatus_get = https://api.yonyouup.com/orderstatus/get?from_account=
 api_url_result_get = https://api.yonyouup.com/result?requestid={requestid}
 #网站api的url
 baseURL=https://api.yonyouup.com/api/
-
+#审核人
+u_shenhe_userid=demo
 ################# 钉钉接口参数 ####################
 
-ding_appkey=ding1h54xhh2cyh90hgk
-ding_appsecret=EZMYVfZn_yBBj2Mr_qfZPtJvVErJqdQKVHQvHGk9s3LLuAZxdwAsqdnXIuSy6uVx
-#备用金process_code
-byj_process_code=PROC-9331671D-265D-4A79-A6F2-93326D727673
-#销售订单process_code
-xxdd_process_code=PROC-40356B7F-6825-4DC3-83B9-8AD6D0D2CA49
+##ding_appkey=dingg4komkiirlidfnag
+##ding_appsecret=WcrjxsKA8Jay95sbge_wF5njoK7f6WR7CYqpMswYbIZwv_45xLDq2ZDzjAMWCS0U
+#备用金申请process_code
+#byj_process_code=PROC-A561B73E-8282-4780-BB05-DCBA8125C45C
+#报销申请process_code
+#bx_process_code=PROC-BE874F70-C29B-4391-836F-BC5A1F57A4BB
+#销售订单
+##xsdd_process_code=PROC-9266388D-FC2A-4BBA-A91D-214F4AAC38B4
+#采购订单
+#cgdd_process_code=PROC-BFE32FF9-45C3-4EAD-A535-2E154F298663
+#付款申请单
+#fksqd_process_code=PROC-FBACFA27-53F9-4EF8-BAB4-B03CBC402BB4
+
+##########测试
+ding_appkey=dinghsdu3m2hbomabuki
+ding_appsecret=7tKfouLzpnVOjRhkIHBO4j5wAry-LgAV71wrWV7rNeyvEyKViajKfb4_G-RjeyC3
+#备用金申请process_code
+#byj_process_code=
+#报销申请process_code
+#bx_process_code=
+#销售订单
+xsdd_process_code=PROC-4B526252-017E-4531-91A0-4DEAC6883952
+#采购订单
+cgdd_process_code=PROC-971173C9-46DF-4FA8-BEBB-94D3477ADB97
+#付款申请单
+fksqd_process_code=PROC-D9555820-0053-4EC0-AB51-688E5545123C
+#应用id
+agentid=1306561711L
+#人员
+userid=manager5914
+#部门
+deptid=1L
+#钉钉审核人
+shenhe_userid=20264331162691
+