Commit baa78459 by 周晓航

设置小料商品类型

Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
parent 52fd1718
...@@ -407,6 +407,7 @@ public class ShoppingCartMealServiceImpl implements ShoppingCartNewService { ...@@ -407,6 +407,7 @@ public class ShoppingCartMealServiceImpl implements ShoppingCartNewService {
cartGoodsDetailDtos.addAll(shoppingCartConvertAdapter.getComboxGoods2DetailGoods(eachGoods, eachGoods.getProductComboList(), true,totalDiscountAmount)); cartGoodsDetailDtos.addAll(shoppingCartConvertAdapter.getComboxGoods2DetailGoods(eachGoods, eachGoods.getProductComboList(), true,totalDiscountAmount));
cartGoodsDetailDtos.addAll(shoppingCartConvertAdapter.getComboxGoods2DetailGoods(eachGoods, eachGoods.getProductGroupList(), false,0)); cartGoodsDetailDtos.addAll(shoppingCartConvertAdapter.getComboxGoods2DetailGoods(eachGoods, eachGoods.getProductGroupList(), false,0));
cartGoodsDetailDto.setComboProducts(cartGoodsDetailDtos); cartGoodsDetailDto.setComboProducts(cartGoodsDetailDtos);
cartGoodsDetailDto.setOriginalProductType(eachGoods.getOriginalProductType());
products.add(cartGoodsDetailDto); products.add(cartGoodsDetailDto);
}); });
} }
......
...@@ -16,8 +16,6 @@ import cn.freemud.enums.*; ...@@ -16,8 +16,6 @@ import cn.freemud.enums.*;
import cn.freemud.handle.CommonFunctionHandle; import cn.freemud.handle.CommonFunctionHandle;
import cn.freemud.service.thirdparty.CustomerApplicationClient; import cn.freemud.service.thirdparty.CustomerApplicationClient;
import cn.freemud.utils.BeanUtil; import cn.freemud.utils.BeanUtil;
import com.alibaba.fastjson.JSON;
import com.freemud.sdk.api.assortment.shoppingcart.util.ShoppingSdkLogUtil;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import ma.glasnost.orika.MapperFacade; import ma.glasnost.orika.MapperFacade;
...@@ -392,6 +390,8 @@ public class CalculationCommonService { ...@@ -392,6 +390,8 @@ public class CalculationCommonService {
ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto = new ShoppingCartGoodsDto.CartGoodsDetailDto(); ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto = new ShoppingCartGoodsDto.CartGoodsDetailDto();
cartGoodsDetailDto.setCartGoodsUid(cartGoods.getCartGoodsUid()); cartGoodsDetailDto.setCartGoodsUid(cartGoods.getCartGoodsUid());
// fisherman
cartGoodsDetailDto.setOriginalProductType(cartGoods.getOriginalProductType());
cartGoodsDetailDto.setTaxId(cartGoods.getTaxId()); cartGoodsDetailDto.setTaxId(cartGoods.getTaxId());
cartGoodsDetailDto.setTax(cartGoods.getTax()); cartGoodsDetailDto.setTax(cartGoods.getTax());
cartGoodsDetailDto.setSpuId(cartGoods.getSpuId()); cartGoodsDetailDto.setSpuId(cartGoods.getSpuId());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment