Merge branches 'develop' and 'feature/20200221_储值卡查询购物车开关_wuping' of…

Merge branches 'develop' and 'feature/20200221_储值卡查询购物车开关_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartGoodsResponseVo.java

@@ -70,11 +70,6 @@ public class ShoppingCartGoodsResponseVo  extends ShoppingCartGoodsBaseResponseV
     private String svcDiscountDesc;
 
     /**
-     * svc卡开关标识
-     */
-    private boolean svcSwitch;
-
-    /**
      * 可用优惠券列表
      */
     private ActivityClassifyCouponBean availableCoupon;

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

@@ -1313,12 +1313,10 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
      * 储值卡支付余额校验
      * 校验订单商品金额与外卖配送费
      */
-    private boolean SVCCardPay(String cardCode, String receiveId, String partnerId, String storeId,
+    private void SVCCardPay(String cardCode, String receiveId, String partnerId, String storeId,
                             ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo) {
-        //svc储值卡开关
-        boolean svcSwitch=false;
         if (StringUtils.isBlank(cardCode)) {
-            return false;
+            return;
         }
         Integer orderAmount = shoppingCartGoodsResponseVo.getTotalAmount().intValue();
         String trackingNo = LogThreadLocal.getTrackingNo();
@@ -1340,17 +1338,12 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         Integer amount1 = response.getData().getData().getCardSimpleInfos().get(0).getAmount();
         Integer vamount = response.getData().getData().getCardSimpleInfos().get(0).getVamount();
         if (orderAmount > amount1 + vamount) {
-            //throw new ServiceException(ResponseResult.USER_SVC_CARD_AMOUNT_DEFICIENCY);
-            shoppingCartGoodsResponseVo.setSvcSwitch(svcSwitch);
-            return false;
+            throw new ServiceException(ResponseResult.USER_SVC_CARD_AMOUNT_DEFICIENCY);
         }
-        svcSwitch=true;
         BigDecimal bigDecimal = new BigDecimal(orderAmount);
         String amountStr = bigDecimal.divide(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP).toString();
         shoppingCartGoodsResponseVo.setTotalAmount(0L);
         shoppingCartGoodsResponseVo.setSvcDiscountDesc("储值卡支付￥" + amountStr);
-        shoppingCartGoodsResponseVo.setSvcSwitch(svcSwitch);
-        return true;
     }
 
     /**