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

@@ -249,10 +249,10 @@ public class AwaitSendController {
         }
         Map<String, Object> product1 = new HashMap<String, Object>();
         product1.put("GoodsName", goodName);
-        product1.put("GoodsWeight", 10.0);
+        // 计算产品重量
+        product1.put("GoodsWeight", 1.0);
         Commodity.add(product1);
 
-
         eOrderRequestData.setCommodity(Commodity);
         eOrderRequestData.setWeight(1.0);
         eOrderRequestData.setQuantity(1);
@@ -265,7 +265,7 @@ public class AwaitSendController {
             if (flag) {
                 // 获取电子面单成功
                 String code = jsonObject.getJSONObject("Order").getString("LogisticCode");
-                ////订单发货
+                // 订单发货
                 SalesOrder salesOrder = new SalesOrder();
                 salesOrder.setSalesPostFirm(post);
                 salesOrder.setSalesPostNum(code);