front order list bugfix

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

@@ -58,7 +58,7 @@ public class SOrderController extends BaseController
         startPage();
         SConsumer user = FrontTokenComponent.getWxSConsumerEntry();
         sOrder.setConsumerId(user.getId());
-        List<SOrderVo> list = sOrderService.selectSOrderVoList(sOrder);
+        List<SOrderVo> list = sOrderService.selectPayedSOrderVoList(sOrder);
         return getDataTable(list);
     }
 

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

@@ -45,6 +45,14 @@ public interface ISOrderService extends IService<SOrder>
     public List<SOrderVo> selectSOrderVoList(SOrder sOrder);
 
     /**
+     * 查询已支付订单列表
+     *
+     * @param sOrder 订单
+     * @return 订单集合
+     */
+    public List<SOrderVo> selectPayedSOrderVoList(SOrder sOrder);
+
+    /**
      * 新增订单
      * 
      * @param sOrder 订单

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

@@ -110,7 +110,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
     public List<SOrder> selectSOrderList(SOrder sOrder) {
         List<SOrder> orders = new ArrayList<>();
         LambdaQueryWrapper<SOrder> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(SOrder::getPayStatus, YesNoEnum.yes.getIndex());
+        queryWrapper.eq(SOrder::getPayStatus, sOrder.getPayStatus());
         if (ObjectUtil.isNotEmpty(sOrder.getStatus())) {
             OrderStatusEnum orderStatusEnum = OrderStatusEnum.getEnumByCode(sOrder.getStatus());
             switch(orderStatusEnum){
@@ -149,6 +149,13 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
     }
 
 
+    public List<SOrderVo> selectPayedSOrderVoList(SOrder sOrder){
+        sOrder.setPayStatus(YesNoEnum.yes.getIndex());
+        return convertDosToVos(selectSOrderList(sOrder));
+}
+
+
+
     /**
      * 验证是否可以申请退款
      * @param orderVo 订单信息