Merge remote-tracking branch 'origin/master'

gly-base-core/src/main/java/cn/com/taiji/core/entity/basic/QtkCardInfo.java

     @Column(name = "PACKAGE_ENABLE_TIME")
     private String packageEnableTime;//套餐启用时间;
     @NotBlank
-    @Size(max = 7)
     @Column(name = "ACCOUNT_ID")
     private String accountId;//记账机构编号;
     @NotNull

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/api/comm/VehicleInfoController.java

 import cn.com.taiji.common.model.dao.Pagination;
 import cn.com.taiji.common.web.ApiResponse;
 import cn.com.taiji.iaw.api.MyValidController;
-import cn.com.taiji.iaw.dto.comm.CardInfoQueryRequestDTO;
-import cn.com.taiji.iaw.dto.comm.CardInfoQueryResponseDTO;
-import cn.com.taiji.iaw.dto.comm.VehicleInfoPageRequestDTO;
+import cn.com.taiji.iaw.dto.comm.*;
 import cn.com.taiji.iaw.manager.comm.VehicleInfoManager;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
         return ApiResponse.of(manager.page(dto));
     }
 
+    @ApiOperation("车辆绑定列表查询")
+    @PostMapping("/view")
+    public ApiResponse<VehicleInfoViewResponseDTO> view(@Valid @RequestBody VehicleInfoViewRequestDTO dto) throws ManagerException {
+        return ApiResponse.of(manager.view(dto));
+    }
+
+
     @ApiOperation("etc卡信息查询")
     @PostMapping("/queryCardInfo")
     public ApiResponse<List<CardInfoQueryResponseDTO>> queryCardInfo(@Valid @RequestBody CardInfoQueryRequestDTO dto) throws ManagerException {

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/comm/VehicleInfoViewRequestDTO.java

+package cn.com.taiji.iaw.dto.comm;
+
+import cn.com.taiji.core.dto.AbstractBizRequestDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+/**
+ * @Auther: humh
+ * @Description:
+ * @Date: 2025/4/15 15:37
+ * @email: huminghao@mail.taiji.com.cn
+ * @version: 1.0
+ */
+@ApiModel(description = "用户车辆信息分页查询")
+@Getter
+@Setter
+@Accessors(chain = true)
+public class VehicleInfoViewRequestDTO extends AbstractBizRequestDTO {
+
+    @ApiModelProperty(value = "数据id")
+    private String id;
+
+}

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/comm/VehicleInfoViewResponseDTO.java

+package cn.com.taiji.iaw.dto.comm;
+
+import cn.com.taiji.common.model.BaseModel;
+import cn.com.taiji.core.entity.dict.basic.IdType;
+import cn.com.taiji.core.entity.dict.basic.UseUserType;
+import cn.com.taiji.core.entity.dict.basic.VehicleUseCharacter;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.time.LocalDateTime;
+
+/**
+ * @Auther: humh
+ * @Description:
+ * @Date: 2025/7/8 10:05
+ * @email: huminghao@mail.taiji.com.cn
+ * @version: 1.0
+ */
+@Getter
+@Setter
+public class VehicleInfoViewResponseDTO extends BaseModel {
+
+    @ApiModelProperty(value = "创建时间")
+    private LocalDateTime insertTime;
+
+    @ApiModelProperty(value = "更新时间")
+    private LocalDateTime updateTime;
+
+    @ApiModelProperty(value = "车辆ID")
+    private String vehicleId;
+
+    @ApiModelProperty(value = "车牌号")
+    private String vehiclePlate;
+
+    @ApiModelProperty(value = "车牌颜色")
+    private Integer vehiclePlateColor;
+
+    @ApiModelProperty(value = "用户编号")
+    private String customerId;
+
+    @ApiModelProperty(value = "车型;对应VehicleType枚举")
+    private Integer type;
+
+    @ApiModelProperty(value = "车辆使用类型")
+    private UseUserType useUserType;
+
+    @ApiModelProperty(value = "前/后装标识，1-前装 2-后装")
+    private Integer vehicleSign;
+
+    @ApiModelProperty(value = "车辆识别代号")
+    private String vin;
+
+    @ApiModelProperty(value = "发动机编号")
+    private String engineNum;
+
+    @ApiModelProperty(value = "行驶证车辆类型")
+    private String vehicleType;
+
+    @ApiModelProperty(value = "行驶证品牌型号")
+    private String vehicleModel;
+
+    @ApiModelProperty(value = "核定载人数")
+    private Integer approvedCount;
+
+    @ApiModelProperty(value = "总质量")
+    private Integer totalMass;
+
+    @ApiModelProperty(value = "整备质量")
+    private Integer maintenaceMass;
+
+    @ApiModelProperty(value = "核定载质量")
+    private Integer permittedWeight;
+
+    @ApiModelProperty(value = "车辆尺寸")
+    private String vehicleDimensions;
+
+    @ApiModelProperty(value = "准牵引总质量")
+    private Integer permittedTowWeight;
+
+    @ApiModelProperty(value = "车轴数")
+    private Integer axleCount;
+
+    @ApiModelProperty(value = "发证日期")
+    private String issueDate;
+
+    @ApiModelProperty(value = "行驶证正面图片地址")
+    private String vehPosImgUrl;
+
+    @ApiModelProperty(value = "行驶证反面图片地址")
+    private String vehNegImgUrl;
+
+    @ApiModelProperty(value = "车主姓名")
+    private String ownerName;
+
+    @ApiModelProperty(value = "车主证件类型")
+    private IdType ownerIdType;
+
+    @ApiModelProperty(value = "车主证件号码")
+    private String ownerIdNum;
+
+    @ApiModelProperty(value = "车主证件正面图片的BASE64编码")
+    private String ownerPosImgUrl;
+
+    @ApiModelProperty(value = "车主证件反面图片的BASE64编码")
+    private String ownerNegImgUrl;
+
+    @ApiModelProperty(value = "签约编号")
+    private String agreementId;
+
+    @ApiModelProperty(value = "添加渠道编号")
+    private String channelId;
+
+    @ApiModelProperty(value = "道路运输证编号-牵引车")
+    private String transportIdNum;
+
+    @ApiModelProperty(value = "经营许可证编号")
+    private String licenseIdNum;
+
+    @ApiModelProperty(value = "车身45°照片")
+    private String vehBodyUrl;
+
+    @ApiModelProperty(value = "委托书地址")
+    private String proxyUrl;
+
+    @ApiModelProperty(value = "应急车辆标识 0-非应急车辆  1-应急车辆;")
+    private Integer emergencyFlag;
+
+    @ApiModelProperty(value = "指定联系人列表")
+    private String contacts;
+
+    @ApiModelProperty(value = "所有人联系地址")
+    private String ownerAddress;
+
+    @ApiModelProperty(value = "轴型")
+    private String axisType;
+
+    @ApiModelProperty(value = "检验记录")
+    private String testRecord;
+
+    @ApiModelProperty(value = "档案编号")
+    private String fileNum;
+
+    @ApiModelProperty(value = "录入时间")
+    private LocalDateTime registeredTime;
+
+    @ApiModelProperty(value = "所有人联系方式")
+    private String ownerTel;
+
+    @ApiModelProperty(value = "车辆使用性质")
+    private VehicleUseCharacter useCharacter;
+
+    @ApiModelProperty(value = "注册日期-行驶证")
+    private String registerDate;
+
+    @ApiModelProperty(value = "轴距")
+    private Integer axleDistance;
+
+    @ApiModelProperty(value = "车轮数")
+    private Integer vehicleWheelCount;
+
+    @ApiModelProperty(value = "上传状态")
+    private Integer uploadStatus;
+
+    @ApiModelProperty(value = "车辆用户类型")
+    private Integer customerType;
+
+
+    @ApiModelProperty(value = "认证监管平台车辆编号")
+    private String daspVehicleId;
+
+    @ApiModelProperty(value = "牵引车标识：0否1是")
+    private Integer tractorSign;
+
+    @ApiModelProperty(value = "道路运输许可证图片地址")
+    private String roadTransportPermitPicUrl;
+
+    @ApiModelProperty(value = "微信侧ETC绑定号  V3签约成功后 微信返回")
+    private String contractId;
+
+}

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

 package cn.com.taiji.iaw.manager.comm;
 
-import cn.com.taiji.common.manager.AbstractManager;
 import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.model.dao.Pagination;
 import cn.com.taiji.common.pub.BeanTools;

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

 
 import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.model.dao.Pagination;
-import cn.com.taiji.iaw.dto.comm.CardInfoQueryRequestDTO;
-import cn.com.taiji.iaw.dto.comm.CardInfoQueryResponseDTO;
-import cn.com.taiji.iaw.dto.comm.VehicleInfoPageRequestDTO;
+import cn.com.taiji.iaw.dto.comm.*;
 
 import java.util.List;
 
 public interface VehicleInfoManager {
     Pagination page(VehicleInfoPageRequestDTO dto) throws ManagerException;
 
+    VehicleInfoViewResponseDTO view(VehicleInfoViewRequestDTO dto) throws ManagerException;
+
     List<CardInfoQueryResponseDTO> queryCardInfo(CardInfoQueryRequestDTO dto) throws ManagerException;
+
 }

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

 import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.model.dao.Pagination;
 import cn.com.taiji.core.entity.basic.QtkCardInfo;
+import cn.com.taiji.core.entity.basic.QtkVehicleInfo;
 import cn.com.taiji.core.repo.jpa.basic.QtkCardInfoRepo;
 import cn.com.taiji.core.repo.jpa.basic.QtkVehicleInfoRepo;
 import cn.com.taiji.core.repo.request.basic.QtkVehicleInfoPageRequest;
         return repo.page(pageRequest);
     }
 
+    @Override
+    public VehicleInfoViewResponseDTO view(VehicleInfoViewRequestDTO dto) throws ManagerException {
+        QtkVehicleInfo vehicleInfo = repo.findById(dto.getId()).orElse(null);
+        if (vehicleInfo == null) {
+            throw new ManagerException("未获取到车辆信息！");
+        }
+        return copyProperties(vehicleInfo, new VehicleInfoViewResponseDTO());
+    }
+
 
     @Override
     public List<CardInfoQueryResponseDTO> queryCardInfo(CardInfoQueryRequestDTO dto) throws ManagerException {

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/issueOrder/IssueOrderQueryManageImpl.java

         if (SourceType.CHANNEL.equals(order.getOrderSource())) {//因为涉及到退费，退费由渠道自己处理
             throw new ManagerException("渠道订单不支持在综合业务平台取消");
         }
+        String openId = findOpenIdByToken(reqDto.getAccessToken());
         OrderCancelRequest request = copyProperties(reqDto, new OrderCancelRequest());
-        request.setOpenId(findOpenIdByToken(reqDto.getAccessToken()));
+        request.setOpenId(openId);
         request.setStaffNum(reqDto.getStaffId());
         request.setRefundStatus(0);
         jsonPostRepeat(request);
+        sysPersistOperateLog(OperateType.ORDER_CANCEL,order.getId(),reqDto.getOrderSource(), openId,"订单取消");
     }
 
     @Override
         request.setOpenId(findOpenIdByToken(reqDto.getAccessToken()));
         Staff staff = staffRepo.findByStaffId(reqDto.getStaffId());
         request.setServiceHallId(staff.getServiceHallId());
+        request.setRechangeMode(2);
         ReturnGoodsResponse response = jsonPostRepeat(request);
         sysPersistOperateLog(OperateType.ORDER_RETURNAPPLY, response.getId(), reqDto.getOrderSource(), request.getOpenId(),"发行订单退货申请");
         return response.getMsg();