优化冲突参数

src/main/java/com/qtzl/alterSales/manager/model/protocol/sales/AflActivationInfoFindPageViewRequest.java

@@ -19,9 +19,9 @@ public class AflActivationInfoFindPageViewRequest extends AbstractAfterSalesPage
     /** 激活状态；1-已激活；2-未激活 */
     private Integer activationStatus ;
     /** 网点编号 */
-    private String channelId ;
+    private String activationChannelId ;
     /** 工号 */
-    private String staffId ;
+    private String activationStaffId ;
     /** 激活方式(1-线上自助激活；2-线下激活) */
     private Integer activationType ;
     /** 激活时间 */
@@ -69,20 +69,20 @@ public class AflActivationInfoFindPageViewRequest extends AbstractAfterSalesPage
         this.activationStatus = activationStatus;
     }
 
-    public String getChannelId() {
-        return channelId;
+    public String getActivationChannelId() {
+        return activationChannelId;
     }
 
-    public void setChannelId(String channelId) {
-        this.channelId = channelId;
+    public void setActivationChannelId(String activationChannelId) {
+        this.activationChannelId = activationChannelId;
     }
 
-    public String getStaffId() {
-        return staffId;
+    public String getActivationStaffId() {
+        return activationStaffId;
     }
 
-    public void setStaffId(String staffId) {
-        this.staffId = staffId;
+    public void setActivationStaffId(String activationStaffId) {
+        this.activationStaffId = activationStaffId;
     }
 
     public Integer getActivationType() {

src/main/java/com/qtzl/alterSales/manager/service/AflActivationInfoServiceImpl.java

@@ -112,7 +112,7 @@ public class AflActivationInfoServiceImpl implements  AflActivationInfoService{
             if (e instanceof ServiceHandleException) {
                 throw e;
             }
-            throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("查询车辆白名单管理失败,"+ e.getMessage());
+            throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("查询激活信息管理失败,"+ e.getMessage());
         }
     }
 
@@ -188,11 +188,11 @@ public class AflActivationInfoServiceImpl implements  AflActivationInfoService{
         if (!StringUtils.isEmpty(request.getObuId())) {
             list.add(cb.equal(root.<String>get("obuId"), request.getObuId()));
         }
-        if (!StringUtils.isEmpty(request.getChannelId())) {
-            list.add(cb.equal(root.<String>get("channelId"), request.getChannelId()));
+        if (!StringUtils.isEmpty(request.getActivationChannelId())) {
+            list.add(cb.equal(root.<String>get("channelId"), request.getActivationChannelId()));
         }
-        if (!StringUtils.isEmpty(request.getStaffId())) {
-            list.add(cb.equal(root.<String>get("staffId"), request.getStaffId()));
+        if (!StringUtils.isEmpty(request.getActivationStaffId())) {
+            list.add(cb.equal(root.<String>get("staffId"), request.getActivationStaffId()));
         }
         if (request.getActivationStatus()!=null) {
             list.add(cb.equal(root.<Integer>get("activationStatus"), request.getActivationStatus()));

src/main/java/com/qtzl/alterSales/manager/service/AflOrderInfoServiceImpl.java

@@ -161,7 +161,7 @@ public class AflOrderInfoServiceImpl implements  AflOrderInfoService{
             Predicate[] p = new Predicate[list.size()];
             return cb.and(list.toArray(p));
         }), PageRequest.of(request.getPageNo() - 1, request.getPageSize(),
-                Sort.by(Sort.Direction.DESC, "insertTime")));
+                Sort.by(Sort.Direction.DESC, "createTime")));
     }
 
     private List<AflOrderInfoVo> getAflOrderInfoVos(List<AflOrderInfo> aflOrderInfos){