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

@@ -2741,7 +2741,8 @@ public class OrderSdkAdapter {
             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());
+                        Integer comboQty = t.getNumber() == null ? 0 : t.getNumber();
+                        return WeightUtils.changeToG(t.getWeight(), t.getUnit()) * comboQty;
                     }).reduce(0D, Double::sum);
                     totalWeight += comboProductTotalWeight * qty;
                 }