Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

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

@@ -176,6 +176,9 @@ public class AwaitSendController {
                                    @RequestParam("salesId") Integer salesId,
                                    HttpServletRequest request) {
         SalesOrder salesOrderInfo = salesOrderService.getSalesOrderById(salesId);
+        // 替换
+        post = salesOrderInfo.getSalesPostFirm();
+
         StoreShip storeShip = null;
         if(salesOrderInfo.getSalesStoreId() != null){
             storeShip = storeShipService.getStoreShipByStoreId(salesOrderInfo.getSalesStoreId());
@@ -264,10 +267,10 @@ public class AwaitSendController {
         List<SalesOrderItem> items = salesOrderService.listSalesOrderItem(item);
         // 整个产品的重量
         Double colorIsWeight = 0.00;
-        String goodName = "";
+        StringBuilder goodName = new StringBuilder();
         int Goodsquantity = 0;
         for (SalesOrderItem temp : items) {
-            goodName += temp.getProductAbbreviation() + "(" + (temp.getColorAbbreviation()) + ")*"+temp.getItemNum() + ";";
+            goodName.append(temp.getProductAbbreviation()).append("(").append(temp.getColorAbbreviation()).append(")*").append(temp.getItemNum()).append(";");
             if(temp.getColorIsWeight() != null){
                 colorIsWeight += temp.getColorIsWeight();
             }
@@ -293,7 +296,7 @@ public class AwaitSendController {
             boolean flag = jsonObject.getBoolean("Success");
             if (flag) {
                 // 替换产品名称
-                json = json.replace(uuid, goodName);
+                json = json.replace(uuid, goodName.toString());
                 // 获取电子面单成功
                 String code = jsonObject.getJSONObject("Order").getString("LogisticCode");
 

watero-rst-web/src/main/java/com/iamberry/rst/utils/OrderUtils.java

@@ -40,8 +40,8 @@ public class OrderUtils {
      * @throws Exception
      */
     public static String orderOnlineByJson(EOrderRequestData orderRequestData) throws Exception {
-        // 第三方接口对时效性有要求，并发数不超过多少，此处Sleep 100ms
-        Thread.sleep(100);
+        // 第三方接口对时效性有要求，并发数不超过多少，此处Sleep 1200ms
+        Thread.sleep(1200);
         // 生成电子面单的请求数据
         String requestData = JSONObject.toJSONString(orderRequestData);
         // 生成系统级请求数据