Commit dc2c5a04 by 徐康

餐具商品

parent fa4d5965
...@@ -124,7 +124,7 @@ public class ShoppingCartConvertAdapter { ...@@ -124,7 +124,7 @@ public class ShoppingCartConvertAdapter {
cartGoodsDetailDto.setClassificationId(cartGoods.getClassificationId()); cartGoodsDetailDto.setClassificationId(cartGoods.getClassificationId());
cartGoodsDetailDto.setClassificationName(cartGoods.getClassificationName()); cartGoodsDetailDto.setClassificationName(cartGoods.getClassificationName());
if(mcCafeTablewareSkuId.equals(cartGoods.getSkuId())) { if(mcCafeTablewareSkuId.equals(cartGoods.getSkuId())) {
cartGoodsDetailDto.setIsTableWare(1); cartGoodsDetailDto.setIsTableware(1);
} }
if (GoodsTypeEnum.SET_MEAL_GOODS.getGoodsType().equals(cartGoods.getGoodsType())) { if (GoodsTypeEnum.SET_MEAL_GOODS.getGoodsType().equals(cartGoods.getGoodsType())) {
cartGoodsDetailDto.setProductType(ProductType.SETMEAL.getCode()); cartGoodsDetailDto.setProductType(ProductType.SETMEAL.getCode());
......
...@@ -220,7 +220,7 @@ public class ShoppingCartGoodsDto { ...@@ -220,7 +220,7 @@ public class ShoppingCartGoodsDto {
/** /**
* 是否餐具商品 * 是否餐具商品
*/ */
private Integer isTableWare = 0; private Integer isTableware = 0;
/** /**
* 商品货号 * 商品货号
*/ */
......
...@@ -166,7 +166,7 @@ public class CartGoods { ...@@ -166,7 +166,7 @@ public class CartGoods {
/** /**
* 是否餐具商品 * 是否餐具商品
*/ */
private Boolean isTableWare = false; private Boolean isTableware = false;
/** /**
* 第三方商品编码 * 第三方商品编码
*/ */
......
...@@ -1415,7 +1415,7 @@ public class ShoppingCartMCoffeeServiceImpl { ...@@ -1415,7 +1415,7 @@ public class ShoppingCartMCoffeeServiceImpl {
for(int i=0;i<size;i++) { for(int i=0;i<size;i++) {
if(allCartGoodsList.get(i).getSkuId().equals(mcCafeTablewareSkuId)) { if(allCartGoodsList.get(i).getSkuId().equals(mcCafeTablewareSkuId)) {
CartGoods cartGoods = allCartGoodsList.get(i); CartGoods cartGoods = allCartGoodsList.get(i);
cartGoods.setIsTableWare(true); cartGoods.setIsTableware(true);
if(i != size-1) { if(i != size-1) {
allCartGoodsList.remove(i); allCartGoodsList.remove(i);
allCartGoodsList.add(cartGoods); allCartGoodsList.add(cartGoods);
......
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