Merge branch 'feature/2020-1104-混合支付' into develop

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml
#	order-management/pom.xml

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

@@ -2778,6 +2778,7 @@ public class OrderAdapter {
         orderPayResponse.setPartnerId(partnerId);
         orderPayResponse.setOrderId(orderId);
         orderPayResponse.setFmId(fmId);
+        orderPayResponse.setPayMode(PayChannelType.ZERO.getEbcode());
         return orderPayResponse;
     }
 
@@ -3365,7 +3366,7 @@ public class OrderAdapter {
                 , null
                 , createOrderVo.getUnionPayCard()
                 , createOrderVo.getShopId()
-                , createOrderVo.getChannel()
+                , createOrderVo.getChannel()==null ? "" :createOrderVo.getChannel()
                );
     }
     public CreatePrepayRequestDto convertToCreatePrepayRequestDto(String partnerId

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -2362,11 +2362,11 @@ public class OrderServiceImpl implements Orderservice {
         if (totalAmount > 0 && StringUtils.isBlank(cardCode) && Objects.isNull(createPrepayRequestDto.getUnionPayCard())) {
             createOrderResponse.setPaySuccess(false);
         }
-        else if (StringUtils.isNotBlank(orderPayResponse.getPayMode()) && PayChannelType.COMB.getIndex().equals(orderPayResponse.getPayMode())){
+        else if (StringUtils.isNotBlank(orderPayResponse.getPayMode()) && PayChannelType.COMB.getEbcode().equals(orderPayResponse.getPayMode())){
             createOrderResponse.setPaySuccess(false);
         }
-        else if (StringUtils.isNotBlank(orderPayResponse.getPayMode()) && PayChannelType.SVC.getIndex().equals(orderPayResponse.getPayMode())){
-            createOrderResponse.setPaySuccess(false);
+        else if (StringUtils.isNotBlank(orderPayResponse.getPayMode()) && PayChannelType.SVC.getEbcode().equals(orderPayResponse.getPayMode())){
+            createOrderResponse.setPaySuccess(true);
         }
         else {
             createOrderResponse.setPaySuccess(true);
@@ -2423,7 +2423,7 @@ public class OrderServiceImpl implements Orderservice {
             tigger = true;
         }
         //混合支付
-        if (tigger) {
+        if (tigger && StringUtils.isNotBlank(channel)) {
             log.info("混合支付:");
             String partnerPayOvertime = this.getPartnerPayOvertime(orderBean.getCompanyId());
             orderPayResponse = comPayOrder(cardCode,orderBean,paymentRequest,partnerPayOvertime,totalAmount.intValue(), svcAmount,svcVAmount,channel,storeId,LogThreadLocal.getTrackingNo());
@@ -2481,6 +2481,7 @@ public class OrderServiceImpl implements Orderservice {
             orderPayResponse.setOpenId(paymentRequest.getOpenId());
             orderPayResponse.setPartnerId(orderBean.getCompanyId());
             orderPayResponse.setOrderId(orderBean.getOid());
+            orderPayResponse.setPayMode(PayChannelType.USVCP.getEbcode());
         }
         return orderPayResponse;
     }
@@ -2568,6 +2569,10 @@ public class OrderServiceImpl implements Orderservice {
                 orderPayResponse.setOpenId(paymentRequest.getOpenId());
                 orderPayResponse.setPartnerId(orderBean.getCompanyId());
                 orderPayResponse.setOrderId(orderBean.getOid());
+                orderPayResponse.setPayMode(PayChannelType.WECHAT.getEbcode());
+                if (orderPayResponse.getPayOrder()!=null) {
+                    orderPayResponse.setPayMode(PayChannelType.ALIPAY.getEbcode());
+                }
             }
         } catch (Exception e) {
             LogUtil.error("getPreOrderPay_error", JSONObject.toJSONString(orderBean), JSONObject.toJSONString(paymentRequest));
@@ -2621,7 +2626,7 @@ public class OrderServiceImpl implements Orderservice {
             orderPayResponse.setOpenId(paymentRequest.getOpenId());
             orderPayResponse.setPartnerId(orderBean.getCompanyId());
             orderPayResponse.setOrderId(orderBean.getOid());
-            orderPayResponse.setpayMode(PayChannelType.SVC.getIndex());
+            orderPayResponse.setPayMode(PayChannelType.SVC.getEbcode());
         }
         return orderPayResponse;
     }
@@ -2759,6 +2764,11 @@ public class OrderServiceImpl implements Orderservice {
                 JSONObject.toJSONString(orderExtInfo));
         orderEditRequest.setOrderId(orderBean.getOid());
         orderEditRequest.setTrackingNo(trackingNo);
+        if (orderPayResponse.getPayMode()!=null) {
+            orderEditRequest.setPayChannel(PayChannelType.getByEbcode(orderPayResponse.getPayMode()).getEbcode());
+            orderEditRequest.setPayChannelName(PayChannelType.getByEbcode(orderPayResponse.getPayMode()).getName());
+            orderEditRequest.setPayChannelType(PayChannelType.getByEbcode(orderPayResponse.getPayMode()).getIndex());
+        }
         //混合支付项
         if (CollectionUtils.isNotEmpty(orderPayResponse.getPayItem())) {
             orderEditRequest.setOrderPayItem(orderPayResponse.getPayItem());
@@ -3318,7 +3328,7 @@ public class OrderServiceImpl implements Orderservice {
         orderPayResponse.setWxAppid(paymentRequest.getWxAppId());
         orderPayResponse.setPartnerId(orderBean.getCompanyId());
         orderPayResponse.setOrderId(orderBean.getOid());
-        orderPayResponse.setpayMode(PayChannelType.COMB.getIndex());
+        orderPayResponse.setPayMode(PayChannelType.COMB.getEbcode());
         //隐射关系
         redisCache.save(RedisUtil.getPaymentTransIdOrderKey(payPlatform.getTransId()),orderBean.getOid(),1L,TimeUnit.DAYS);
         //加入轮训队列

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/enums/PayChannelType.java

@@ -11,7 +11,8 @@ public enum PayChannelType {
     ALIPAY((byte)2,"10300","支付宝"),
     SVC((byte)3,"10102","储值卡"),
     COMB((byte)4,"10212","混合支付"),
-    USVCP((byte)5,"10556", "电子风味卡支付");
+    USVCP((byte)5,"10556", "电子风味卡支付"),
+    ZERO((byte)6,"100000", "0元支付");
 
     private Byte index;
     private String ebcode;