Merge branch 'feature/xukang_20210517_麦咖啡EVM券'

order-application-service/src/main/java/cn/freemud/adapter/DeliveryAdapter.java

@@ -330,6 +330,7 @@ public class DeliveryAdapter {
                 if (OldOrderAccountType.COUPON.getCode().equals(accountBean.getType())
                         || OldOrderAccountType.BUY_DISCOUNT.getCode().equals(accountBean.getType())
                         || OldOrderAccountType.PRODUCT_COUPON.getCode().equals(accountBean.getType())
+                        || OldOrderAccountType.EVM_PRODUCT_COUPON.getCode().equals(accountBean.getType())
                         || OldOrderAccountType.SUPER_PURCHASE.getCode().equals(accountBean.getType())
                         || OldOrderAccountType.DISCOUNT_AMOUNT.getCode().equals(accountBean.getType())
                         || OldOrderAccountType.FREIGHT_COUPON.getCode().equals(accountBean.getType())) {

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -2359,7 +2359,7 @@ public class OrderAdapter {
                     continue;
                 }
                 discountTotalAmount = discountTotalAmount + productDiscount.getDiscountAmount()*productDiscount.getDiscountQty();
-                if (OrderAccountType.PRODUCT_COUPON.getCode().equals(productDiscount.getDiscountType())) {
+                if (OrderAccountType.PRODUCT_COUPON.getCode().equals(productDiscount.getDiscountType()) || OldOrderAccountType.EVM_PRODUCT_COUPON.getCode().equals(productDiscount.getDiscountType())) {
                     hasProductCoupon = true;
                     if(StringUtils.isNotBlank(productDiscount.getExtInfo())) {
                         JSONObject productDiscountExtInfo = JSON.parseObject(productDiscount.getExtInfo());

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

@@ -456,6 +456,9 @@ public class ShoppingCartMCoffeeServiceImpl {
 
         BaseResponse baseResponse = null;
         for (GoodsQtyInfo goodsQtyInfo : requestVo.getQtyInfoList()) {
+            if(StringUtils.isBlank(goodsQtyInfo.getCartGoodsUid()) || goodsQtyInfo.getQty() == null) {
+                return ResponseUtil.error(ResponseResult.SHOPPING_CART_UPDATE_ERROR.getCode(), "批量更新购物车商品数量时，商品列表信息不能为空");
+            }
             UpdateShoppingCartGoodsQtyRequestVo singleUpdateRequest = batchQtyRequestConvert2SingleQtyRequest(goodsQtyInfo,requestVo);
             baseResponse = this.updateGoodsQty(singleUpdateRequest);
             if (!Objects.equals(ResponseResult.SUCCESS.getCode(),baseResponse.getCode())){