Merge branch 'feature/2020/09/11-1.9.39-混合支付-张志恒' into qa

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
#	shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartGoodsResponseVo.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java

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

@@ -3344,7 +3344,7 @@ public class OrderAdapter {
                 payChannel ="10102";
                 break;
             case 3:
-                payChannel = "支付宝";
+                payChannel = "10300";
                 break;
             case 4:
                 payChannel = "10212";
@@ -3377,6 +3377,29 @@ public class OrderAdapter {
         return ebCode;
     }
 
+    /**
+     * @nots 基础支付
+     * @param payChannelType
+     * @return
+     */
+    public String getPayChannelName(Integer payChannelType) {
+        String payChannelName = "" ;
+        switch (payChannelType) {
+            case 1:
+                payChannelName = "微信";
+                break;
+            case 2:
+                payChannelName = "svc卡支付";
+                break;
+            case 3:
+                payChannelName = "支付宝";
+                break;
+            case 4:
+                payChannelName = "混合支付";
+                break;
+        }
+        return payChannelName;
+    }
     public List<AssortmentOpenPlatformPartnerWxappConfig> cacheSelectDefaultPage(String wxAppId, String type) {
         if (!StringUtils.isEmpty(wxAppId) && !StringUtils.isEmpty(type)) {
             String hashKey = "ecology:kgd:wxappconfig:open_platform_partner_wxapp_config:appkey_" + wxAppId;

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

@@ -15,6 +15,7 @@ package cn.freemud.entities.vo;
 import lombok.Builder;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 @Data
@@ -124,6 +125,11 @@ public class ShoppingCartGoodsResponseVo  extends ShoppingCartGoodsBaseResponseV
      * 配送费为零的原因：0:正常,1:超出配送范围
      */
     private Integer deliveryFeeZeroReason;
+
+    /**
+     * svc卡支付金额
+     */
+    private BigDecimal svcPayAmount;
     private Integer version;
 
     /**

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

@@ -1576,23 +1576,26 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         if (response.getData() == null || response.getData().getData() == null || response.getData().getData().getCardSimpleInfos().size() > 1) {
             throw new ServiceException(ResponseResult.USER_SVC_CARD_ERROR);
         }
-        //获取实际配送费
+        //获取实际配送费，配送费不
+        Integer deliveryAmount = 0;
         if (StringUtils.isNotBlank(receiveId) && shoppingCartGoodsResponseVo.getDiscountDeliveryAmount() != null) {
 //            Integer deliveryAmount = getDeliveryAmount(receiveId, partnerId, storeId);
-            Integer deliveryAmount = shoppingCartGoodsResponseVo.getDiscountDeliveryAmount().intValue();
+            deliveryAmount = shoppingCartGoodsResponseVo.getDiscountDeliveryAmount().intValue();
             orderAmount += deliveryAmount;
         }
-        //混合支付无需校验svc卡余额
+        //混合支付无需校验svc卡余额,但是配送和包装费不计算在svc卡支付
         Integer amount1 = response.getData().getData().getCardSimpleInfos().get(0).getAmount();
         Integer vamount = response.getData().getData().getCardSimpleInfos().get(0).getVamount();
-
+        BigDecimal svcPayAmount = BigDecimal.ZERO;
         if (orderAmount > amount1 + vamount) {
-            throw new ServiceException(ResponseResult.USER_SVC_CARD_AMOUNT_DEFICIENCY);
+            svcPayAmount = new BigDecimal(amount1 + vamount).divide(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
+            shoppingCartGoodsResponseVo.setTotalAmount(orderAmount - svcPayAmount.multiply(new BigDecimal(100)).longValue());
+        }else{
+            svcPayAmount = new BigDecimal(orderAmount - deliveryAmount).divide(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
+            shoppingCartGoodsResponseVo.setTotalAmount(deliveryAmount.longValue());
         }
-        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.setSvcPayAmount(svcPayAmount);
+        shoppingCartGoodsResponseVo.setSvcDiscountDesc("储值卡支付￥" + svcPayAmount);
     }
 
     /**