Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into qa

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

@@ -135,7 +135,7 @@ public class MaterialPromotionService implements IPromotionService {
             for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.ApportionGoods.Material material : apportionGood.getSmallMaterial()) {
 
                 if (material.getApportionAmount() == 0) continue;
-                pk = shoppingCartConvertAdapter.jointPk(material.getCartGoodsUid(), material.getGoodsId());
+                pk = shoppingCartConvertAdapter.jointPk(apportionGood.getCartGoodsUid(), material.getGoodsId());
                 if (mApportion.get(pk) == null) {
                     MaterialApportion materialApportion = new MaterialApportion();
                     //materialApportion.setSalePrice(material.getNowPrice());