对接促销算价Alpha->fix

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

@@ -13,8 +13,10 @@ import cn.freemud.entities.vo.ShoppingCartInfoRequestVo;
 import cn.freemud.enums.*;
 import cn.freemud.service.thirdparty.CustomerApplicationClient;
 import cn.freemud.utils.BeanUtil;
+import com.alibaba.fastjson.JSON;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
@@ -39,6 +41,7 @@ import static cn.freemud.constant.ShoppingCartConstant.SHOPPING_CART_INVALIAD_GO
  * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
  */
 @Service
+@Slf4j
 public class CalculationCommonService {
 
     @Autowired
@@ -54,6 +57,7 @@ public class CalculationCommonService {
         /**
          * 使用促销算价赋值行记录
          */
+        log.info("initShoppingCart:{}", JSON.toJSON(cartGoodsList));
         List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods> goods = null;
         if (discountResult != null && CollectionUtils.isNotEmpty(discountResult.getGoods())) {
             goods = discountResult.getGoods();
@@ -113,7 +117,7 @@ public class CalculationCommonService {
                     original += choice.getOriginalPrice() * cartGoods.getQty();
                 } else {
                     amount += mt.getRealAmount();
-                    original += choice.getFinalPrice() * cartGoods.getQty();
+                    original += choice.getFinalPrice() * choice.getQty();
                     choice.setAmount(mt.getRealAmount().longValue());
                     choice.setOriginalAmount(original);
                 }