设置 新算价的extinfo 信息

Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>

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

@@ -171,7 +171,7 @@ public class ItemServiceImpl implements ItemService {
                 getProductsVo.setCategoryName(productBean.getCategoryName());
                 getProductsVo.setProductBindingCouponTypes(productBean.getProductBindingCouponTypes());
                 resultMap.put(productBean.getPid(), getProductsVo);
-                getProductsVo.setType(1);
+                getProductsVo.setType(productBean.getType());
                 // 规格ID 剔除单品
                 if (Objects.equals(productBean.getIsSkuProduct(), YesOrNoEnum.YES.getCode())) {
                     getProductsVo.setType(10);

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

@@ -8,10 +8,12 @@ import cn.freemud.entities.vo.*;
 import cn.freemud.enums.ActivityTypeEnum;
 import cn.freemud.enums.CalculationGoodsType;
 import cn.freemud.enums.ResponseResult;
+import cn.freemud.handle.GetActivityMsgHandle;
 import cn.freemud.interceptor.ServiceException;
 import cn.freemud.service.ItemService;
 import cn.freemud.service.impl.AssortmentSdkService;
 import com.alibaba.fastjson.JSON;
+import com.freemud.application.sdk.api.ordercenter.enums.ProductTypeEnum;
 import com.freemud.application.sdk.api.productcenter.domain.ProductBeanDTO;
 import com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum;
 import com.freemud.sdk.api.assortment.shoppingcart.service.impl.ShoppingCartBaseServiceImpl;
@@ -51,6 +53,10 @@ public class AdditionSharingService {
     @Autowired
     private ItemService itemService;
 
+    @Autowired
+    private GetActivityMsgHandle getActivityMsgHandle;
+
+
     public void additionResponse(ActivityCalculationDiscountResponseDto.CalculationDiscountResult discountResult
             , List<CartGoods> cartGoodsList
             , ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo
@@ -256,7 +262,6 @@ public class AdditionSharingService {
         //Long totalAmount = shoppingCartGoodsDto.getTotalAmount();
         //Long totalDiscountAmount = shoppingCartGoodsDto.getTotalDiscountAmount();
         //加价换购活动总优惠
-        ShoppingSdkLogUtil.printLog("fishemran 新算价 虚拟券商品设置", JSON.toJSONString(getProductsVoMap),JSON.toJSONString(discountResult));
         for (CreateOrderVo.PremiumExchangeActivity.Product product : premiumExchangeActivity.getProducts()) {
 
             String goodsId = StringUtils.isEmpty(product.getSkuId()) ? product.getSpuId() : product.getSkuId();
@@ -269,6 +274,13 @@ public class AdditionSharingService {
                 continue;
             }
             ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto = this.getCartGoodsDetailDto(product, getProductsVo, goodsId, hgGood);
+            // fisherman 结算页 如果是虚拟商品 需要设置 到 extinfo里面注意 新算价
+            if (cartGoodsDetailDto.getProductType().compareTo(ProductTypeEnum.VIRTUAL_PRODUCT.getCode()) == 0) {
+                List<CouponMsg> couponData = getActivityMsgHandle.getCouponData(getProductsVo.getProductBindingCouponTypes(), shoppingCartInfoRequestVo.getPartnerId());
+                if (CollectionUtils.isNotEmpty(couponData)) {
+                    cartGoodsDetailDto.setExtInfo(JSON.toJSONString(couponData));
+                }
+            }
             shoppingCartGoodsDto.getProducts().add(cartGoodsDetailDto);
             //2.计算优惠价格
             originalTotalAmount += getProductsVo.getFinalPrice();