Merge remote-tracking branch 'origin/feature/2.1.15-三方编码'

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/adapter/ShoppingCartAdapter.java

@@ -389,6 +389,7 @@ public class ShoppingCartAdapter {
             //原行单价*数量
             material.setOriginalAmount(detail.getProductFinalPrice().longValue() * cartGoods.getQty());
             material.setOriginalPrice(detail.getProductFinalPrice().longValue());
+            material.setCustomerCode(detail.getCustomerCode());
             materialGoodsList.add(material);
             materialAmount += detail.getProductFinalPrice().longValue() * cartGoods.getQty();
             originalMaterAmount += detail.getProductFinalPrice().longValue() * cartGoods.getQty();

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

@@ -393,6 +393,7 @@ public class CalculationCommonService {
                 goods.setSpuName(mg.getSpuName());
                 goods.setSalePrice(mg.getFinalPrice());
                 goods.setQty(cartGoods.getQty());
+                goods.setCustomerCode(cartGoods.getCustomerCode());
                 goods.setOriginalPrice(mg.getOriginalPrice());
                 //提前当前行促销
                 BlockRow blockRow = smallRow.get(goods.getSpuId());