Merge branch 'feature/1.9.13-mall-20200219-dingkai' into develop

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -2730,7 +2730,6 @@ public class OrderSdkAdapter {
 
     /**
      * 计算所有商品的重量 单位g
-     * 称重菜的重量单位是斤
      */
     private Double sumOrderWeight(List<CreateOrderProductRequest> products) {
         Double totalWeight = 0D;
@@ -2738,15 +2737,16 @@ public class OrderSdkAdapter {
             return totalWeight;
         }
         for (CreateOrderProductRequest productRequest : products) {
+            Integer qty = productRequest.getNumber() == null ? 0 : productRequest.getNumber();
             if (ObjectUtils.equals(ProductTypeEnum.SETMEAL_PRODUCT.getCode(), productRequest.getProductType()) || ObjectUtils.equals(ProductTypeEnum.SETMEAL_UPPRICE_PRODUCT.getCode(), productRequest.getProductType())) {
                 if (CollectionUtils.isNotEmpty(productRequest.getComboProduct())) {
                     Double comboProductTotalWeight = productRequest.getComboProduct().stream().map(t -> {
                         return WeightUtils.changeToG(t.getWeight(), t.getUnit());
                     }).reduce(0D, Double::sum);
-                    totalWeight += comboProductTotalWeight;
+                    totalWeight += comboProductTotalWeight * qty;
                 }
             } else {
-                totalWeight += WeightUtils.changeToG(productRequest.getWeight(), productRequest.getUnit());;
+                totalWeight += WeightUtils.changeToG(productRequest.getWeight(), productRequest.getUnit()) * qty;
             }
         }
         return totalWeight;