订单查询bug

share-admin/src/main/java/share/web/controller/system/SOrderController.java

@@ -49,9 +49,9 @@ public class SOrderController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:order:list')")
     @GetMapping("/query")
-    public TableDataInfo query() {
+    public TableDataInfo query(SOrder sOrder) {
         startPage();
-        List<SOrder> list = sOrderService.queryList();
+        List<SOrder> list = sOrderService.queryList(sOrder);
         return getDataTable(list);
     }
 

share-system/src/main/java/share/system/service/ISOrderService.java

@@ -125,7 +125,7 @@ public interface ISOrderService extends IService<SOrder>
      */
     boolean refundAudit(OrderRefundRequest request);
 
-    List<SOrder> queryList();
+    List<SOrder> queryList(SOrder sOrder);
 
     /**
      * 查询所有有效订单（未使用，申请退款未审批）

share-system/src/main/java/share/system/service/impl/CallbackServiceImpl.java

 package share.system.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.crypto.SecureUtil;
@@ -235,6 +236,7 @@ public class CallbackServiceImpl implements CallbackService {
         }
         sOrder.setStatus(OrderStatusEnum.CANCEL.getCode());
         sOrder.setRefundStatus(RefundStatusEnum.REFUNDED.getCode());
+        sOrder.setRefundReasonTime(DateUtil.date());
         boolean update = sOrderService.updateById(sOrder);
         SConsumptionRecords sConsumptionRecords = new SConsumptionRecords();
         sConsumptionRecords.setConsumerId(sOrder.getConsumerId());

share-system/src/main/java/share/system/service/impl/SOrderServiceImpl.java

@@ -7,6 +7,7 @@ import java.util.stream.Collectors;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONObject;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -114,8 +115,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
      */
     @Override
     public List<SOrder> selectSOrderList(SOrder sOrder) {
-        List<SOrder> orders = new ArrayList<>();
-        orders = baseMapper.selectSOrderList(sOrder);
+        List<SOrder> orders = baseMapper.selectSOrderList(sOrder);
         return orders;
     }
 
@@ -576,10 +576,27 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
     }
 
     @Override
-    public List<SOrder> queryList() {
+    public List<SOrder> queryList(SOrder sOrder) {
         LambdaQueryWrapper<SOrder> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(SOrder::getPayStatus, PayStatusEnum.PAID.getCode());
         queryWrapper.ne(SOrder::getRefundStatus, RefundStatusEnum.UNREFUND.getCode());
+        if (sOrder != null) {
+            if (StrUtil.isNotEmpty(sOrder.getOrderNo())) {
+                queryWrapper.like(SOrder::getOrderNo, sOrder.getOrderNo());
+            }
+            if (StrUtil.isNotEmpty(sOrder.getConsumerName())) {
+                queryWrapper.like(SOrder::getConsumerName, sOrder.getConsumerName());
+            }
+            if (ObjectUtil.isNotEmpty(sOrder.getRefundStatus())) {
+                queryWrapper.eq(SOrder::getRefundStatus, sOrder.getRefundStatus());
+            }
+            if (sOrder.getStartDate() != null) {
+                queryWrapper.ge(SOrder::getRefundReasonTime, cn.hutool.core.date.DateUtil.beginOfDay(sOrder.getStartDate()));
+            }
+            if (sOrder.getStartDate() != null) {
+                queryWrapper.le(SOrder::getRefundReasonTime, cn.hutool.core.date.DateUtil.endOfDay(sOrder.getEndDate()));
+            }
+        }
         return baseMapper.selectList(queryWrapper);
     }