售后订单调整

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

@@ -3,6 +3,7 @@ package cn.com.taiji.core.repo.request.ass;
 import cn.com.taiji.common.pub.dao.HqlBuilder;
 import cn.com.taiji.common.repo.request.jpa.JpaDateTimePageableDataRequest;
 import cn.com.taiji.core.entity.ass.AssOrderinfo;
+import cn.com.taiji.core.entity.dict.ass.AssOrderType;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -21,6 +22,8 @@ public class AssOrderinfoPageRequest extends JpaDateTimePageableDataRequest<AssO
 
     private String agencyId;//渠道编号
 
+    private AssOrderType orderType;//售后订单类型
+
     public AssOrderinfoPageRequest() {
         this.orderBy="updateTime";
         this.desc=true;
@@ -31,6 +34,7 @@ public class AssOrderinfoPageRequest extends JpaDateTimePageableDataRequest<AssO
         HqlBuilder hql = new HqlBuilder("from AssOrderinfo where 1=1 ");
         hql.append(" and vehicleId = :vehicleId", vehicleId);
         hql.append(" and agencyId = :agencyId", agencyId);
+        hql.append(" and orderType = :orderType", orderType);
         return hql;
     }
 }

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

@@ -1,6 +1,7 @@
 package cn.com.taiji.managew.dto.ass;
 
 import cn.com.taiji.core.dto.AbstractStaffBizPageRequestDTO;
+import cn.com.taiji.core.entity.dict.ass.AssOrderType;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -20,4 +21,7 @@ public class AssOrderinfoPageRequestDTO extends AbstractStaffBizPageRequestDTO {
 
     @ApiModelProperty(value = "车辆ID")
     private String vehicleId;
+
+    @ApiModelProperty(value = "售后订单类型")
+    private AssOrderType orderType;
 }

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

@@ -1,5 +1,6 @@
 package cn.com.taiji.managew.manager.ass;
 
+import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.manager.net.http.ServiceHandleException;
 import cn.com.taiji.common.model.dao.Pagination;
 import cn.com.taiji.managew.dto.ass.AssOrderinfoPageRequestDTO;
@@ -12,5 +13,5 @@ import cn.com.taiji.managew.dto.ass.AssOrderinfoPageRequestDTO;
  * @version: 1.0
  */
 public interface AssOrderinfoManager {
-    Pagination page(AssOrderinfoPageRequestDTO dto) throws ServiceHandleException;
+    Pagination page(AssOrderinfoPageRequestDTO dto) throws ManagerException;
 }

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

@@ -1,11 +1,15 @@
 package cn.com.taiji.managew.manager.ass;
 
+import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.manager.net.http.ServiceHandleException;
 import cn.com.taiji.common.model.dao.Pagination;
+import cn.com.taiji.core.entity.user.Staff;
 import cn.com.taiji.core.repo.jpa.ass.AssOrderinfoRepo;
+import cn.com.taiji.core.repo.jpa.user.StaffRepo;
 import cn.com.taiji.core.repo.request.ass.AssOrderinfoPageRequest;
 import cn.com.taiji.managew.dto.ass.AssOrderinfoPageRequestDTO;
 import cn.com.taiji.managew.manager.AbstractManagewManager;
+import cn.com.taiji.managew.model.MyFinals;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -21,10 +25,20 @@ public class AssOrderinfoManagerImpl extends AbstractManagewManager implements A
 
     @Autowired
     private AssOrderinfoRepo repo;
+    @Autowired
+    private StaffRepo staffRepo;
 
     @Override
-    public Pagination page(AssOrderinfoPageRequestDTO dto) throws ServiceHandleException {
+    public Pagination page(AssOrderinfoPageRequestDTO dto) throws ManagerException {
         AssOrderinfoPageRequest pageRequest = copyProperties(dto, new AssOrderinfoPageRequest());
+        Staff staff = staffRepo.findByOpenId(findOpenIdByToken(dto.getAccessToken()));
+        if (staff == null){
+            throw new ManagerException("为获取到当前员工账号！");
+        }
+        pageRequest.setAgencyId(staff.getAgencyId());
+        if (isManager(findOpenIdByToken(dto.getAccessToken()), findAgencyIdByToken(dto.getAccessToken()))){
+            pageRequest.setAgencyId(null);
+        }
         pageRequest.setAgencyId(findAgencyIdByToken(dto.getAccessToken()));
         return repo.page(pageRequest);
     }