wangxiaoming 6 tahun lalu
induk
melakukan
a1b69bac2f

+ 3 - 5
watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AwaitSendController.java

@@ -189,11 +189,12 @@ public class AwaitSendController {
          */
         EOrderRequestData eOrderRequestData = new EOrderRequestData();
         eOrderRequestData.ShipperCode = (post);
-        eOrderRequestData.OrderCode = (orderId);
+        eOrderRequestData.OrderCode = (UUID.randomUUID().toString().replace("-", ""));
         eOrderRequestData.PayType = (3);
         eOrderRequestData.ExpType = ("1");
         eOrderRequestData.Cost = (0.00);
         eOrderRequestData.OtherCost = (0.0);
+        eOrderRequestData.Remark = salesId + "-" + orderId;
 
         // 不同的快递公司需要做不同的处理
         if (post.equalsIgnoreCase("EMS")) {
@@ -274,16 +275,12 @@ public class AwaitSendController {
         }
         String uuid = UUIDGenerator.getUUID().substring(0, 8);
 
-        LOGGER.info("===salesId:" + salesId + "uuid:"+uuid);
-
         Map<String, Object> product1 = new HashMap<String, Object>();
         product1.put("GoodsName", uuid);
         product1.put("Goodsquantity", Goodsquantity);
         // 计算产品重量
         product1.put("GoodsWeight", colorIsWeight/1000);
 
-        LOGGER.info("===salesId:" + salesId + "重量:" + colorIsWeight/1000);
-
         commodity.add(product1);
 
         eOrderRequestData.Commodity = (commodity);
@@ -299,6 +296,7 @@ public class AwaitSendController {
                 json = json.replace(uuid, goodName);
                 // 获取电子面单成功
                 String code = jsonObject.getJSONObject("Order").getString("LogisticCode");
+
                 // 订单发货
                 SalesOrder salesOrder = new SalesOrder();
                 salesOrder.setSalesPostFirm(eOrderRequestData.ShipperCode);

+ 2 - 1
watero-rst-web/src/main/resources/platform.properties

@@ -107,6 +107,7 @@ scanningQrCode=https://w.iamberry.com/tooth/wechat/qr/
 
 #send from url
 #ReqURL=http://api.kdniao.cc/api/Eorderservice
-ReqURL=http://testapi.kdniao.cc:8081/api/EOrderService
+ReqURL=http://api.kdniao.com/api/Eorderservice
+#ReqURL=http://testapi.kdniao.cc:8081/api/EOrderService