feat:新增银联svc支付:支付sdk添加payCode字段

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

@@ -491,8 +491,8 @@ public class OrderAdapter {
         createOrderDto.setOrderType(convent2OrderTypeEnum(orderType));
         createOrderDto.setPayType(QueryPayType.ONLINE_PAY);
         if (Objects.nonNull(createOrderVo.getUnionPayCard())) {
-            createOrderDto.setPayChannel(PayChannel.UPC.getCode());
-            createOrderDto.setPayChannelName(PayChannel.UPC.getDesc());
+            createOrderDto.setPayChannel(PayChannel.USVCP.getCode());
+            createOrderDto.setPayChannelName(PayChannel.USVCP.getDesc());
         } else if(StringUtils.isNotBlank(createOrderVo.getCardCode())){
             createOrderDto.setPayChannel("10102");
             createOrderDto.setPayChannelName("储值卡支付");
@@ -549,8 +549,8 @@ public class OrderAdapter {
         productOrderInfo.setOrderType(orderType);
         productOrderInfo.setPayType(QueryPayType.ONLINE_PAY);
         if (Objects.nonNull(createOrderVo.getUnionPayCard())) {
-            productOrderInfo.setPayChannel(PayChannel.UPC.getCode());
-            productOrderInfo.setPayChannelName(PayChannel.UPC.getDesc());
+            productOrderInfo.setPayChannel(PayChannel.USVCP.getCode());
+            productOrderInfo.setPayChannelName(PayChannel.USVCP.getDesc());
         } else if(StringUtils.isNotBlank(createOrderVo.getCardCode())){
             productOrderInfo.setPayChannel("10102");
             productOrderInfo.setPayChannelName("储值卡支付");
@@ -682,8 +682,8 @@ public class OrderAdapter {
         memberOrderInfo.setIsParent(false);
         memberOrderInfo.setOrderClient(OrderClientType.I_MEMBER.getIndex());
         if (Objects.nonNull(createOrderVo.getUnionPayCard())) {
-            memberOrderInfo.setPayChannel(PayChannel.UPC.getCode());
-            memberOrderInfo.setPayChannelName(PayChannel.UPC.getDesc());
+            memberOrderInfo.setPayChannel(PayChannel.USVCP.getCode());
+            memberOrderInfo.setPayChannelName(PayChannel.USVCP.getDesc());
         } else if(StringUtils.isNotBlank(createOrderVo.getCardCode())){
             memberOrderInfo.setPayChannel("10102");
             memberOrderInfo.setPayChannelName("储值卡支付");
@@ -725,8 +725,8 @@ public class OrderAdapter {
         fatherOrderInfo.setOrderClient(OrderClientType.SAAS.getIndex());
         fatherOrderInfo.setOrderType(orderType);
         if (Objects.nonNull(createOrderVo.getUnionPayCard())) {
-            fatherOrderInfo.setPayChannel(PayChannel.UPC.getCode());
-            fatherOrderInfo.setPayChannelName(PayChannel.UPC.getDesc());
+            fatherOrderInfo.setPayChannel(PayChannel.USVCP.getCode());
+            fatherOrderInfo.setPayChannelName(PayChannel.USVCP.getDesc());
         } else if(StringUtils.isNotBlank(createOrderVo.getCardCode())){
             fatherOrderInfo.setPayChannel("10102");
             fatherOrderInfo.setPayChannelName("储值卡支付");
@@ -917,7 +917,7 @@ public class OrderAdapter {
                 responseVo.setOrderPayType("支付宝支付");
             } else if (ordersBean.getPayChannel() != null && PayChannel.WXPAY.getCode().equals(ordersBean.getPayChannel())) {
                 responseVo.setOrderPayType("微信支付");
-            } else if (ordersBean.getPayChannel() != null && Objects.equals(PayChannel.UPC.getCode(), ordersBean.getPayChannel())) {
+            } else if (ordersBean.getPayChannel() != null && Objects.equals(PayChannel.USVCP.getCode(), ordersBean.getPayChannel())) {
                 responseVo.setOrderPayType("银联礼品卡支付");
             } else {
                 responseVo.setOrderPayType("微信支付");

order-application-service/src/main/java/cn/freemud/enums/PayChannel.java

@@ -15,7 +15,10 @@ package cn.freemud.enums;
 public enum PayChannel {
 
     SVC("10102", "svc卡支付"),
-    UPC("10031", "银联"),
+    /**
+     * union svc pay
+     */
+    USVCP("10556", "银联SVC支付"),
     ALIPAY("10300", "支付宝"),
     WXPAY("10211", "微信");
 

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

@@ -1808,7 +1808,7 @@ public class OrderServiceImpl implements Orderservice {
             throw new ServiceException(ResponseResult.PAY_AMOUNT_ERROR);
         } else if (totalAmount > 0 && Objects.nonNull(createPrepayRequestDto.getUnionPayCard())) {
             // 银联礼品卡支付
-            orderPayResponse = upcPay(createPrepayRequestDto.getFatherOrderBean(), paymentRequest, transId, LogThreadLocal.getTrackingNo(), createPrepayRequestDto.getUnionPayCard());
+            orderPayResponse = uSvcPay(createPrepayRequestDto.getFatherOrderBean(), paymentRequest, transId, LogThreadLocal.getTrackingNo(), createPrepayRequestDto.getUnionPayCard());
         } else if (totalAmount > 0 && StringUtils.isBlank(cardCode)) {
             orderPayResponse = getPreOrderPay(createPrepayRequestDto.getFatherOrderBean(), paymentRequest, LogThreadLocal.getTrackingNo(), createPrepayRequestDto.getCardAmount(), transId);
         } else if (totalAmount > 0 && StringUtils.isNotBlank(cardCode)) {
@@ -1860,7 +1860,7 @@ public class OrderServiceImpl implements Orderservice {
      * @param unionPayCard
      * @return
      */
-    private OrderPayResponse upcPay(QueryOrdersResponse.DataBean.OrderBean orderBean, PaymentRequest paymentRequest, String transId, String trackingNo, CreateOrderVo.UnionPayCard unionPayCard) {
+    private OrderPayResponse uSvcPay(QueryOrdersResponse.DataBean.OrderBean orderBean, PaymentRequest paymentRequest, String transId, String trackingNo, CreateOrderVo.UnionPayCard unionPayCard) {
         OrderPayResponse orderPayResponse = new OrderPayResponse();
         if (Objects.isNull(unionPayCard) || StringUtils.isBlank(unionPayCard.getCode()) || StringUtils.isBlank(unionPayCard.getPassword())) {
             orderPayResponse.setMsg("银联礼品卡信息缺失");
@@ -1870,7 +1870,9 @@ public class OrderServiceImpl implements Orderservice {
         String partnerId = orderBean.getCompanyId();
         request.setBody(orderBean.getShopName());
         request.setBusinessDate(DateTimeFormatter.ofPattern(DateUtil.FORMAT_YYYY_MM_DD_HHMMSS).format(LocalDateTime.now()));
-        // 礼品卡信息
+        // paymentRequest 的 payCode可能为null,不保险
+        request.setPayCode(PayChannel.USVCP.getCode());
+        // 银联svc卡信息
         request.setCode(unionPayCard.getCode());
         request.setCardPassword(unionPayCard.getPassword());
         request.setPartnerId(partnerId);
@@ -2413,7 +2415,7 @@ public class OrderServiceImpl implements Orderservice {
         }
         //银联礼品卡支付
         if (totalAmount > 0 && Objects.nonNull(createOrderVo.getUnionPayCard())) {
-            return upcPay(fatherBeanListOne, paymentRequest, fatherBeanListOne.getOid(), LogThreadLocal.getTrackingNo(), createOrderVo.getUnionPayCard());
+            return uSvcPay(fatherBeanListOne, paymentRequest, fatherBeanListOne.getOid(), LogThreadLocal.getTrackingNo(), createOrderVo.getUnionPayCard());
         }
         //唤起微信支付
         if (totalAmount > 0 && StringUtils.isBlank(createOrderVo.getCardCode()) && StringUtils.isBlank(createOrderVo.getFaceCode())) {