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

# 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

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

@@ -568,13 +568,12 @@ public class OrderAdapter {
         createOrderDto.setLongitude(longitude);
         createOrderDto.setOrderType(convent2OrderTypeEnum(orderType));
         createOrderDto.setPayType(QueryPayType.ONLINE_PAY);
-        if (Objects.nonNull(createOrderVo.getUnionPayCard())) {
-            createOrderDto.setPayChannel(PayChannel.USVCP.getCode());
-            createOrderDto.setPayChannelName(PayChannel.USVCP.getDesc());
-        } else if(StringUtils.isNotBlank(createOrderVo.getCardCode())){
-            createOrderDto.setPayChannel("10102");
-            createOrderDto.setPayChannelName("储值卡支付");
-        }
+//        if(StringUtils.isNotBlank(createOrderVo.getCardCode())){
+//            createOrderDto.setPayChannel("10102");
+//            createOrderDto.setPayChannelName("储值卡支付");
+//        }
+        createOrderDto.setPayChannel(getPayChannel4SharedOrder(Integer.valueOf(createOrderDto.getPayChannelType())));
+        createOrderDto.setPayChannelName(getPayChannelName(Integer.valueOf(createOrderDto.getPayChannelType())));
         createOrderDto.setSource(OrderSourceType.SAAS.getCode());
         createOrderDto.setSourceName(OrderSourceType.SAAS.getDesc());
         createOrderDto.setRemark(remark);
@@ -3290,7 +3289,7 @@ public class OrderAdapter {
                 payChannel = "10102";
                 break;
             case 3:
-                payChannel = "支付宝";
+                payChannel = "10300";
                 break;
             case 4:
                 payChannel = "10212";
@@ -3339,4 +3338,27 @@ public class OrderAdapter {
             return new ArrayList();
         }
     }
+    /**
+     * @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;
+    }
 }

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
@@ -129,4 +130,9 @@ public class ShoppingCartGoodsResponseVo  extends ShoppingCartGoodsBaseResponseV
      * 代金券
      */
     private String couponCode;
+
+    /**
+     * svc卡支付金额
+     */
+    private BigDecimal svcPayAmount;
 }

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

@@ -1453,6 +1453,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             svcPayAmount = new BigDecimal(orderAmount - deliveryAmount).divide(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
             shoppingCartGoodsResponseVo.setTotalAmount(deliveryAmount.longValue());
         }
+        shoppingCartGoodsResponseVo.setSvcPayAmount(svcPayAmount);
         shoppingCartGoodsResponseVo.setSvcDiscountDesc("储值卡支付￥" + svcPayAmount);
     }