Merge branch 'feature/1.9.36-新增银联礼品卡支付-肖家炜' into develop

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
#	order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java

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

@@ -1062,6 +1062,8 @@ public class OrderAdapter {
                     responseVo.setOrderPayType("支付宝支付");
                 } else if (PayChannel.WXPAY.getCode().equals(ordersBean.getPayChannel())) {
                     responseVo.setOrderPayType("微信支付");
+                } else if (Objects.equals(PayChannel.USVCP.getCode(), ordersBean.getPayChannel())) {
+                    responseVo.setOrderPayType("电子风味卡支付");
                 } else {
                     responseVo.setOrderPayType("微信支付");
                 }

order-application-service/src/main/java/cn/freemud/entities/dto/order/CreatePrepayRequestDto.java

@@ -64,7 +64,7 @@ public class CreatePrepayRequestDto {
     private OrderClientType orderClient;
 
     /**
-     * 使用银联礼品卡
+     * 使用电子风味卡
      */
     private CreateOrderVo.UnionPayCard unionPayCard;
 }

order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java

@@ -223,25 +223,25 @@ public class CreateOrderVo {
     private String invoiceTitle;
 
     /**
-     * 是否使用银联SVC卡,如果不为空则为使用
+     * 是否使用电子风味卡,如果不为空则为使用
      */
     @Valid
-    @ApiModelProperty(value = "银联SVC卡")
+    @ApiModelProperty(value = "电子风味卡")
     private UnionPayCard unionPayCard;
 
     /**
-     * 银联SVC卡
+     * 电子风味卡
      */
     @Data
-    @ApiModel(value = "银联SVC卡", description = "如果传了银联SVC卡字段,此类中属性必传")
+    @ApiModel(value = "电子风味卡", description = "如果传了电子风味卡字段,此类中属性必传")
     public static class UnionPayCard {
 
-        @NotNull(message = "银联SVC卡手机号必传")
-        @ApiModelProperty(value = "银联SVC卡卡号(手机号)",required = true)
+        @NotNull(message = "电子风味卡手机号必传")
+        @ApiModelProperty(value = "电子风味卡卡号(手机号)",required = true)
         private String code;
 
-        @NotNull(message = "银联SVC卡密码必传")
-        @ApiModelProperty(value = "银联SVC卡密码",required = true)
+        @NotNull(message = "电子风味卡密码必传")
+        @ApiModelProperty(value = "电子风味卡密码",required = true)
         private String password;
     }
 

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

@@ -18,7 +18,7 @@ public enum PayChannel {
     /**
      * union svc pay
      */
-    USVCP("10556", "银联SVC支付"),
+    USVCP("10556", "电子风味卡支付"),
     ALIPAY("10300", "支付宝"),
     WXPAY("10211", "微信");
 

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

@@ -2157,7 +2157,7 @@ public class OrderServiceImpl implements Orderservice {
         if (totalAmount < 0) {
             throw new ServiceException(ResponseResult.PAY_AMOUNT_ERROR);
         } else if (totalAmount > 0 && Objects.nonNull(createPrepayRequestDto.getUnionPayCard())) {
-            // 银联礼品卡支付
+            // 电子风味卡支付
             orderPayResponse = uSvcPay(createPrepayRequestDto.getFatherOrderBean(), paymentRequest, transId, LogThreadLocal.getTrackingNo(), createPrepayRequestDto.getUnionPayCard());
         } else if (totalAmount > 0 && StringUtils.isBlank(cardCode)) {
             String partnerPayOvertime = this.getPartnerPayOvertime(createPrepayRequestDto.getPartnerId());
@@ -2214,7 +2214,7 @@ public class OrderServiceImpl implements Orderservice {
     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("银联礼品卡信息缺失");
+            orderPayResponse.setMsg("电子风味卡信息缺失");
             return orderPayResponse;
         }
         CodePayRequest request = new CodePayRequest();
@@ -2223,7 +2223,7 @@ public class OrderServiceImpl implements Orderservice {
         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);
@@ -2235,7 +2235,7 @@ public class OrderServiceImpl implements Orderservice {
         request.setVer("2");
         com.freemud.application.sdk.api.base.BaseResponse<CodePayResponse> responseBase = paymentNewService.codePay(request, trackingNo);
         if (responseBase == null || !ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(responseBase.getCode()) || responseBase.getData().getData() == null) {
-            orderPayResponse.setMsg(Objects.isNull(responseBase) ? "银联礼品卡支付异常" : responseBase.getMessage());
+            orderPayResponse.setMsg(Objects.isNull(responseBase) ? "电子风味卡支付异常" : responseBase.getMessage());
         } else {
             CodePayResponse.CodePayDate codePayResponse = responseBase.getData().getData();
             orderPayResponse.setFmId(codePayResponse.getFmId());
@@ -2764,7 +2764,7 @@ public class OrderServiceImpl implements Orderservice {
         if (totalAmount < 0) {
             throw new ServiceException(ResponseResult.PAY_AMOUNT_ERROR);
         }
-        //银联礼品卡支付
+        //电子风味卡支付
         if (totalAmount > 0 && Objects.nonNull(createOrderVo.getUnionPayCard())) {
             return uSvcPay(fatherBeanListOne, paymentRequest, fatherBeanListOne.getOid(), LogThreadLocal.getTrackingNo(), createOrderVo.getUnionPayCard());
         }