调整

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

@@ -1,9 +1,13 @@
 package cn.com.taiji.iaw.dto.ass;
 
+import cn.com.taiji.common.valid.ViolationValidator;
 import cn.com.taiji.core.dto.AbstractStaffBizPageRequestDTO;
+import cn.com.taiji.core.entity.dict.basic.SourceType;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
+import org.apache.commons.lang.StringUtils;
 
 /**
  * @Auther: humh
@@ -17,5 +21,14 @@ import lombok.Setter;
 @Setter
 public class RefundInfoPageRequestDTO extends AbstractStaffBizPageRequestDTO {
 
+    @ApiModelProperty(value = "车辆编号")
+    private String vehicleId;
+
+    @Override
+    protected void validate(ViolationValidator validator) {
+        if (getOrderSource() == SourceType.SERVICE_HALL){
+            validator.validField("vehicleId", StringUtils.isEmpty(vehicleId), "APP车辆编号不能为空");
+        }
+    }
 
 }

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

@@ -3,8 +3,13 @@ package cn.com.taiji.iaw.manager.comm;
 import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.model.dao.Pagination;
 import cn.com.taiji.common.pub.BeanTools;
+import cn.com.taiji.core.entity.basic.QtkCustomerInfo;
+import cn.com.taiji.core.entity.basic.QtkVehicleInfo;
 import cn.com.taiji.core.entity.comm.RefundReceiveInfo;
+import cn.com.taiji.core.entity.dict.basic.SourceType;
 import cn.com.taiji.core.entity.user.AccountInfo;
+import cn.com.taiji.core.repo.jpa.basic.QtkCustomerInfoRepo;
+import cn.com.taiji.core.repo.jpa.basic.QtkVehicleInfoRepo;
 import cn.com.taiji.core.repo.jpa.comm.RefundReceiveInfoRepo;
 import cn.com.taiji.core.repo.jpa.user.AccountInfoRepo;
 import cn.com.taiji.core.repo.request.ass.RefundReceiveInfoPageRequest;
@@ -12,6 +17,7 @@ import cn.com.taiji.iaw.dto.ass.*;
 import cn.com.taiji.iaw.manager.AbstractCommManager;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
@@ -20,21 +26,35 @@ import java.time.LocalDateTime;
 @RequiredArgsConstructor
 public class RefundReceiveInfoManagerImpl extends AbstractCommManager implements RefundReceiveInfoManager {
 
-    private final RefundReceiveInfoRepo refundReceiveInfoRepo;
-    private final AccountInfoRepo accountInfoRepo;
+    @Autowired
+    private RefundReceiveInfoRepo refundReceiveInfoRepo;
+    @Autowired
+    private QtkVehicleInfoRepo vehicleInfoRepo;
+    @Autowired
+    private QtkCustomerInfoRepo customerInfoRepo;
+    @Autowired
+    private AccountInfoRepo accountInfoRepo;
 
     @Override
     public Pagination page(RefundInfoPageRequestDTO dto) throws ManagerException {
         RefundReceiveInfoPageRequest pageRequest = new RefundReceiveInfoPageRequest();
-        pageRequest.setOpenId(findOpenIdByToken(dto.getAccessToken()));
-        validOpenId(findOpenIdByToken(dto.getAccessToken()));
+        if (dto.getOrderSource() == SourceType.WECHAT){
+            pageRequest.setOpenId(findOpenIdByToken(dto.getAccessToken()));
+        }else if (dto.getOrderSource() == SourceType.SERVICE_HALL){
+            QtkVehicleInfo vehicleInfo = vehicleInfoRepo.findByVehicleId(dto.getVehicleId());
+            QtkCustomerInfo customerInfo = customerInfoRepo.findByCustomerId(vehicleInfo.getCustomerId());
+            AccountInfo accountInfo = accountInfoRepo.findByIdNumAndIdType(customerInfo.getCustomerIdNum(), customerInfo.getCustomerIdType());
+            pageRequest.setOpenId(accountInfo.getOpenId());
+
+        }else {
+            throw new ManagerException("请求来源异常");
+        }
         return refundReceiveInfoRepo.page(pageRequest);
     }
 
     @Override
     public RefundInfoResponseDTO addOrUpdate(RefundInfoRequestDTO dto) throws ManagerException {
         String openId = findOpenIdByToken(dto.getAccessToken());
-        validOpenId(openId);
         RefundReceiveInfo exitRefundInfo = refundReceiveInfoRepo.findByBankAndBankIdCodeAndOpenId(dto.getBankIdCode(), openId);
         LocalDateTime now = LocalDateTime.now();
 
@@ -79,10 +99,4 @@ public class RefundReceiveInfoManagerImpl extends AbstractCommManager implements
         return new RefundInfoLoseEfficacyResponseDTO();
     }
 
-    private void validOpenId(String openId) throws ManagerException {
-        AccountInfo accountInfo = accountInfoRepo.findByOpenId(openId);
-        if (accountInfo == null){
-            throw new ManagerException("身份信息错误");
-        }
-    }
 }