Merge remote-tracking branch 'origin/master'

gly-base-core/src/main/java/cn/com/taiji/core/entity/ass/AssObuSupply.java

@@ -75,7 +75,19 @@ public class AssObuSupply extends AbstractStringPropertyUUIDEntity {
     @Column(name = "VEH_NEG_IMGURL")
     private String vehNegImgUrl;//行驶证反面图片地址;
     @Column(name = "PROXY_URL")
-    private String proxyUrl;// 授权书照片地址
+    private String proxyUrl;//授权书照片地址
+
+    @Column(name = "VEH_HEAD_URL")
+    private String vehHeadUrl;//车头照片地址
+
+    @Column(name = "VEH_BODY_URL")
+    private String vehBodyUrl;//车身照片地址
+
+    @Column(name = "VEH_AND_PERSON_URL")
+    private String vehAndPersonUrl;//人车合影照片地址
+
+    @Column(name = "TRANS_CERT_URL")
+    private String transCertUrl;//道路运输证图片地址
 
     @Column(name = "INSERT_TIME")
     private LocalDateTime insertTime;

gly-base-core/src/main/java/cn/com/taiji/core/entity/dict/ass/CheckStatus.java

@@ -5,7 +5,7 @@ package cn.com.taiji.core.entity.dict.ass;
  */
 public enum CheckStatus {
     NEW("未受理",0){},
-    CENSOR("审核中",1){},
+    CENSOR("受理",1){},
     CENSOR_APPROVE("审核通过",2){},
     CENSOR_FAILED("审核不通过",3){},
     UPLOAD_DEPT("抄送部中心",4){},

gly-base-core/src/main/java/cn/com/taiji/core/manager/tools/issue/PayTools.java

@@ -252,8 +252,9 @@ public class PayTools extends AbstractManager {
 //        v2Request.setOpenid(req.getSubOpenId());
         if (payConfig.getWxServiceType() == 1) {
             v2Request.setOpenid(wxOpenId);
+        }else {
+            v2Request.setSubOpenid(wxOpenId);//昱路子商户号appid是九州
         }
-        v2Request.setSubOpenid(wxOpenId);//昱路子商户号appid是九州
 //        v2Request.setSceneInfo();
         v2Request.setAppId(payConfig.getWxAppId());
         v2Request.setMchId(payConfig.getWxMchId());

gly-base-core/src/main/java/cn/com/taiji/core/repo/request/ass/AssRefundApplyInfoPageRequest.java

@@ -24,6 +24,10 @@ public class AssRefundApplyInfoPageRequest extends JpaPageableDataRequest<AssRef
 
     /** 车牌号 */
     private String vehiclePlate;
+    /** 车牌号 */
+    private Integer vehiclePlateColor;
+    /** 车牌号 */
+    private String cardId;
     /** 用户编码 */
     private String customerId;
     /** 渠道编码 */
@@ -40,6 +44,8 @@ public class AssRefundApplyInfoPageRequest extends JpaPageableDataRequest<AssRef
         HqlBuilder hql = new HqlBuilder("from " + AssRefundApplyInfo.class.getName() + " where 1=1 ");
         hql.append(" and customerId = :customerId ", customerId);
         hql.append(" and vehiclePlate = :vehiclePlate ", vehiclePlate);
+        hql.append(" and vehiclePlateColor = :vehiclePlateColor ", vehiclePlateColor);
+        hql.append(" and cardId = :cardId ", cardId);
         hql.append(" and agencyId = :agencyId ", agencyId);
         hql.append(" and insertTime >= :startTime ", startTime);
         hql.append(" and insertTime <= :endTime ", endTime);

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/ass/etcTransaction/AssRefundApplyInfoPageRequestDTO.java

@@ -23,4 +23,7 @@ public class AssRefundApplyInfoPageRequestDTO extends AbstractBizPageRequestDTO
     @ApiModelProperty(value = "车牌号")
     private String vehiclePlate;
 
+    @ApiModelProperty(value = "车牌颜色")
+    private Integer vehiclePlateColor;
+
 }

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/ass/obuSupply/AssObuSupplyApplyRequestDTO.java

@@ -2,7 +2,7 @@ package cn.com.taiji.iaw.dto.ass.obuSupply;
 
 import cn.com.taiji.common.valid.ViolationValidator;
 import cn.com.taiji.core.dto.AbstractBizRequestDTO;
-import cn.com.taiji.core.entity.dict.basic.VehicleType;
+import cn.com.taiji.core.entity.dict.basic.IdType;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -23,22 +23,59 @@ public class AssObuSupplyApplyRequestDTO extends AbstractBizRequestDTO {
     @NotBlank
     private String vehicleId;
 
-    @ApiModelProperty(value = "收费车型")
-    @NotNull
-    private VehicleType vehicleType;
-
     @ApiModelProperty(value = "是否需要邮寄")
     @NotNull
     private Boolean needPost;
 
-    @ApiModelProperty(value = "行驶证所有人名称")
+    @ApiModelProperty(value = "行驶证正面图片地址")
+    @NotBlank
+    private String vehPosImgUrl;
+
+    @ApiModelProperty(value = "行驶证反面图片地址")
     @NotBlank
-    private String vehicleLicenceUserName;
+    private String vehNegImgUrl;
+
+
+    
+
+    @ApiModelProperty(value = "办理人姓名")
+    private String agentName;
+
+    @ApiModelProperty(value = "办理人证件类型")
+    private IdType agentIdType;
+
+    @ApiModelProperty(value = "办理人证件号码")
+    private String agentIdNum;
+
+    @ApiModelProperty(value = "办理人手机号")
+    private String agentTel;
+
+    @ApiModelProperty(value = "办理人证件地址")
+    private String agentAddress;
+
+    @ApiModelProperty(value = "办理人证件有效期")
+    private String agentIdVld;
+
+    @ApiModelProperty(value = "办理人正面照片")
+    private String agentPosImgUrl;
+
+    @ApiModelProperty(value = "办理人反面照片")
+    private String agentNegImgUrl;
 
+    @ApiModelProperty(value = "授权书照片地址")
+    private String proxyUrl;
 
+    @ApiModelProperty(value = "车头照片地址")
+    private String vehHeadUrl;
 
+    @ApiModelProperty(value = "车身照片地址")
+    private String vehBodyUrl;
 
+    @ApiModelProperty(value = "人车合影照片地址")
+    private String vehAndPersonUrl;
 
+    @ApiModelProperty(value = "道路运输证图片地址")
+    private String transCertUrl;
 
 
     protected void validate(ViolationValidator validator){

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/api/ass/AssRefundProgressInfoController.java

@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 
-@Api(tags = {"通行费退费申请"})
+@Api(tags = {"通行费退费进程信息"})
 @RestController
 @RequestMapping("/ass/refundProgress")
 public class AssRefundProgressInfoController extends MyValidController {

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/ass/etcTransaction/AssRefundApplyInfoCensorRequestDTO.java

@@ -41,16 +41,12 @@ public class AssRefundApplyInfoCensorRequestDTO extends AbstractStaffBizRequestD
     @NotNull(message = "审核意见不能为空")
     private String checkRemark;
 
-    @ApiModelProperty(value = "渠道编号")
-    private String agencyId;
-
     @ApiModelProperty(value = "退费类型，PROVINCE_REFUND_TYPE")
     private Integer refundType;
 
     protected void validate(ViolationValidator validator){
         if (checkStatus == CheckStatus.CENSOR){
             validator.validFieldNotNull("refundFee",refundFee);
-            validator.validFieldNotBlank("agencyId",agencyId);
             validator.validFieldNotNull("refundType",refundType);
         }
     }

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/ass/etcTransaction/AssRefundApplyInfoPageRequestDTO.java

@@ -28,8 +28,12 @@ public class AssRefundApplyInfoPageRequestDTO extends AbstractStaffBizPageReques
     private LocalDateTime endTime;
     @ApiModelProperty(value = "用户名称")
     private String userName;
+    @ApiModelProperty(value = "卡号")
+    private String cardId;
     @ApiModelProperty(value = "车牌号")
     private String vehiclePlate;
+    @ApiModelProperty(value = "车牌颜色")
+    private Integer vehiclePlateColor;
 
 
 

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/ass/etcTransaction/UploadDeptRequestDTO.java

@@ -27,10 +27,6 @@ public class UploadDeptRequestDTO extends AbstractStaffBizRequestDTO {
     @NotBlank(message = "退费申请id不能为空")
     private String id;
 
-    @ApiModelProperty(value = "渠道编号")
-    @NotBlank(message = "渠道编号不能为空")
-    private String agencyId;
-
     @ApiModelProperty(value = "退费类型，PROVINCE_REFUND_TYPE")
     @NotBlank(message = "退费类型不能为空")
     private Integer refundType;

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/ass/AssRefundApplyInfoManagerImpl.java

@@ -85,7 +85,6 @@ public class AssRefundApplyInfoManagerImpl extends AbstractManagewManager implem
         if (CheckStatus.CENSOR == applyInfo.getCheckStatus()) {
             applyInfo.setRefundFee(dto.getRefundFee());
             applyInfo.setRefundType(dto.getRefundType());
-            applyInfo.setAgencyId(dto.getAgencyId());
         }
         applyInfo.setCheckStaffId(staff.getStaffId());
         applyInfo.setCheckRemark(dto.getCheckRemark());