Merge branch '2020/10/15-mccafeCoupon-huiyang'

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

@@ -169,9 +169,12 @@ public class CouponDiscountCalculation {
                 }
                 //商品券键位编号为空
                 if(StringUtils.isBlank(goodsMap.get(cartGoods.getSkuId()).getArtNo())){
-                    throw new ServiceException(ResponseResult.SHOPPING_CART_SEAT_EMPTY);
+                    //直接抛出异常导致同一个 普通商品 和万能券商品 校验有问题，故促销未返回，默认为空
+//                    throw new ServiceException(ResponseResult.SHOPPING_CART_SEAT_EMPTY);
+                    cartGoods.setCustomerCode("");
+                }else{
+                    cartGoods.setCustomerCode(goodsMap.get(cartGoods.getSkuId()).getArtNo());
                 }
-                cartGoods.setCustomerCode(goodsMap.get(cartGoods.getSkuId()).getArtNo());
             }
         }