Commit fa4d5965 by 徐康

餐具商品

parent bbd27e62
...@@ -2441,7 +2441,7 @@ public class OrderAdapter { ...@@ -2441,7 +2441,7 @@ public class OrderAdapter {
createOrderProductDemoDto.setPicture(cartGoodsDetailDto.getPicture()); createOrderProductDemoDto.setPicture(cartGoodsDetailDto.getPicture());
createOrderProductDemoDto.setAddInfo(cartGoodsDetailDto.getAttributeNames()); createOrderProductDemoDto.setAddInfo(cartGoodsDetailDto.getAttributeNames());
createOrderProductDemoDto.setDiscountId(cartGoodsDetailDto.getCouponCode()); createOrderProductDemoDto.setDiscountId(cartGoodsDetailDto.getCouponCode());
if(!cartGoodsDetailDto.getIsTableware()) { if(cartGoodsDetailDto.getIsTableware() == 0) {
createOrderProductDemoDto.setProductType(productType); createOrderProductDemoDto.setProductType(productType);
} else { } else {
createOrderProductDemoDto.setProductType(ProductTypeEnum.TABLEWARE_PRODUCT.getCode()); createOrderProductDemoDto.setProductType(ProductTypeEnum.TABLEWARE_PRODUCT.getCode());
......
...@@ -199,7 +199,7 @@ public class ShoppingCartGoodsDto { ...@@ -199,7 +199,7 @@ public class ShoppingCartGoodsDto {
/** /**
* 是否餐具商品 * 是否餐具商品
*/ */
private Boolean isTableware = false; private Integer isTableware = 0;
/** /**
* 商品重量 * 商品重量
*/ */
......
...@@ -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(true); 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 Boolean isTableWare = false; private Integer isTableWare = 0;
/** /**
* 商品货号 * 商品货号
*/ */
......
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