Merge branches 'feature/20210830_礼品卡支付_wuping' and 'qa' of…

Merge branches 'feature/20210830_礼品卡支付_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

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

@@ -1362,7 +1362,7 @@ public class ShoppingCartCollageServiceImpl extends AbstractShoppingCartImpl imp
         Integer amount1 = response.getResult().getCardSimpleInfos().get(0).getAmount();
         Integer vamount = response.getResult().getCardSimpleInfos().get(0).getVamount();
         Integer applyType = response.getResult().getCardSimpleInfos().get(0).getApplyType();
-        applyType = applyType == null ? 3 : 0;
+        applyType = applyType == null ? 3 : applyType;
         String svcDesc = applyType == 3 ? "储值卡支付￥" : "礼品卡支付￥";
         if (orderAmount > amount1 + vamount) {
             throw new ServiceException(ResponseResult.USER_SVC_CARD_AMOUNT_DEFICIENCY);

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

@@ -2394,7 +2394,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         }
         boolean check = this.checkSvcComPay(partnerId, storeId);
         Integer applyType = response.getResult().getCardSimpleInfos().get(0).getApplyType();
-        applyType = applyType == null ? 3 : 0;
+        applyType = applyType == null ? 3 : applyType;
         String svcDesc = applyType == 3 ? "储值卡支付￥" : "礼品卡支付￥";
         if (check) {
             //混合支付无需校验svc卡余额,但是配送和包装费不计算在svc卡支付
@@ -2463,7 +2463,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         }
         boolean check = this.checkSvcComPay(partnerId, storeId);
         Integer applyType = response.getResult().getCardSimpleInfos().get(0).getApplyType();
-        applyType = applyType == null ? 3 : 0;
+        applyType = applyType == null ? 3 : applyType;
         String svcDesc = applyType == 3 ? "储值卡支付￥" : "礼品卡支付￥";
         if (check) {
             //混合支付无需校验svc卡余额,但是配送和包装费不计算在svc卡支付