Merge branch 'dev' of GameCenter/game-center into master

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/PayMerchantAddUpdateParam.java

@@ -3,6 +3,7 @@ package com.zanxiang.game.module.manage.pojo.params;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.util.List;
 
@@ -30,16 +31,23 @@ public class PayMerchantAddUpdateParam {
     /**
      * 商户号
      */
-    @NotNull(message = "商户号不可为空")
+    @NotBlank(message = "商户号不可为空")
     @ApiModelProperty(notes = "商户号")
     private String merchantNo;
 
+    /**
+     * 商户名称
+     */
+    @NotBlank(message = "商户名称不可为空")
+    @ApiModelProperty(notes = "商户名称")
+    private String merchantName;
+
     /**
      * 商户主体
      */
-    @NotNull(message = "商户主体不可为空")
+    @NotBlank(message = "商户主体不可为空")
     @ApiModelProperty(notes = "商户主体")
-    private String merchantName;
+    private String merchantCompany;
 
     /**
      * 支付类型id列表

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/PayMerchantServiceImpl.java

@@ -79,6 +79,7 @@ public class PayMerchantServiceImpl extends ServiceImpl<PayMerchantMapper, PayMe
         }
         payMerchant.setMerchantNo(param.getMerchantNo());
         payMerchant.setMerchantName(param.getMerchantName());
+        payMerchant.setMerchantCompany(param.getMerchantCompany());
         payMerchant.setPayWayId(param.getPayWayId());
         payMerchant.setAccount(param.getAccount());
         payMerchant.setPassword(param.getPassword());
@@ -97,6 +98,7 @@ public class PayMerchantServiceImpl extends ServiceImpl<PayMerchantMapper, PayMe
         return PayMerchant.builder()
                 .merchantNo(param.getMerchantNo())
                 .merchantName(param.getMerchantName())
+                .merchantCompany(param.getMerchantCompany())
                 .payWayId(param.getPayWayId())
                 .account(param.getAccount())
                 .password(param.getPassword())
@@ -167,6 +169,8 @@ public class PayMerchantServiceImpl extends ServiceImpl<PayMerchantMapper, PayMe
                 payMerchantListVO.setSecretKey(payConfigMap.get("apiKey"));
             }
         }
+        //支付渠道
+        payMerchantListVO.setPayWayName(PayWayEnum.getByPayWayId(payMerchantListVO.getPayWayId()));
         //支付方式
         String payDeviceIds = payMerchant.getPayDeviceIds();
         if (Strings.isBlank(payDeviceIds)) {