userw

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/wx/WxPayAddReqDTO.java

@@ -53,6 +53,8 @@ public class WxPayAddReqDTO extends AbstractStaffBizRequestDTO {
     private String agencyId;//渠道编号
     @ApiModelProperty(value = "微信商户下单类型，1普通商户，2服务商")
     private Integer wxServiceType;//微信商户下单类型，1普通商户，2服务商
+    @ApiModelProperty(value = "微信商户号")
+    private String wxSubMchId;//微信商户号
 
     @Override
     protected void validate(ViolationValidator validator) {
@@ -71,6 +73,9 @@ public class WxPayAddReqDTO extends AbstractStaffBizRequestDTO {
                 validator.validFieldNotBlank("wxPrivatekey",wxPrivatekey);
                 validator.validFieldNotBlank("wxSerialNo",wxSerialNo);
             }
+            if (wxServiceType != null && wxServiceType==2){
+                validator.validFieldNotBlank("wxSubMchId",wxSubMchId);
+            }
         }
 
     }

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/wx/WxPayUpdateReqDTO.java

@@ -20,62 +20,9 @@ import javax.validation.constraints.NotNull;
  */
 @Data
 @ApiModel(description = "车主配置修改")
-public class WxPayUpdateReqDTO extends AbstractStaffBizRequestDTO {
+public class WxPayUpdateReqDTO extends WxPayAddReqDTO {
 
     @NotBlank
     @ApiModelProperty(value = "主键id")
     private String id;
-    @ApiModelProperty(value = "app名称")
-    @NotBlank
-    private String appName;
-    @ApiModelProperty(value = "支付渠道类型")
-    @NotNull
-    private PayChannelType payChannelType;//支付渠道：如微信，支付宝
-    @ApiModelProperty(value = "微信支付版本")
-    @IntegerConstant(values = "2,3", message = "微信支付版本错误！微信支付版本：2-V2,3-V3")
-    private Integer wxPayVersion;//微信支付版本:2-V2,3-V3
-    @ApiModelProperty(value = "微信appid")
-    private String wxAppId;//微信appid
-    @ApiModelProperty(value = "微信商户号")
-    private String wxMchId;//微信商户号
-    @ApiModelProperty(value = "微信V3:apiV3Key")
-    private String wxApiv3key;//微信V3:apiV3Key
-    @ApiModelProperty(value = "微信V3私钥-apiclient_key.pem")
-    private String wxPrivatekey;//微信V3私钥-apiclient_key.pem
-    @ApiModelProperty(value = "微信V3证书序列号")
-    private String wxSerialNo;//微信V3证书序列号
-    @ApiModelProperty(value = "微信V2签名密钥")
-    private String wxKey;//微信V2签名密钥
-    @ApiModelProperty(value = "支付产品类型")
-    private String payProductType;//支付类型-暂时保留此字段
-    @ApiModelProperty(value = "说明")
-    @NotBlank
-    private String info;//说明
-    @ApiModelProperty(value = "渠道编号")
-    @NotBlank
-    @FixedLength(length = 11)
-    private String agencyId;//渠道编号
-    @ApiModelProperty(value = "微信商户下单类型，1普通商户，2服务商")
-    private Integer wxServiceType;//微信商户下单类型，1普通商户，2服务商
-
-    @Override
-    protected void validate(ViolationValidator validator) {
-        super.validate(validator);
-        if (PayChannelType.WEIXINPAY.equals(payChannelType)){
-//            validator.validField("wxPayVersion",wxPayVersion==null,"微信支付版本不能为空");
-            validator.validFieldNotNull("wxServiceType",wxServiceType);
-            validator.validFieldNotNull("wxPayVersion",wxPayVersion);
-            validator.validFieldNotBlank("wxAppId",wxAppId);
-            validator.validFieldNotBlank("wxMchId",wxMchId);
-            if (wxPayVersion != null && wxPayVersion==2){
-                validator.validFieldNotBlank("wxKey",wxKey);
-            }
-            if (wxPayVersion != null && wxPayVersion==3){
-                validator.validFieldNotBlank("wxApiv3key",wxApiv3key);
-                validator.validFieldNotBlank("wxPrivatekey",wxPrivatekey);
-                validator.validFieldNotBlank("wxSerialNo",wxSerialNo);
-            }
-        }
-
-    }
 }