接口调整

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/ass/AssServiceCmd.java

@@ -35,7 +35,6 @@ public enum AssServiceCmd implements SignServiceCommand {
     ACTIVESAVERECORDS("设备激活保存记录", ActiveSaveRecordRequest.class),
     ACTIVEOBU("在线激活", ActiveObuRequest.class),
     REIMBURSEORDERINPUT("补缴订单录入", ReimburseOrderInputRequest.class),
-    REIMBURSEORDERQUERY("补缴订单查询", ReimburseOrderQueryRequest.class),
     REIMBURSEORDERPAYCHANNELRETURN("补缴订单渠道支付返回", ReimburseOrderPayChannelReturnRequest.class),
     SIGNCHANGEAPPLY("签约变更申请", SignChangeApplyRequest.class),
     SIGNCHANGECOLLECT("签约变更收集信息", SignChangeCollectRequest.class),

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/ass/ReimburseOrderQueryResponse.java

@@ -1,12 +0,0 @@
-package cn.com.taiji.core.model.comm.protocol.ias.ass;
-
-import cn.com.taiji.common.model.dao.Pagination;
-import cn.com.taiji.core.model.comm.protocol.ias.AbstractIasResponse;
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
-public class ReimburseOrderQueryResponse extends AbstractIasResponse {
-    private Pagination pagination;
-}

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/api/ass/ReimburseOrderController.java

@@ -2,6 +2,7 @@ package cn.com.taiji.iaw.api.ass;
 
 import javax.validation.Valid;
 
+import cn.com.taiji.common.model.dao.Pagination;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -23,12 +24,12 @@ public class ReimburseOrderController extends MyValidController {
     @Autowired
     private ReimburseOrderManager manager;
 
-//    @ApiOperation(value = "补缴订单查询")
-//    @PostMapping(value = "/page")
-//    public ApiResponse<QueryVehicleResponseDTO> page(@Valid @RequestBody QueryVehicleRequestDTO reqDto) throws ManagerException {
-//        QueryVehicleResponseDTO resDto = manager.queryVehicle(reqDto);
-//        return ApiResponse.of(resDto).setMessage("操作成功");
-//    }
+    @ApiOperation(value = "补缴订单查询")
+    @PostMapping(value = "/page")
+    public ApiResponse<Pagination> page(@Valid @RequestBody ReimburseOrderPageRequestDTO reqDto) throws ManagerException {
+        Pagination resDto = manager.page(reqDto);
+        return ApiResponse.of(resDto).setMessage("操作成功");
+    }
 
     @ApiOperation(value = "补缴订单申诉")
     @PostMapping(value = "/objections")

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/ass/ReimburseOrderQueryRequest.java → zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/ass/reimburseOrder/ReimburseOrderPageRequestDTO.java

@@ -1,20 +1,30 @@
-package cn.com.taiji.core.model.comm.protocol.ias.ass;
+package cn.com.taiji.iaw.dto.ass.reimburseOrder;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 
 import cn.com.taiji.core.entity.dict.AuditStatus;
 import cn.com.taiji.core.entity.dict.basic.SourceType;
-import cn.com.taiji.core.model.comm.protocol.ias.AbstractIasRequest;
+import org.springframework.validation.annotation.Validated;
+
+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;
 
-import java.util.List;
-
-@Setter
+@ApiModel(description = "补缴订单申诉")
 @Getter
-public class ReimburseOrderQueryRequest extends AbstractIasRequest<ReimburseOrderQueryResponse> {
-    public ReimburseOrderQueryRequest() {
-        super(AssServiceCmd.REIMBURSEORDERQUERY);
-    }
+@Setter
+@Accessors(chain = true)
+@Validated
+public class ReimburseOrderPageRequestDTO extends AbstractBizRequestDTO {
 
+    @ApiModelProperty(value = "订单号")
     private String orderNo;//订单编号
     private SourceType orderSource;//订单来源
     private List<String> agencyIds;//订单渠道编号
@@ -29,4 +39,7 @@ public class ReimburseOrderQueryRequest extends AbstractIasRequest<ReimburseOrde
     private Integer payee;
     private boolean isObjections;//是否申诉
     private AuditStatus status;
+    private int pageSize;
+    private int pageNo;
+
 }

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/manager/ass/ReimburseOrderManager.java

@@ -1,6 +1,7 @@
 package cn.com.taiji.iaw.manager.ass;
 
 import cn.com.taiji.common.manager.ManagerException;
+import cn.com.taiji.common.model.dao.Pagination;
 import cn.com.taiji.iaw.dto.ass.active.ActivateDetailsRequestDTO;
 import cn.com.taiji.iaw.dto.ass.active.ActivateDetailsResponseDTO;
 import cn.com.taiji.iaw.dto.ass.active.QueryVehicleRequestDTO;
@@ -11,6 +12,7 @@ import cn.com.taiji.iaw.dto.ass.reimburseOrder.*;
  * 激活记录相关功能
  */
 public interface ReimburseOrderManager {
+    Pagination page(ReimburseOrderPageRequestDTO requestDTO) throws ManagerException;
     ReimburseOrderObjectionsResponseDTO objections(ReimburseOrderObjectionsRequestDTO requestDTO) throws ManagerException;
     ReimburseOrderViewResponseDTO view(ReimburseOrderViewRequestDTO requestDTO) throws ManagerException;
     ReimburseOrderPayResponseDTO pay(ReimburseOrderPayRequestDTO requestDTO) throws ManagerException;

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/manager/ass/ReimburseOrderManagerImpl.java

@@ -1,5 +1,6 @@
 package cn.com.taiji.iaw.manager.ass;
 
+import cn.com.taiji.common.model.dao.Pagination;
 import cn.com.taiji.core.entity.ass.AssReimburseOrder;
 import cn.com.taiji.core.entity.dict.AuditStatus;
 import cn.com.taiji.core.entity.dict.ass.AssOrderStatus;
@@ -13,6 +14,7 @@ import cn.com.taiji.core.model.comm.protocol.valid.GlyServiceError;
 import cn.com.taiji.core.repo.jpa.ass.AssReimburseOrderRepo;
 import cn.com.taiji.core.repo.jpa.ass.AssReimburseOrderTransRepo;
 import cn.com.taiji.core.repo.jpa.issue.IssueOrderPayRepo;
+import cn.com.taiji.core.repo.request.ass.AssReimburseOrderPageRequest;
 import cn.com.taiji.iaw.dto.ass.reimburseOrder.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -41,6 +43,15 @@ public class ReimburseOrderManagerImpl extends AbstractCommManager implements Re
     private PayTools payTools;
     @Autowired
     private IssueOrderPayRepo issueOrderPayRepo;
+
+    @Override
+    public Pagination page(ReimburseOrderPageRequestDTO requestDTO) throws ManagerException {
+        ReimburseOrderQueryResponse res = new ReimburseOrderQueryResponse();
+        AssReimburseOrderPageRequest pageRequest = copyProperties(requestDTO, new AssReimburseOrderPageRequest());
+        Pagination page = reimburseOrderRepo.page(pageRequest);
+        return page;
+    }
+
     @Override
     public ReimburseOrderObjectionsResponseDTO objections(ReimburseOrderObjectionsRequestDTO requestDTO) throws ManagerException {
         AssReimburseOrder order = reimburseOrderRepo.findByOrderNo(requestDTO.getOrderNo());

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/ass/reimburseOrder/ReimburseOrderQueryManager.java

@@ -1,35 +0,0 @@
-package cn.com.taiji.ias.manager.ass.reimburseOrder;
-
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import cn.com.taiji.common.manager.net.http.ServiceHandleException;
-import cn.com.taiji.core.entity.dict.basic.SourceType;
-import cn.com.taiji.core.model.comm.protocol.ias.ass.ReimburseOrderQueryRequest;
-import cn.com.taiji.core.model.comm.protocol.ias.ass.ReimburseOrderQueryResponse;
-import cn.com.taiji.core.model.comm.protocol.valid.GlyServiceError;
-import cn.com.taiji.core.repo.jpa.ass.AssReimburseOrderRepo;
-import cn.com.taiji.core.repo.request.ass.AssReimburseOrderPageRequest;
-import cn.com.taiji.ias.manager.AbstractCommManager;
-
-@Service
-public class ReimburseOrderQueryManager extends AbstractCommManager {
-    @Autowired
-    private AssReimburseOrderRepo reimburseOrderRepo;
-
-    public ReimburseOrderQueryResponse serviceHandle(ReimburseOrderQueryRequest req) throws ServiceHandleException {
-        // 如果微信登录，userId必填
-        if (req.getOrderSource() == SourceType.WECHAT){
-            if (req.getCustomerId() == null){
-                throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("请传入用户OpenId");
-            }
-        }
-        // todo 渠道不知道要啥限制，先放着
-        ReimburseOrderQueryResponse res = new ReimburseOrderQueryResponse();
-        AssReimburseOrderPageRequest pageRequest = copyProperties(req, new AssReimburseOrderPageRequest());
-        res.setPagination(reimburseOrderRepo.page(pageRequest));
-        return res;
-    }
-
-}

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/handler/AssServiceHandler.java

@@ -14,7 +14,6 @@ import cn.com.taiji.core.model.comm.protocol.ias.IasServiceType;
 import cn.com.taiji.core.model.comm.protocol.ias.ass.*;
 import cn.com.taiji.core.model.comm.protocol.ias.ass.vehicleInfoChange.VehicleChangeCancelRequest;
 import cn.com.taiji.ias.manager.ass.*;
-import cn.com.taiji.ias.manager.ass.deviceReplace.DeviceReplaceApplyManager;
 import cn.com.taiji.ias.manager.ass.active.ActiveObuManager;
 import cn.com.taiji.ias.manager.ass.active.ActiveQueryVehicleManager;
 import cn.com.taiji.ias.manager.ass.active.ActiveSaveRecordManager;
@@ -26,8 +25,6 @@ import cn.com.taiji.ias.manager.ass.device.DeviceLossManager;
 import cn.com.taiji.ias.manager.ass.deviceReplace.DeviceReplaceApplyManager;
 import cn.com.taiji.ias.manager.ass.reimburseOrder.ReimburseOrderInputManager;
 import cn.com.taiji.ias.manager.ass.reimburseOrder.ReimburseOrderPayChannelReturnManager;
-import cn.com.taiji.ias.manager.ass.reimburseOrder.ReimburseOrderQueryManager;
-import cn.com.taiji.ias.manager.ass.reimburseOrder.*;
 import cn.com.taiji.ias.manager.ass.releasePlate.PlateOccupyQueryManager;
 import cn.com.taiji.ias.manager.ass.releasePlate.ReleasePlateApplyManager;
 import cn.com.taiji.ias.manager.ass.releasePlate.ReleasePlateViewManager;
@@ -88,8 +85,6 @@ public class AssServiceHandler extends AbstractIasServiceHandler<AssServiceCmd>
     @Autowired
     private ActiveObuManager activeObuManager;
     @Autowired
-    private ReimburseOrderQueryManager reimburseOrderQueryManager;
-    @Autowired
     private ReimburseOrderInputManager reimburseOrderInputManager;
     @Autowired
     private ReimburseOrderPayChannelReturnManager reimburseOrderPayChannelReturnManager;
@@ -163,8 +158,6 @@ public class AssServiceHandler extends AbstractIasServiceHandler<AssServiceCmd>
                 return activeSaveRecordsManager.serviceHandle((ActiveSaveRecordRequest) request);
             case ACTIVEOBU:
                 return activeObuManager.serviceHandle((ActiveObuRequest) request);
-            case REIMBURSEORDERQUERY:
-                return reimburseOrderQueryManager.serviceHandle((ReimburseOrderQueryRequest) request);
             case REIMBURSEORDERINPUT:
                 return reimburseOrderInputManager.serviceHandle((ReimburseOrderInputRequest) request);
             case REIMBURSEORDERPAYCHANNELRETURN: