Merge remote-tracking branch 'origin/master'

gly-base-core/src/main/java/cn/com/taiji/core/entity/comm/CommonPayConfig.java

@@ -34,6 +34,9 @@ public class CommonPayConfig extends StringPropertyUUIDEntity {
 	@Size(max = 30)
 	@Column(name = "WX_MCH_ID")
 	private String wxMchId;//微信商户号
+	@Size(max = 30)
+	@Column(name = "WX_SUBMCH_ID")
+	private String wxSubMchId;//微信商户号
 	@Size(max = 50)
 	@Column(name = "WX_APIV3KEY")
 	private String wxApiv3key;//微信V3:apiV3Key

gly-base-core/src/main/java/cn/com/taiji/core/entity/issue/IssueOrderVerification.java

@@ -1,6 +1,7 @@
 package cn.com.taiji.core.entity.issue;
 
 import cn.com.taiji.core.entity.AbstractStringPropertyUUIDEntity;
+import cn.com.taiji.core.entity.dict.basic.IdType;
 import cn.com.taiji.core.entity.dict.issue.OrderType;
 import lombok.Getter;
 import lombok.Setter;
@@ -23,6 +24,40 @@ public class IssueOrderVerification extends AbstractStringPropertyUUIDEntity {
     private OrderType type;// 类型 1-发行 2-售后
     @Column(name = "ORDER_NO")
     private String orderNo;//订单编号
+    @Column(name = "CUSTOMER_NAME")
+    private String customerName;// 用户姓名
+    @Column(name = "CUSTOMER_ID_NUM")
+    private String customerIdNum;// 身份证号
+    @Column(name = "VEHICLE_PLATE")
+    private String vehiclePlate;// 车牌号
+    @Column(name = "VEHICLE_DIMENSIONS")
+    private String vehicleDimensions;// 外廓尺寸
+    @Column(name = "OWNER_NAME")
+    private String ownerName;// 车主姓名
+    @Column(name = "OWNER_ID_NUM")
+    private String ownerIdNum;//车主证件号码
+    @Column(name = "FEE_VEHICLE_TYPE")
+    private Integer feeVehicleType;//收费车型
+    @Column(name = "VAN_TYPE")
+    private Integer vanType;// 车型
+    @Column(name = "APPROVED_COUNT")
+    private Integer approvedCount;// 核定载人数
+    @Column(name = "AXLE_COUNT")
+    private Integer axleCount;// 轴数
+    @Column(name = "TOTAL_MASS")
+    private Integer totalMass;// 总质量
+    @Column(name = "VIN")
+    private String vin;// VIN
+    @Column(name = "VEHICLE_MODEL")
+    private String vehicleModel;// 行驶证车辆品牌
+    @Column(name = "CUS_POS_IMAGEURL")
+    private String cusPosImageUrl;// 正面照地址
+    @Column(name = "VEH_POS_IMGURL")
+    private String vehPosImgUrl;// 行驶证正面照
+    @Column(name = "VEH_NEG_IMGURL")
+    private String vehNegImgUrl;// 行驶证反面照
+    @Column(name = "OWNER_POS_IMGURL")
+    private String ownerPosImgUrl;//车主正面照
     @Column(name = "VERIFY_TIME")
     private LocalDateTime verifyTime;// 审核时间
     @Column(name = "VERIFY_RESULT")

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/manager/comm/SatisfactionManagerImpl.java

@@ -41,7 +41,7 @@ public class SatisfactionManagerImpl extends AbstractCommManager implements Sati
             Staff staff = staffRepo.findByOpenId(findOpenIdByToken(reqDto.getAccessToken()));
             if (staff != null){
                 pageRequest.setAgencyId(staff.getAgencyId());
-                if ("SUPER_MANAGER".equals(staff.getIdentityType())){
+                if ("MANAGER".equals(staff.getIdentityType())){
                     pageRequest.setAgencyId(null);
                 }
             }

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/warehouse/InvwWarehouseManagerImpl.java

@@ -41,8 +41,8 @@ public class InvwWarehouseManagerImpl extends AbstractInvwManager implements Inv
         BeanUtils.copyProperties(request, req);
         Staff staff = staffRepo.findByStaffId(request.getStaffId());
         if (staff == null) throw new ManagerException("员工非法！");
-        // 如果不是超级管理员，只能查询本渠道的仓库
-        if(!"SUPER_MANAGER".equals(staff.getIdentityType())){
+        // 如果不是管理员，只能查询本渠道的仓库
+        if(!"MANAGER".equals(staff.getIdentityType())){
             String agencyId = staff.getAgencyId();
             if (!StringUtils.hasText(agencyId)) throw new ManagerException("渠道获取失败！");
             req.setAgencyId(agencyId);

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/operation/SatisfactionManagerImpl.java

@@ -40,7 +40,7 @@ public class SatisfactionManagerImpl extends AbstractCommManager implements Sati
         Staff staff = staffRepo.findByOpenId(findOpenIdByToken(dto.getAccessToken()));
         if (staff != null){
             pageRequest.setAgencyId(staff.getAgencyId());
-            if ("SUPER_MANAGER".equals(staff.getIdentityType())){
+            if ("MANAGER".equals(staff.getIdentityType())){
                 pageRequest.setAgencyId(null);
             }
         }

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/repo/jpa/request/IssueOrderExaminePageRequest.java

@@ -90,7 +90,7 @@ public class IssueOrderExaminePageRequest extends JpaPageableDataRequest<IssueOr
         if (pass == 3){//审核不通过
             hql.append(" and orderStep = :orderStep", IssueOrderStep.AUDIT_FAIL);
         }
-        if (!"SUPER_MANAGER".equals(identityType)){//不是超级管理员根据自己的机构查询
+        if (!"MANAGER".equals(identityType)){//不是管理员根据自己的机构查询
             hql.append(" and agencyId = :agencyId", agencyId);
         }
         hql.append(" and insertTime >= :startTime", startTime);

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/repo/jpa/request/IssueOrderPageRequest.java

@@ -96,7 +96,7 @@ public class IssueOrderPageRequest extends JpaPageableDataRequest<IssueOrderinfo
         hql.append(" and insertTime <= :endTime", endTime);
         hql.append(" and orderStep = :orderStep", orderStep);
         hql.append(" and orderStatus = :orderStatus", orderStatus);
-        if (!"SUPER_MANAGER".equals(identityType)){//不是超级管理员根据自己的机构查询
+        if (!"MANAGER".equals(identityType)){//不是管理员根据自己的机构查询
             hql.append(" and agencyId = :agencyId", agencyId);
         }
         return hql;

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);
-            }
-        }
-
-    }
 }