Merge remote-tracking branch 'origin/qa' into qa

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/MaterialPromotionService.java

@@ -151,7 +151,7 @@ public class MaterialPromotionService implements IPromotionService {
                     mApportion.put(pk, materialApportion);
                     continue;
                 }
-                MaterialApportion apportion = mApportion.get(material.getGoodsId());
+                MaterialApportion apportion = mApportion.get(pk);
                 apportion.setSalePrice(apportion.getSalePrice() + material.getNowPrice());
                 apportion.setAmount(apportion.getAmount() + material.getNowPrice() * material.getGoodsQuantity());
                 apportion.setApportionAmount(apportion.getApportionAmount() + material.getApportionAmount() * material.getGoodsQuantity());