userw

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

@@ -33,9 +33,9 @@ public class WxCarAddReqDTO extends AbstractStaffBizRequestDTO {
     @ApiModelProperty(value = "appId")
     private String appId;
     @ApiModelProperty(value = "appId")
-    private String subAppId;
+    private String subAppId;//v2
     @ApiModelProperty(value = "子商户号")
-    private String subMchId;
+    private String subMchId;//v2
     @NotBlank
     @ApiModelProperty(value = "签名密钥")
     private String signKey;
@@ -66,6 +66,8 @@ public class WxCarAddReqDTO extends AbstractStaffBizRequestDTO {
             validator.validFieldNotBlank("serialNo", serialNo);
             validator.validFieldNotBlank("privateKey", privateKey);
             validator.validFieldNotBlank("planId", planId);
+            validator.validFieldNotBlank("wxPublicKey", wxPublicKey);
+            validator.validFieldNotBlank("wxPublicKeyId", wxPublicKeyId);
 
         }
     }

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

@@ -44,7 +44,7 @@ public class WxPayAddReqDTO extends AbstractStaffBizRequestDTO {
     private String wxSerialNo;//微信V3证书序列号
     @ApiModelProperty(value = "微信V2签名密钥")
     private String wxKey;//微信V2签名密钥
-    @ApiModelProperty(value = "支付产品类型")
+    @ApiModelProperty(value = "支付类型")
     private String payProductType;//
     @ApiModelProperty(value = "说明")
     @NotBlank