update:订单列表排序

fengliang
1 parent 9e37521a
Showing 3 changed files with 60 additions and 1 deletions
etrade-order/src/main/java/com/diligrp/etrade/order/domain/OrderQueryDto.java
etrade-order/src/main/java/com/diligrp/etrade/order/service/impl/OrderQueryServiceImpl.java
etrade-order/src/main/resources/com/diligrp/etrade/dao/mapper/order/OrderQueryMapper.xml
@@ -87,6 +87,12 @@ public class OrderQueryDto extends BasePageQuery {
     private List<Integer> orderAchieveState;
+    private String sort;
+    /**
+     * 排序顺序
+     */
+    private String sortOrder;
+
     public Integer getVerifyState() {
         return verifyState;
     }
@@ -294,4 +300,20 @@ public class OrderQueryDto extends BasePageQuery {
     public void setOrderAchieveState(List<Integer> orderAchieveState) {
         this.orderAchieveState = orderAchieveState;
     }
+
+    public String getSort() {
+        return sort;
+    }
+
+    public void setSort(String sort) {
+        this.sort = sort;
+    }
+
+    public String getSortOrder() {
+        return sortOrder;
+    }
+
+    public void setSortOrder(String sortOrder) {
+        this.sortOrder = sortOrder;
+    }
 }
@@ -17,6 +17,7 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import jakarta.annotation.Resource;
 import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -74,6 +75,7 @@ public class OrderQueryServiceImpl implements OrderQueryService {
     @Override
     public OrderPageMessage<OrderDto> queryOrderPage(OrderQueryDto orderQueryDto) {
         stateCheck(orderQueryDto.getStates());
+        checkSortAndOrder(orderQueryDto.getSort(),orderQueryDto.getSortOrder());
         PageHelper.startPage(ObjectUtils.defaultIfNull(orderQueryDto.getPageNo(), 1),
                 ObjectUtils.defaultIfNull(orderQueryDto.getPageSize(), 10));
         Page<OrderDto> orderStateNumberDtoPage = orderQueryMapper.queryOrderPage(orderQueryDto);
@@ -92,6 +94,39 @@ public class OrderQueryServiceImpl implements OrderQueryService {
         return success;
     }
+    private void checkSortAndOrder(String sort, String sortOrder) {
+        if(StringUtils.isNotBlank(sort)){
+            switch (sort){
+                case "code":
+                    sort = "ord.`code`";
+                    break;
+                case "createTime":
+                    sort = "ord.created_time";
+                    break;
+                case "payTime":
+                    sort = "ord.pay_time";
+                    break;
+                case "modifiedTime":
+                    sort = "ord.modified_time";
+                    break;
+                default:
+                        throw new OrderException(OrderErrorCode.PARAM_ERROR,"排序字段异常");
+            }
+        }
+        if(StringUtils.isNotBlank(sort)){
+            switch (StringUtils.lowerCase(sortOrder)){
+                case "asc":
+                    sortOrder = "asc";
+                    break;
+                case "desc":
+                    sortOrder = "desc";
+                    break;
+                default:
+                    throw new OrderException(OrderErrorCode.PARAM_ERROR,"排序方式异常");
+            }
+        }
+    }
+
     private void stateCheck(List<Integer> states) {
         if(states == null||states.size()<1){
             return ;
@@ -298,7 +298,9 @@
                 and ord.`order_status` = #{orderStatus}
             </if>
         </where>
-        order by ord.id desc
+        <if test="sort != null and sort != '' and sortOrder != null and sortOrder != ''">
+            ORDER BY ${sort} ${sortOrder}
+        </if>
     </select>
     <select id="getOneOrderDetailById" resultType="com.diligrp.etrade.order.domain.OrderDto"
             parameterType="com.diligrp.etrade.order.domain.OrderGetDto">