Skip to content

O
order-group
Commit 4e7426df by ping.wu
Options

Merge branches 'develop' and 'feature/20200721_麦咖啡购物车_wuping' of… 

Merge branches 'develop' and 'feature/20200721_麦咖啡购物车_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
parents 14605140 b2776672
Showing with 120 additions and 71 deletions
shopping-cart-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
...@@ -84,6 +84,8 @@ public enum ResponseResult { ...@@ -84,6 +84,8 @@ public enum ResponseResult {
SHOPPING_CART_GIFTS_PRODUCT_NOT_EXIST("44018", "买赠商品不存在"), SHOPPING_CART_GIFTS_PRODUCT_NOT_EXIST("44018", "买赠商品不存在"),
SHOPPING_CART_SHOP_ID_NOT_EMPTY("44019", "门店编号不能为空"), SHOPPING_CART_SHOP_ID_NOT_EMPTY("44019", "门店编号不能为空"),
SHOPPING_CART_COUPON_CAN_NOT_USE_THIS_SHOP("44020", "券不适用于该门店"), SHOPPING_CART_COUPON_CAN_NOT_USE_THIS_SHOP("44020", "券不适用于该门店"),
SHOPPING_CART_SEAT_EMPTY("44020", "键位为空"),
/** /**
* 订单状态码 * 订单状态码
*/ */
......
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
...@@ -84,6 +84,8 @@ public class ShoppingCartMCoffeeServiceImpl { ...@@ -84,6 +84,8 @@ public class ShoppingCartMCoffeeServiceImpl {
@Autowired @Autowired
private OrderSdkService orderSdkService; private OrderSdkService orderSdkService;
private static final String nullSeat = "508106";
/** /**
* 添加商品、超值加购、商品券 * 添加商品、超值加购、商品券
*/ */
...@@ -243,7 +245,7 @@ public class ShoppingCartMCoffeeServiceImpl { ...@@ -243,7 +245,7 @@ public class ShoppingCartMCoffeeServiceImpl {
} }
//商品券行商品数量不可增加 //商品券行商品数量不可增加
if (cartGoods.getCouponCode() != null && qty >1) { if (cartGoods.getCouponCode() != null && qty > 1) {
throw new ServiceException(ResponseResult.NOT_SUPPORTED); throw new ServiceException(ResponseResult.NOT_SUPPORTED);
} }
...@@ -325,10 +327,8 @@ public class ShoppingCartMCoffeeServiceImpl { ...@@ -325,10 +327,8 @@ public class ShoppingCartMCoffeeServiceImpl {
// 获取用户信息 // 获取用户信息
CustomerInfoVo assortmentCustomerInfoVo = getCustomerInfoVo(shoppingCartInfoRequestVo.getSessionId()); CustomerInfoVo assortmentCustomerInfoVo = getCustomerInfoVo(shoppingCartInfoRequestVo.getSessionId());
String userId = assortmentCustomerInfoVo.getMemberId(); String userId = assortmentCustomerInfoVo.getMemberId();
// String thirdPartyMemberID = assortmentCustomerInfoVo.getThirdPartyMemberID(); String thirdPartyMemberID = assortmentCustomerInfoVo.getThirdPartyMemberID();
// String unionId = assortmentCustomerInfoVo.getUnionId(); String unionId = assortmentCustomerInfoVo.getUnionId();
String thirdPartyMemberID = "test";
String unionId = "test";
String partnerId = shoppingCartInfoRequestVo.getPartnerId(); String partnerId = shoppingCartInfoRequestVo.getPartnerId();
String storeId = shoppingCartInfoRequestVo.getShopId(); String storeId = shoppingCartInfoRequestVo.getShopId();
String appId = shoppingCartInfoRequestVo.getAppId(); String appId = shoppingCartInfoRequestVo.getAppId();
...@@ -344,7 +344,7 @@ public class ShoppingCartMCoffeeServiceImpl { ...@@ -344,7 +344,7 @@ public class ShoppingCartMCoffeeServiceImpl {
return ResponseUtil.error(ResponseResult.SHOPPING_CART_ADD_INVAILD); return ResponseUtil.error(ResponseResult.SHOPPING_CART_ADD_INVAILD);
} }
// 获取购物车商品-查询用户券-券码校验可用券 // 获取购物车商品-查询用户券-券码校验可用券
availableCoupon = couponDiscountCalculation.availableCoupon(partnerId, storeId, userId, thirdPartyMemberID, unionId,appId, couponCode, orderType, cartGoodsList); availableCoupon = couponDiscountCalculation.availableCoupon(partnerId, storeId, userId, thirdPartyMemberID, unionId, appId, couponCode, orderType, cartGoodsList);
return ResponseUtil.success(availableCoupon); return ResponseUtil.success(availableCoupon);
} }
...@@ -662,23 +662,11 @@ public class ShoppingCartMCoffeeServiceImpl { ...@@ -662,23 +662,11 @@ public class ShoppingCartMCoffeeServiceImpl {
CartGoods addCartGoods, ShoppingCartGoodsBaseResponseVo shoppingCartGoodsResponseVo, List<CartGoods> oldCartGoodsList) { CartGoods addCartGoods, ShoppingCartGoodsBaseResponseVo shoppingCartGoodsResponseVo, List<CartGoods> oldCartGoodsList) {
List<CartGoods> newCartGoods = new ArrayList<>(); List<CartGoods> newCartGoods = new ArrayList<>();
newCartGoods.addAll(oldCartGoodsList); newCartGoods.addAll(oldCartGoodsList);
//商品券单独设置一行 newCartGoods.add(addCartGoods);
newCartGoods = checkNewCartGoods(newCartGoods, addCartGoods);
//加购商品校验 //加购商品校验
List<CartGoods> allCartGoodsList = checkCartGoods(partnerId, storeId, orderType, menuType, shoppingCartGoodsResponseVo, newCartGoods); List<CartGoods> allCartGoodsList = checkCartGoods(partnerId, storeId, orderType, menuType, shoppingCartGoodsResponseVo, newCartGoods);
//添加商品为商品券时，商品校验接口券号未设置，设置商品券号
// if (StringUtils.isNotBlank(addCartGoods.getCouponCode())) {
// for (CartGoods cartGoods : allCartGoodsList) {
// if (cartGoods.getGoodsId().equals(addCartGoods.getGoodsId()) && cartGoods.getCouponCode() == null) {
// cartGoods.setCouponCode(addCartGoods.getCouponCode());
// cartGoods.setGoodsType(2);
// break;
// }
// }
// }
List<CartGoods> nowCartGoodsList = new ArrayList<>(); List<CartGoods> nowCartGoodsList = new ArrayList<>();
//判断当前商品在购物车是否已存在,存在则数量＋1,不存在商品行 + 1 //判断当前商品在购物车是否已存在,存在则数量＋1,不存在商品行 + 1
allCartGoodsList.forEach(oldCartGoods -> { allCartGoodsList.forEach(oldCartGoods -> {
...@@ -760,32 +748,47 @@ public class ShoppingCartMCoffeeServiceImpl { ...@@ -760,32 +748,47 @@ public class ShoppingCartMCoffeeServiceImpl {
} }
/** /**
* 商品券单独设置一行 * 套餐空键位处理
*/ */
private List<CartGoods> checkNewCartGoods(List<CartGoods> newCartGoods, CartGoods addCartGoods) { private Map<String, String> checkNewCartGoods(List<CartGoods> newCartGoods,Integer oper,Map<String, String> result) {
Integer qty = addCartGoods.getQty() == null ? 0 : addCartGoods.getQty();
if (StringUtils.isNotBlank(addCartGoods.getCouponCode())) { Map<String, String> map = new HashMap<>();
newCartGoods.add(addCartGoods);
return newCartGoods;
}
boolean isadd = true; //删除套餐空键位
if (CollectionUtils.isNotEmpty(newCartGoods)) { if(oper == 1){
for (CartGoods goods : newCartGoods) { for (CartGoods goods : newCartGoods) {
if (goods.getSkuId().equals(addCartGoods.getSkuId()) && goods.getSpuId().equals(addCartGoods.getSpuId())) { if (CollectionUtils.isNotEmpty(goods.getProductGroupList())) {
if (goods.getProductGroupList() != null && addCartGoods.getProductGroupList() != null && goods.getProductGroupList().size() == addCartGoods.getProductGroupList().size()) { List<CartGoods.ComboxGoods> productGroupList = new ArrayList<>();
for (CartGoods.ComboxGoods comboxGoods : goods.getProductGroupList()) {
if (nullSeat.equals(comboxGoods.getGoodsId())) {
map.put(goods.getCartGoodsUid(), goods.getGoodsId());
} else {
productGroupList.add(comboxGoods);
}
} }
goods.setProductGroupList(productGroupList);
} }
} }
if (isadd) { return map;
newCartGoods.add(addCartGoods); }
//恢复套餐空键位
if(oper == 2 && result.size() != 0){
for (CartGoods cartGoods : newCartGoods) {
if (result.get(cartGoods.getCartGoodsUid()) != null) {
CartGoods.ComboxGoods comboxGoods = new CartGoods.ComboxGoods();
comboxGoods.setGoodsId(nullSeat);
comboxGoods.setSkuId(nullSeat);
comboxGoods.setCustomerCode(nullSeat);
comboxGoods.setQty(1);
comboxGoods.setOriginalPrice(0L);
comboxGoods.setFinalPrice(0L);
cartGoods.getProductGroupList().add(comboxGoods);
}
} }
} else {
newCartGoods.add(addCartGoods);
} }
return newCartGoods;
return map;
} }
...@@ -848,7 +851,7 @@ public class ShoppingCartMCoffeeServiceImpl { ...@@ -848,7 +851,7 @@ public class ShoppingCartMCoffeeServiceImpl {
cartGoods.setClassificationName(productBeanListSpuClass.get(0).getCategoryName()); cartGoods.setClassificationName(productBeanListSpuClass.get(0).getCategoryName());
if (StringUtils.isBlank(productBeanListSpuClass.get(0).getCustomerCode())) { if (StringUtils.isBlank(productBeanListSpuClass.get(0).getCustomerCode())) {
throw new ServiceException(ResponseResult.PARAMETER_MISSING, "商品键位编号为空"); throw new ServiceException(ResponseResult.SHOPPING_CART_SEAT_EMPTY);
} }
//超值加购商品赋值 //超值加购商品赋值
...@@ -867,7 +870,6 @@ public class ShoppingCartMCoffeeServiceImpl { ...@@ -867,7 +870,6 @@ public class ShoppingCartMCoffeeServiceImpl {
cartGoods.setTaxId(productBeanListSpuClass.get(0).getTaxId()); cartGoods.setTaxId(productBeanListSpuClass.get(0).getTaxId());
} }
} }
...@@ -933,6 +935,9 @@ public class ShoppingCartMCoffeeServiceImpl { ...@@ -933,6 +935,9 @@ public class ShoppingCartMCoffeeServiceImpl {
private List<CartGoods> checkCartGoods(String partnerId, String storeId, Integer orderType, String menuType, private List<CartGoods> checkCartGoods(String partnerId, String storeId, Integer orderType, String menuType,
ShoppingCartGoodsBaseResponseVo shoppingCartGoodsResponseVo, List<CartGoods> cartGoodsList) { ShoppingCartGoodsBaseResponseVo shoppingCartGoodsResponseVo, List<CartGoods> cartGoodsList) {
//去除套餐商品空键位
// Map<String, String> map = checkNewCartGoods(cartGoodsList,1,null);
//筛选数量不为0商品 //筛选数量不为0商品
cartGoodsList = cartGoodsList.stream().filter(cartGoods -> cartGoods.getQty() != 0).collect(Collectors.toList()); cartGoodsList = cartGoodsList.stream().filter(cartGoods -> cartGoods.getQty() != 0).collect(Collectors.toList());
...@@ -957,7 +962,8 @@ public class ShoppingCartMCoffeeServiceImpl { ...@@ -957,7 +962,8 @@ public class ShoppingCartMCoffeeServiceImpl {
if (CollectionUtils.isNotEmpty(reduceGoods)) { if (CollectionUtils.isNotEmpty(reduceGoods)) {
allCartGoodsList.addAll(reduceGoods); allCartGoodsList.addAll(reduceGoods);
} }
//恢复套餐商品空键位
// checkNewCartGoods(allCartGoodsList,2,map);
return allCartGoodsList; return allCartGoodsList;
} }
......
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CalculationServiceImpl.java
...@@ -315,9 +315,9 @@ public class CalculationServiceImpl { ...@@ -315,9 +315,9 @@ public class CalculationServiceImpl {
if (storeInfo == null || storeInfo.getStatusCode() != 100 || storeInfo.getBizVO() == null) { if (storeInfo == null || storeInfo.getStatusCode() != 100 || storeInfo.getBizVO() == null) {
throw new ServiceException(ResponseResult.STORE_ITEM_NOT_DELIVERY); throw new ServiceException(ResponseResult.STORE_ITEM_NOT_DELIVERY);
} }
if (storeInfo.getBizVO().getDeliveryPrice() == 0) { // if (storeInfo.getBizVO().getDeliveryPrice() == 0) {
throw new ServiceException(ResponseResult.STORE_DELIVERY_AMOUNT_ERROR); // throw new ServiceException(ResponseResult.STORE_DELIVERY_AMOUNT_ERROR);
} // }
Double deliveryPrice = storeInfo.getBizVO().getDeliveryPrice()*100; Double deliveryPrice = storeInfo.getBizVO().getDeliveryPrice()*100;
deliveryAmount = deliveryPrice.longValue(); deliveryAmount = deliveryPrice.longValue();
return deliveryAmount; return deliveryAmount;
......
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CouponDiscountCalculation.java
...@@ -32,6 +32,7 @@ import org.springframework.beans.factory.annotation.Value; ...@@ -32,6 +32,7 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.*; import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
...@@ -74,38 +75,52 @@ public class CouponDiscountCalculation { ...@@ -74,38 +75,52 @@ public class CouponDiscountCalculation {
*/ */
public void updateShoppingCartGoodsDiscount(CouponPromotionVO couponPromotionVO, ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult, List<CartGoods> cartGoodsList, ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo) { public void updateShoppingCartGoodsDiscount(CouponPromotionVO couponPromotionVO, ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult, List<CartGoods> cartGoodsList, ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo) {
// 当couponCode不为空时，需计算优惠价格 if (calculationDiscountResult == null || CollectionUtils.isEmpty(calculationDiscountResult.getCouponDiscounts())
long couponDiscount = 0; || !calculationDiscountResult.getCouponDiscounts().stream().anyMatch(discount -> (ActivityTypeEnum.TYPE_3.getCode().equals(discount.getActivityType())
if (couponPromotionVO != null && StringUtils.isNotEmpty(couponPromotionVO.getCouponCode()) ||(ActivityTypeEnum.TYPE_31.getCode().equals(discount.getActivityType())) || (ActivityTypeEnum.TYPE_32.getCode().equals(discount.getActivityType())) ))) {
&& calculationDiscountResult != null) { return;
List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.CouponResults> couponResultsList = calculationDiscountResult.getCouponDiscounts();
if (CollectionUtils.isNotEmpty(couponResultsList)) {
for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.CouponResults couponResults : couponResultsList) {
couponDiscount = couponDiscount + (couponResults.getDiscountAmount() == null ? 0 : couponResults.getDiscountAmount());
}
}
} }
shoppingCartGoodsResponseVo.setCouponDiscount(couponDiscount); List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods> goodsList = calculationDiscountResult.getGoods();
//循环购物车商品券 if (CollectionUtils.isEmpty(goodsList)) {
return;
}
Map<String, ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods> goodsMap = goodsList.parallelStream()
.collect(Collectors.toMap(ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods::getGoodsId, Function.identity(), (k1, k2) -> k1));
for (CartGoods cartGoods : cartGoodsList) { for (CartGoods cartGoods : cartGoodsList) {
if (cartGoods.getCartGoodsUid().startsWith(CommonsConstant.COUPON_PREFIX)) { //商品券商品
String spqId = cartGoods.getCartGoodsUid().substring(CommonsConstant.COUPON_PREFIX.length()); if (StringUtils.isNotBlank(cartGoods.getCouponCode())) {
// 计算优惠信息时，已将券校验过，放在map中 // String couponCode = cartGoods.getCouponCode();
Map<String, CheckSpqInfoResponseDto> validCouponMap = calculationDiscountResult == null ? new HashMap<>() : calculationDiscountResult.getValidCouponMap(); // // 计算优惠信息时，已将券校验过，放在map中
if (MapUtils.isNotEmpty(validCouponMap)) { // Map<String, CheckSpqInfoResponseDto> validCouponMap = calculationDiscountResult.getValidCouponMap();
CheckSpqInfoResponseDto checkSpqInfoResponseDto = validCouponMap.get(spqId); // if (MapUtils.isNotEmpty(validCouponMap)) {
if (checkSpqInfoResponseDto != null) { // CheckSpqInfoResponseDto checkSpqInfoResponseDto = validCouponMap.get(couponCode);
cartGoods.setOriginalPrice(checkSpqInfoResponseDto.getPrice()); // if (checkSpqInfoResponseDto != null) {
cartGoods.setSpuId(checkSpqInfoResponseDto.getSpuId()); // cartGoods.setOriginalPrice(checkSpqInfoResponseDto.getPrice());
cartGoods.setSkuId(StringUtils.isEmpty(checkSpqInfoResponseDto.getSkuId()) ? checkSpqInfoResponseDto.getSpuId() : checkSpqInfoResponseDto.getSkuId()); // cartGoods.setSpuId(checkSpqInfoResponseDto.getSpuId());
cartGoods.setQty(1); // cartGoods.setSkuId(StringUtils.isEmpty(checkSpqInfoResponseDto.getSkuId()) ? checkSpqInfoResponseDto.getSpuId() : checkSpqInfoResponseDto.getSkuId());
cartGoods.setCouponCode(checkSpqInfoResponseDto.getCouponCode()); // cartGoods.setQty(1);
cartGoods.setSpuName(checkSpqInfoResponseDto.getSpuName()); // cartGoods.setCouponCode(checkSpqInfoResponseDto.getCouponCode());
} // cartGoods.setSpuName(checkSpqInfoResponseDto.getSpuName());
// }
// }
if (goodsMap.get(cartGoods.getGoodsId()) == null) {
continue;
} }
cartGoods.setAmount(goodsMap.get(cartGoods.getGoodsId()).getRealAmount());
} }
} }
// 当couponCode不为空时，需计算优惠价格
long couponDiscount = 0;
List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.CouponResults> couponResultsList = calculationDiscountResult.getCouponDiscounts();
if (CollectionUtils.isNotEmpty(couponResultsList)) {
for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.CouponResults couponResults : couponResultsList) {
couponDiscount = couponDiscount + (couponResults.getDiscountAmount() == null ? 0 : couponResults.getDiscountAmount());
}
}
shoppingCartGoodsResponseVo.setCouponDiscount(couponDiscount);
} }
...@@ -113,9 +128,25 @@ public class CouponDiscountCalculation { ...@@ -113,9 +128,25 @@ public class CouponDiscountCalculation {
* 商品均摊 * 商品均摊
*/ */
public void updateShoppingCartGoodsApportion(ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult, ShoppingCartGoodsDto shoppingCartGoodsDto){ public void updateShoppingCartGoodsApportion(ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult, ShoppingCartGoodsDto shoppingCartGoodsDto){
List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.CouponResults> couponDiscounts = calculationDiscountResult == null ? new ArrayList<>() : calculationDiscountResult.getCouponDiscounts();
if (calculationDiscountResult == null || CollectionUtils.isEmpty(calculationDiscountResult.getCouponDiscounts())
|| !calculationDiscountResult.getCouponDiscounts().stream().anyMatch(discount -> (ActivityTypeEnum.TYPE_3.getCode().equals(discount.getActivityType())
||(ActivityTypeEnum.TYPE_31.getCode().equals(discount.getActivityType())) || (ActivityTypeEnum.TYPE_32.getCode().equals(discount.getActivityType())) ))) {
return;
}
//订单级别券优惠
List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.CouponResults> couponDiscounts = calculationDiscountResult.getCouponDiscounts();
List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods> goodsList = calculationDiscountResult.getGoods();
if (CollectionUtils.isEmpty(goodsList)) {
return;
}
Map<String, ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods> goodsMap = goodsList.parallelStream()
.collect(Collectors.toMap(ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods::getGoodsId, Function.identity(), (k1, k2) -> k1));
for (ShoppingCartGoodsDto.CartGoodsDetailDto cartGoods : shoppingCartGoodsDto.getProducts()) { for (ShoppingCartGoodsDto.CartGoodsDetailDto cartGoods : shoppingCartGoodsDto.getProducts()) {
//商品券商品
if (StringUtils.isNotEmpty(cartGoods.getCouponCode())) { if (StringUtils.isNotEmpty(cartGoods.getCouponCode())) {
List<ActivityDiscountsDto> productActivityDiscountsDtos = new ArrayList<>(); List<ActivityDiscountsDto> productActivityDiscountsDtos = new ArrayList<>();
for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.CouponResults couponDiscount : couponDiscounts) { for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.CouponResults couponDiscount : couponDiscounts) {
...@@ -132,8 +163,18 @@ public class CouponDiscountCalculation { ...@@ -132,8 +163,18 @@ public class CouponDiscountCalculation {
cartGoods.setActivityDiscountsDtos(productActivityDiscountsDtos); cartGoods.setActivityDiscountsDtos(productActivityDiscountsDtos);
} }
} }
if (goodsMap.get(cartGoods.getSkuId()) == null) {
continue;
}
//商品券键位编号为空
if(StringUtils.isBlank(goodsMap.get(cartGoods.getSkuId()).getArtNo())){
throw new ServiceException(ResponseResult.SHOPPING_CART_SEAT_EMPTY);
}
cartGoods.setCustomerCode(goodsMap.get(cartGoods.getSkuId()).getArtNo());
} }
} }
} }
// public void getCoupon(CouponPromotionVO couponPromotionVO, ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult, List<CartGoods> cartGoodsList, ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo){ // public void getCoupon(CouponPromotionVO couponPromotionVO, ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult, List<CartGoods> cartGoodsList, ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo){
......
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/TimeSaleCalculation.java
...@@ -127,7 +127,7 @@ public class TimeSaleCalculation { ...@@ -127,7 +127,7 @@ public class TimeSaleCalculation {
} }
//活动商品键位编号为空 //活动商品键位编号为空
if(CollectionUtils.isNotEmpty(goods.getDiscounts()) && StringUtils.isBlank(goods.getArtNo())){ if(CollectionUtils.isNotEmpty(goods.getDiscounts()) && StringUtils.isBlank(goods.getArtNo())){
throw new ServiceException(ResponseResult.OPERATE_TOO_OFTEN); throw new ServiceException(ResponseResult.SHOPPING_CART_SEAT_EMPTY);
} }
cartGoods.setCustomerCode(goods.getArtNo()); cartGoods.setCustomerCode(goods.getArtNo());
Long totalDiscountAmount = goodsDiscount.getDiscount(); Long totalDiscountAmount = goodsDiscount.getDiscount();
......
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