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

platform-service/src/main/java/com/platform/service/yongyou/impl/YongyouServiceImpl.java

@@ -504,14 +504,14 @@ public class YongyouServiceImpl implements YongyouService {
     public AbstractPageResultBean<LongYanPurchaseDetailListVO> getLongYanPurchaseDetailListVOs(LongYanPurchaseOrderDTO detailDTO, Integer pageNum, Integer pageSize) {
         GetLongYanPurchaseDetalListRequest request = new GetLongYanPurchaseDetalListRequest();
         // 正式环境代码开始
-       /* request.setToken(geToken(detailDTO.getOldOrNew()));
+        request.setToken(geToken(detailDTO.getOldOrNew()));
         request.setCAcc_ID(getCAccId2(detailDTO.getOldOrNew()));
-        request.setConn(getConn2(detailDTO.getOldOrNew()));*/
+        request.setConn(getConn2(detailDTO.getOldOrNew()));
         // 正式环境代码结束
         // 测试环境代码开始
-        request.setToken(geTokenTest());
+        /*request.setToken(geTokenTest());
         request.setCAcc_ID(getCAccIdTest());
-        request.setConn(getConnTest());
+        request.setConn(getConnTest());*/
         // 测试环境代码结束
         StringBuffer strWhere = new StringBuffer("1=1 and ccode = ").append("'"+detailDTO.getYongYouId()+"'");
         request.setStrWhere(strWhere.toString());
@@ -605,14 +605,14 @@ public class YongyouServiceImpl implements YongyouService {
             request.setCcode(order.getYongYouId());
             request.setTradeID("");
             // 正式环境代码开始
-            /*request.setToken(geToken(list.get(0).getOldOrNew()));
-            request.setCAcc_ID(getCAccId2(list.get(0).getOldOrNew()));
-            request.setConn(getConn2(list.get(0).getOldOrNew()));*/
+            request.setToken(geToken(order.getOldOrNew()));
+            request.setCAcc_ID(getCAccId2(order.getOldOrNew()));
+            request.setConn(getConn2(order.getOldOrNew()));
             // 正式环境代码结束
             // 测试环境代码开始
-            request.setToken(geTokenTest());
+            /*request.setToken(geTokenTest());
             request.setCAcc_ID(getCAccIdTest());
-            request.setConn(getConnTest());
+            request.setConn(getConnTest());*/
             // 测试环境代码结束
             DeletePurchaseOrderHandler handler = new DeletePurchaseOrderHandler();
             handler.setRequest(request);
@@ -686,14 +686,14 @@ public class YongyouServiceImpl implements YongyouService {
         request.setPuAppVouch(puAppVouch);
         request.setTradeID("");
         // 正式环境代码开始
-        /*request.setToken(geToken(vo.getOldOrNew()));
+        request.setToken(geToken(vo.getOldOrNew()));
         request.setCAcc_ID(getCAccId2(vo.getOldOrNew()));
-        request.setConn(getConn2(vo.getOldOrNew()));*/
+        request.setConn(getConn2(vo.getOldOrNew()));
         // 正式环境代码结束
         // 测试环境代码开始
-        request.setToken(geTokenTest());
+        /*request.setToken(geTokenTest());
         request.setCAcc_ID(getCAccIdTest());
-        request.setConn(getConnTest());
+        request.setConn(getConnTest());*/
         // 测试环境代码结束
         PushPurchaseOrderHandler handler = new PushPurchaseOrderHandler();
         handler.setRequest(request);
@@ -745,14 +745,14 @@ public class YongyouServiceImpl implements YongyouService {
         request.setInventory(Inventory);
         request.setTradeID("");
         // 正式环境代码开始
-        /*request.setToken(geToken(longYanSpareAdd.getTokenType()));
+        request.setToken(geToken(longYanSpareAdd.getTokenType()));
         request.setConn(getConn2(longYanSpareAdd.getTokenType()));
-        request.setCAcc_ID(getCAccId2(longYanSpareAdd.getTokenType()));*/
+        request.setCAcc_ID(getCAccId2(longYanSpareAdd.getTokenType()));
         // 正式环境代码结束
         // 测试环境代码开始
-        request.setToken(geTokenTest());
+        /*request.setToken(geTokenTest());
         request.setConn(getConnTest());
-        request.setCAcc_ID(getCAccIdTest());
+        request.setCAcc_ID(getCAccIdTest());*/
         // 测试环境代码结束
         AddSpareHandler handler = new AddSpareHandler();
         handler.setRequest(request);
@@ -799,14 +799,14 @@ public class YongyouServiceImpl implements YongyouService {
             request.setInventory(Inventory);
             request.setTradeID("");
             // 正式环境代码开始
-           /* request.setToken(geToken(tokenType));
+            request.setToken(geToken(tokenType));
             request.setConn(getConn2(tokenType));
-            request.setCAcc_ID(getCAccId2(tokenType));*/
+            request.setCAcc_ID(getCAccId2(tokenType));
             // 正式环境代码结束
             // 测试环境代码开始
-            request.setToken(geTokenTest());
+            /*request.setToken(geTokenTest());
             request.setConn(getConnTest());
-            request.setCAcc_ID(getCAccIdTest());
+            request.setCAcc_ID(getCAccIdTest());*/
             // 测试环境代码结束
             pakageAndInsertSpare(Inventory, userInfo,longYanSpareAdd);
             AddSpareHandler handler = new AddSpareHandler();