Merge remote-tracking branch 'origin/dev' into dev

applications/transfers/transfers-server/src/main/java/com/usoftchina/saas/transfers/task/SendPurchaseEndTask.java

@@ -1,6 +1,8 @@
 package com.usoftchina.saas.transfers.task;
 
+import com.alibaba.fastjson.JSON;
 import com.usoftchina.saas.account.api.CompanyApi;
+import com.usoftchina.saas.account.dto.CompanyDTO;
 import com.usoftchina.saas.inquiry.po.purchase.PurchaseDetailEnd;
 import com.usoftchina.saas.purchase.api.PurchaseApi;
 import com.usoftchina.saas.purchase.dto.PurchaseDetailDTO;
@@ -41,7 +43,7 @@ public class SendPurchaseEndTask extends Executable {
 
     @Override
     public void execute(MessageInfo messageInfo) throws Exception {
-        String accessSecretKey = companyApi.getCompanyById(messageInfo.getCompanyId()).getData().getAccessKey();
+        CompanyDTO companyDTO = companyApi.getCompanyById(messageInfo.getCompanyId()).getData();
         PurchaseFormDTO purchaseFormDTO = purchaseApi.getFormData(Long.parseLong(messageInfo.getBizId())).getData();
         short endStatus = 0;
         //结案、反结案
@@ -60,10 +62,14 @@ public class SendPurchaseEndTask extends Executable {
                         new BigDecimal(purchaseDetailDTO.getId()).intValue());
                 purchaseDetailEndList.add(purchaseDetailEnd);
             }
+            //添加身份ID
+            String url = b2bConfig.getCommon() + purchaseEndUrl + "?access_id=" + companyDTO.getUu();
             //发送给b2b
-            boolean success = SendUtil.sendToB2B(b2bConfig.getCommon() + purchaseEndUrl, JsonUtils.toJsonString(purchaseDetailEndList), accessSecretKey);
+            boolean success = SendUtil.sendToB2B(url, JSON.toJSONString(purchaseDetailEndList), companyDTO.getAccessKey());
             if (success) {
                 purchaseApi.updateB2BStatus(Long.parseLong(messageInfo.getBizId()), "已上传");
+            } else {
+                throw new Exception("上传失败");
             }
         }
 

applications/transfers/transfers-server/src/main/java/com/usoftchina/saas/transfers/task/SendPurchaseInResTask.java

@@ -1,5 +1,6 @@
 package com.usoftchina.saas.transfers.task;
 
+import com.alibaba.fastjson.JSON;
 import com.usoftchina.saas.account.api.CompanyApi;
 import com.usoftchina.saas.account.dto.CompanyDTO;
 import com.usoftchina.saas.inquiry.po.purchase.PurchaseProdInOut;
@@ -20,6 +21,7 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties
 import org.springframework.stereotype.Component;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -39,7 +41,7 @@ public class SendPurchaseInResTask extends Executable {
     private B2BConfig b2bConfig;
 
     private static final Logger LOGGER = LoggerFactory.getLogger(SendProductTask.class);
-    private final String prodInUrl = "/erp/purchase/prodInOut/nonPosting";
+    private final String prodInResUrl = "/erp/purchase/prodInOut/nonPosting";
 
     @Override
     public void execute(MessageInfo messageInfo) throws Exception {
@@ -56,7 +58,13 @@ public class SendPurchaseInResTask extends Executable {
         b2bPurchaseProdInOut.setDetails(b2bPurchaseProdInOutDetailList);
         LOGGER.info("ProdIODetailDTOList={}, b2bPurchaseProdInOutDetailList={}", JsonUtils.toJsonString(prodInOutFormDTO.getItems()), JsonUtils.toJsonString(b2bPurchaseProdInOutDetailList));
 
-        boolean success = SendUtil.sendToB2B(b2bConfig.getCommon() + prodInUrl, JsonUtils.toJsonString(b2bPurchaseProdInOut), companyDTO.getAccessKey());
+        //添加身份ID
+        String url = b2bConfig.getCommon() + prodInResUrl + "?access_id=" + companyDTO.getUu();
+        //将数据改为B2B数据格式
+        List<PurchaseProdInOut> data = new ArrayList<PurchaseProdInOut>();
+        data.add(b2bPurchaseProdInOut);
+
+        boolean success = SendUtil.sendToB2B(url, JSON.toJSONString(data), companyDTO.getAccessKey());
         if (success) {
             LOGGER.info("采购验收单(反过账)上传成功, id={}", messageInfo.getBizId());
             prodInOutApi.updateB2BStatus(Long.parseLong(messageInfo.getBizId()), "已上传");

applications/transfers/transfers-server/src/main/java/com/usoftchina/saas/transfers/task/SendPurchaseInTask.java

@@ -1,5 +1,6 @@
 package com.usoftchina.saas.transfers.task;
 
+import com.alibaba.fastjson.JSON;
 import com.usoftchina.saas.account.api.AccountApi;
 import com.usoftchina.saas.account.api.CompanyApi;
 import com.usoftchina.saas.account.dto.AccountDTO;
@@ -24,6 +25,7 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties
 import org.springframework.stereotype.Component;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -62,10 +64,18 @@ public class SendPurchaseInTask extends Executable{
         b2bPurchaseProdInOut.setDetails(b2bPurchaseProdInOutDetailList);
         LOGGER.info("ProdIODetailDTOList={}, b2bPurchaseProdInOutDetailList={}", JsonUtils.toJsonString(prodInOutFormDTO.getItems()), JsonUtils.toJsonString(b2bPurchaseProdInOutDetailList));
 
-        boolean success = SendUtil.sendToB2B(b2bConfig.getCommon() + prodInUrl, JsonUtils.toJsonString(b2bPurchaseProdInOut), companyDTO.getAccessKey());
+        //添加身份ID
+        String url = b2bConfig.getCommon() + prodInUrl + "?access_id=" + companyDTO.getUu();
+        //将数据改为B2B数据格式
+        List<PurchaseProdInOut> data = new ArrayList<PurchaseProdInOut>();
+        data.add(b2bPurchaseProdInOut);
+        boolean success = SendUtil.sendToB2B(url, JSON.toJSONString(data), companyDTO.getAccessKey());
         if (success) {
             LOGGER.info("采购验收单上传成功, id={}", messageInfo.getBizId());
             prodInOutApi.updateB2BStatus(Long.parseLong(messageInfo.getBizId()), "已上传");
+        } else {
+            LOGGER.info("采购验收单上传失败, id={}", messageInfo.getBizId());
+            throw new Exception("上传失败");
         }
     }
 

applications/transfers/transfers-server/src/main/java/com/usoftchina/saas/transfers/task/SendPurchaseOutResTask.java

@@ -1,5 +1,6 @@
 package com.usoftchina.saas.transfers.task;
 
+import com.alibaba.fastjson.JSON;
 import com.usoftchina.saas.account.api.CompanyApi;
 import com.usoftchina.saas.account.dto.CompanyDTO;
 import com.usoftchina.saas.inquiry.po.purchase.PurchaseProdInOut;
@@ -20,6 +21,7 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties
 import org.springframework.stereotype.Component;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -38,7 +40,7 @@ public class SendPurchaseOutResTask extends Executable {
     private B2BConfig b2bConfig;
 
     private static final Logger LOGGER = LoggerFactory.getLogger(SendProductTask.class);
-    private final String prodOutUrl = "/erp/purchase/prodReturn/nonPosting";
+    private final String prodOutResUrl = "/erp/purchase/prodReturn/nonPosting";
 
 
     @Override
@@ -56,7 +58,13 @@ public class SendPurchaseOutResTask extends Executable {
         b2bPurchaseProdInOut.setDetails(b2bPurchaseProdInOutDetailList);
         LOGGER.info("ProdIODetailDTOList={}, b2bPurchaseProdInOutDetailList={}", JsonUtils.toJsonString(prodInOutFormDTO.getItems()), JsonUtils.toJsonString(b2bPurchaseProdInOutDetailList));
 
-        boolean success = SendUtil.sendToB2B(b2bConfig.getCommon() + prodOutUrl, JsonUtils.toJsonString(b2bPurchaseProdInOut), companyDTO.getAccessKey());
+        //添加身份ID
+        String url = b2bConfig.getCommon() + prodOutResUrl + "?access_id=" + companyDTO.getUu();
+        //将数据改为B2B数据格式
+        List<PurchaseProdInOut> data = new ArrayList<PurchaseProdInOut>();
+        data.add(b2bPurchaseProdInOut);
+
+        boolean success = SendUtil.sendToB2B(url, JSON.toJSONString(data), companyDTO.getAccessKey());
         if (success) {
             LOGGER.info("采购验退单(反过账)上传成功, id={}", messageInfo.getBizId());
             prodInOutApi.updateB2BStatus(Long.parseLong(messageInfo.getBizId()), "已上传");

applications/transfers/transfers-server/src/main/java/com/usoftchina/saas/transfers/task/SendPurchaseOutTask.java

@@ -1,5 +1,6 @@
 package com.usoftchina.saas.transfers.task;
 
+import com.alibaba.fastjson.JSON;
 import com.usoftchina.saas.account.api.CompanyApi;
 import com.usoftchina.saas.account.dto.CompanyDTO;
 import com.usoftchina.saas.inquiry.po.purchase.PurchaseProdInOut;
@@ -20,6 +21,7 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties
 import org.springframework.stereotype.Component;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -57,10 +59,19 @@ public class SendPurchaseOutTask extends Executable{
         b2bPurchaseProdInOut.setDetails(b2bPurchaseProdInOutDetailList);
         LOGGER.info("ProdIODetailDTOList={}, b2bPurchaseProdInOutDetailList={}", JsonUtils.toJsonString(prodInOutFormDTO.getItems()), JsonUtils.toJsonString(b2bPurchaseProdInOutDetailList));
 
-        boolean success = SendUtil.sendToB2B(b2bConfig.getCommon() + prodOutUrl, JsonUtils.toJsonString(b2bPurchaseProdInOut), companyDTO.getAccessKey());
+        //添加身份ID
+        String url = b2bConfig.getCommon() + prodOutUrl + "?access_id=" + companyDTO.getUu();
+        //将数据改为B2B数据格式
+        List<PurchaseProdInOut> data = new ArrayList<PurchaseProdInOut>();
+        data.add(b2bPurchaseProdInOut);
+
+        boolean success = SendUtil.sendToB2B(url, JSON.toJSONString(data), companyDTO.getAccessKey());
         if (success) {
             LOGGER.info("采购验退单上传成功, id={}", messageInfo.getBizId());
             prodInOutApi.updateB2BStatus(Long.parseLong(messageInfo.getBizId()), "已上传");
+        } else {
+            LOGGER.info("采购验退单上传失败, id={}", messageInfo.getBizId());
+            throw new Exception("上传失败");
         }
     }
 

applications/transfers/transfers-server/src/main/java/com/usoftchina/saas/transfers/task/SendPurchaseTask.java

@@ -1,5 +1,6 @@
 package com.usoftchina.saas.transfers.task;
 
+import com.alibaba.fastjson.JSON;
 import com.usoftchina.saas.account.api.AccountApi;
 import com.usoftchina.saas.account.api.CompanyApi;
 import com.usoftchina.saas.account.dto.AccountDTO;
@@ -70,10 +71,10 @@ public class SendPurchaseTask extends Executable {
             b2bPurchase.setPurchaseDetails(b2bPurchaseDetailList);
             //添加身份ID
             String url = b2bConfig.getCommon() + purchaseUrl + "?access_id=" + companyDTO.getUu();
-            //将数据改为数据格式
+            //将数据改为B2B数据格式
             List<Purchase> data = new ArrayList<Purchase>();
             data.add(b2bPurchase);
-            boolean success = SendUtil.sendToB2B(url, JsonUtils.toJsonString(data), companyDTO.getAccessKey());
+            boolean success = SendUtil.sendToB2B(url, JSON.toJSONString(data), companyDTO.getAccessKey());
             if (success) {
                 purchaseApi.updateB2BStatus(Long.parseLong(messageInfo.getBizId()), "已上传");
             }else{

applications/transfers/transfers-server/src/main/java/com/usoftchina/saas/transfers/utils/SendUtil.java

@@ -28,7 +28,7 @@ public class SendUtil {
      */
     public static boolean sendToB2B(String url, String data, String accessSecretKey) throws Exception {
         Map<String, String> params = new HashMap<String, String>();
-        params.put("data", JsonUtils.toJsonString(data));
+        params.put("data", data);
         LOGGER.info("url={}, accessSecretKey={}", url, accessSecretKey);
         LOGGER.info("data={}", data);
         Response response = HttpUtil.sendPostRequest(url, params, true, accessSecretKey);