1

src/main/java/net/chenlin/dp/common/openapi4j/commons/TokenManager.java

@@ -1,5 +1,6 @@
 package net.chenlin.dp.common.openapi4j.commons;
 
+import java.math.BigDecimal;
 import java.util.Properties;
 
 import net.chenlin.dp.common.openapi4j.exception.OpenAPIException;
@@ -20,8 +21,18 @@ public class TokenManager {
 		try {
 			if (accessToken == null) {
 				accessToken = getAccessToken();
-			} else if ((nowTime - accessToken.getCreateTime() + 10000) >= accessToken.getExpiresIn()) {
-				accessToken = getAccessToken();
+			}
+//			else if ((nowTime - accessToken.getCreateTime() + 10000) >= accessToken.getExpiresIn()) {
+//				accessToken = getAccessToken();
+//			}
+			else{
+				BigDecimal time=new BigDecimal("120000");
+				BigDecimal subtract1 = new BigDecimal(accessToken.getCreateTime()).subtract(time);
+				BigDecimal subtract = new BigDecimal(nowTime).subtract(subtract1);
+				BigDecimal divide = subtract.divide(new BigDecimal("1000"),0, BigDecimal.ROUND_UP);
+				if (Long.parseLong(divide.toString())>=accessToken.getExpiresIn()){
+					accessToken = getAccessToken();
+				}
 			}
 
 		} catch (OpenAPIException e) {

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

@@ -257,8 +257,8 @@ public class PayrequestService extends BaseService {
 
             OapiProcessinstanceCreateRequest.FormComponentValueVo fc6 = new OapiProcessinstanceCreateRequest.FormComponentValueVo();
             fc6.setName("付款日期");
-            if (so.getDgatheringdate()!=null&&!so.getDgatheringdate().equals("")){
-                fc6.setValue(so.getDgatheringdate());
+            if (so.getEntry().size()>0&&!so.getEntry().get(0).getDprepaydate().equals("")){
+                fc6.setValue(so.getEntry().get(0).getDprepaydate());
             }else {
                 fc6.setValue(so.getDvouchdate());
             }

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

@@ -200,8 +200,8 @@ public class PurchaseOrderService {
 
             OapiProcessinstanceCreateRequest.FormComponentValueVo fv = new OapiProcessinstanceCreateRequest.FormComponentValueVo();
             fv.setName("收货地址");
-            if (so.getDefine11()!=null&&!so.getDefine11().equals("")){
-                fv.setValue(so.getDefine11());
+            if (so.getDefine12()!=null&&!so.getDefine12().equals("")){
+                fv.setValue(so.getDefine12());
             }else {
                 fv.setValue("暂无");
             }
@@ -263,8 +263,8 @@ public class PurchaseOrderService {
 
                 OapiProcessinstanceCreateRequest.FormComponentValueVo fc7 = new OapiProcessinstanceCreateRequest.FormComponentValueVo();
                 fc7.setName("含税单价");
-                if (s.getTax()!=null&&!s.getTax().equals("0E-10")){
-                    fc7.setValue(s.getTax());
+                if (s.getTaxprice()!=null&&!s.getTaxprice().equals("0E-10")){
+                    fc7.setValue(s.getTaxprice());
                 }else {
                     fc7.setValue("0");
                 }

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

@@ -341,13 +341,16 @@ public class SaleOrderService {
                 }
                 mingxilist.add(fc12);
 
-                if(so.getDpredatebt()!=null&&!so.getDpredatebt().equals("")){
-                    OapiProcessinstanceCreateRequest.FormComponentValueVo fc13= new OapiProcessinstanceCreateRequest.FormComponentValueVo();
-                    fc13.setName("交期");
+                OapiProcessinstanceCreateRequest.FormComponentValueVo fc13= new OapiProcessinstanceCreateRequest.FormComponentValueVo();
+                fc13.setName("交期");
+                if (s.getDefine23()!=null&&!s.getDefine23().equals("")){
+                    fc13.setValue(s.getDefine23());
+                }else {
                     fc13.setValue(so.getDpredatebt());
-                    mingxilist.add(fc13);
                 }
 
+                mingxilist.add(fc13);
+
 
                 ls.add(mingxilist);
 

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

@@ -25,7 +25,7 @@ public class PayrequestMin {
     private  String iorisum;//源单金额
     private  String ioritaxcost;//原币单价
     private  String inattaxprice;//本币单价
-    private  String dprepaydate;
+    private  String dprepaydate;//预计付款时间
     private  String cdefine22;
     private  String cdefine23;
     private  String cdefine24;