LG88888888 3 years ago
parent
commit
2ed33e762a

+ 11 - 8
src/main/java/net/chenlin/dp/modules/api/controller/PayrequestController.java

@@ -2,10 +2,15 @@ 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.support.orm.db.DynamicDataSource;
 import net.chenlin.dp.modules.api.service.PayrequestService;
 import net.chenlin.dp.modules.api.vo.Payrequest;
 import net.chenlin.dp.modules.api.vo.SaleOrderRest;
+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;
@@ -13,6 +18,7 @@ import java.util.Map;
 public class PayrequestController {
     private PayrequestService payrequestService=new PayrequestService();
     private  DingdingOpenInterface dingdingOpenInterface=new DingdingOpenInterface();
+    private SysUserService sysUserService=new SysUserServiceImpl();
 
 
     /**
@@ -45,23 +51,20 @@ public class PayrequestController {
         List<String> orderIdList = dingdingOpenInterface.getOrderIdList("PROC-D9555820-0053-4EC0-AB51-688E5545123C");
         if (orderIdList!=null&&!orderIdList.equals("")){
             for (String id:orderIdList){
-                SaleOrderRest saleOrderRest=new SaleOrderRest();
                 Map<String, Object> orderDetails = dingdingOpenInterface.getOrderDetails(id);
                 Map<String, Object> map = DingdingOpenInterface.tableToMap(orderDetails);
-                saleOrderRest.setUser_id("");
                 Object code = map.get("单据编号");
-                saleOrderRest.setVoucher_code(code.toString());
                 Object result = orderDetails.get("result");
                 if (!result.equals("")&&result!=null){
                     if (result.equals("agree")){
-                        saleOrderRest.setAgree("1");
-                    }if (result.equals("refuse")){
-                        saleOrderRest.setAgree("0");
+                        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");
+                        DynamicDataSource.setDataSource("");
                     }
-                    payrequestService.shenghe();
                 }
 
-                System.out.println(code+"-"+result);
             }
         }
     }

+ 12 - 9
src/main/java/net/chenlin/dp/modules/api/controller/PurchaseOrderController.java

@@ -2,11 +2,16 @@ 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.support.orm.db.DynamicDataSource;
 import net.chenlin.dp.modules.api.service.PurchaseOrderService;
 import net.chenlin.dp.modules.api.vo.SaleOrderRest;
 import net.chenlin.dp.modules.api.vo.YonyouPurchaseOrder;
 import net.chenlin.dp.modules.api.vo.YonyouSaleOrder;
+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;
@@ -15,7 +20,7 @@ public class PurchaseOrderController {
 
     private PurchaseOrderService purchaseOrderService=new PurchaseOrderService();
     private  DingdingOpenInterface dingdingOpenInterface=new DingdingOpenInterface();
-
+    private SysUserService sysUserService=new SysUserServiceImpl();
 
     /**
      * 获取U8采购订单创建钉钉采购订单审批实列
@@ -47,23 +52,21 @@ public class PurchaseOrderController {
         List<String> orderIdList = dingdingOpenInterface.getOrderIdList("PROC-971173C9-46DF-4FA8-BEBB-94D3477ADB97");
         if (orderIdList!=null&&!orderIdList.equals("")){
             for (String id:orderIdList){
-                SaleOrderRest saleOrderRest=new SaleOrderRest();
                 Map<String, Object> orderDetails = dingdingOpenInterface.getOrderDetails(id);
                 Map<String, Object> map = DingdingOpenInterface.tableToMap(orderDetails);
-                saleOrderRest.setUser_id("");
                 Object code = map.get("单据编号");
-                saleOrderRest.setVoucher_code(code.toString());
                 Object result = orderDetails.get("result");
                 if (!result.equals("")&&result!=null){
                     if (result.equals("agree")){
-                        saleOrderRest.setAgree("1");
-                    }if (result.equals("refuse")){
-                        saleOrderRest.setAgree("0");
+                        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");
+                        DynamicDataSource.setDataSource("");
                     }
-                    purchaseOrderService.yonyouShenhePurchaseOrder(saleOrderRest);
                 }
 
-                System.out.println(code+"-"+result);
+
             }
         }
     }

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

@@ -20,7 +20,9 @@ import java.util.Map;
 public class SaleOrderController {
     private SaleOrderService service=new SaleOrderService();
     private  DingdingOpenInterface dingdingOpenInterface=new DingdingOpenInterface();
-    private SysUserService sysUserService=new SysUserServiceImpl();
+    @Autowired
+    private SysUserService sysUserService;
+
 
     /**
      * 获取u8销售订单创建钉钉销售订单审批实列
@@ -52,12 +54,9 @@ public class SaleOrderController {
         List<String> orderIdList = dingdingOpenInterface.getOrderIdList("PROC-4B526252-017E-4531-91A0-4DEAC6883952");
         if (orderIdList!=null&&!orderIdList.equals("")){
           for (String id:orderIdList){
-              SaleOrderRest saleOrderRest=new SaleOrderRest();
               Map<String, Object> orderDetails = dingdingOpenInterface.getOrderDetails(id);
               Map<String, Object> map = DingdingOpenInterface.tableToMap(orderDetails);
-              saleOrderRest.setUser_id("");
               Object code = map.get("单据编号");
-              saleOrderRest.setVoucher_code(code.toString());
               Object result = orderDetails.get("result");
               if (!result.equals("")&&result!=null){
                   if (result.equals("agree")){
@@ -65,6 +64,7 @@ public class SaleOrderController {
                       String format = df.format(new Date());
                       DynamicDataSource.setDataSource("slave-data-source");
                       sysUserService.Ordershenhe("XSDD210930005",format,format,"1","demo");
+                      DynamicDataSource.setDataSource("");
                   }
               }
           }

+ 6 - 0
src/main/java/net/chenlin/dp/modules/sys/dao/SysUserMapper.java

@@ -63,4 +63,10 @@ public interface SysUserMapper extends BaseMapper<SysUserEntity> {
 
 	int Ordershenhe(@Param("code")String code, @Param("dverifysystime")String dverifysystime, @Param("dverifydate")String dverifydate
 			, @Param("state")String state, @Param("cVerifier")String cVerifier);
+
+	int Purchaseshenhe(@Param("code")String code, @Param("dverifysystime")String dverifysystime, @Param("dverifydate")String dverifydate
+			, @Param("state")String state, @Param("cVerifier")String cVerifier);
+
+	int Payrequestshenhe(@Param("code")String code, @Param("dverifysystime")String dverifysystime, @Param("dverifydate")String dverifydate
+			, @Param("cVerifier")String cVerifier);
 }

+ 22 - 0
src/main/java/net/chenlin/dp/modules/sys/mapper/SysUserMapper.xml

@@ -180,5 +180,27 @@
 		WHERE
 		csocode = #{code}
 	</update>
+	<update id="Purchaseshenhe">
+		UPDATE PO_Pomain
+		<set>
+			<if test="dverifysystime != null">cAuditTime = #{dverifysystime}, </if>
+			<if test="dverifydate != null">cAuditDate = #{dverifydate}, </if>
+			<if test="state != null">iverifystateex = #{state}, </if>
+			<if test="cVerifier != null">cVerifier = #{cVerifier} </if>
+		</set>
+		WHERE
+		cPOID = #{code}
+	</update>
+	<update id="Payrequestshenhe">
+
+		UPDATE AP_ApplyPayVouch
+		<set>
+			<if test="dverifysystime != null">dverifysystime = #{dverifysystime}, </if>
+			<if test="dverifydate != null">dverifydate = #{dverifydate}, </if>
+			<if test="cVerifier != null">cCheckMan = #{cVerifier} </if>
+		</set>
+		WHERE
+		cVouchID = #{code}
+	</update>
 
 </mapper>

+ 6 - 0
src/main/java/net/chenlin/dp/modules/sys/service/SysUserService.java

@@ -139,4 +139,10 @@ public interface SysUserService {
 
 	int Ordershenhe(@Param("code")String code, @Param("dverifysystime")String dverifysystime, @Param("dverifydate")String dverifydate
 			, @Param("state")String state, @Param("cVerifier")String cVerifier);
+
+	int Purchaseshenhe(@Param("code")String code, @Param("dverifysystime")String dverifysystime, @Param("dverifydate")String dverifydate
+			, @Param("state")String state, @Param("cVerifier")String cVerifier);
+
+	int Payrequestshenhe(@Param("code")String code, @Param("dverifysystime")String dverifysystime, @Param("dverifydate")String dverifydate
+			, @Param("cVerifier")String cVerifier);
 }

+ 10 - 0
src/main/java/net/chenlin/dp/modules/sys/service/impl/SysUserServiceImpl.java

@@ -286,4 +286,14 @@ public class SysUserServiceImpl implements SysUserService {
 		return sysUserMapper.Ordershenhe(code,dverifysystime,dverifydate,state,cVerifier);
 	}
 
+	@Override
+	public int Purchaseshenhe(String code, String dverifysystime, String dverifydate, String state, String cVerifier) {
+		return sysUserMapper.Purchaseshenhe(code,dverifysystime,dverifydate,state,cVerifier);
+	}
+
+	@Override
+	public int Payrequestshenhe(String code, String dverifysystime, String dverifydate, String cVerifier) {
+		return sysUserMapper.Payrequestshenhe(code,dverifysystime,dverifydate,cVerifier);
+	}
+
 }