fixed 待结算订单必须是线上支付的订单

fuint-application/src/main/java/com/fuint/common/param/OrderListParam.java

@@ -3,6 +3,7 @@ package com.fuint.common.param;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * 订单列表请求参数
@@ -39,6 +40,9 @@ public class OrderListParam extends PageParam implements Serializable {
     @ApiModelProperty(value="数据类型，1）toPay：待支付；2）paid：已支付；3）cancel：已取消", name="dataType")
     private String dataType;
 
+    @ApiModelProperty(value="支付类型", name="payType")
+    private List<String> payType;
+
     @ApiModelProperty(value="订单类型", name="type")
     private String type;
 

fuint-application/src/main/java/com/fuint/common/service/impl/OrderServiceImpl.java

@@ -197,6 +197,7 @@ public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implem
         String storeIds = orderListParam.getStoreIds() == null ? "" : orderListParam.getStoreIds();
         String startTime = orderListParam.getStartTime() == null ? "" : orderListParam.getStartTime();
         String endTime = orderListParam.getEndTime() == null ? "" : orderListParam.getEndTime();
+        List<String> payType = orderListParam.getPayType();
 
         if (dataType.equals("toPay")) {
             status = OrderStatusEnum.CREATED.getKey(); // 待支付
@@ -263,6 +264,9 @@ public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implem
         if (StringUtil.isNotEmpty(endTime)) {
             lambdaQueryWrapper.le(MtOrder::getCreateTime, endTime);
         }
+        if (payType != null && payType.size() > 0) {
+            lambdaQueryWrapper.in(MtOrder::getPayType, payType);
+        }
         lambdaQueryWrapper.orderByDesc(MtOrder::getId);
         List<MtOrder> orderList = mtOrderMapper.selectList(lambdaQueryWrapper);
 

fuint-application/src/main/java/com/fuint/common/service/impl/SettlementServiceImpl.java

@@ -2,10 +2,12 @@ package com.fuint.common.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.fuint.common.Constants;
 import com.fuint.common.dto.SettlementDto;
 import com.fuint.common.dto.SettlementOrderDto;
 import com.fuint.common.dto.UserOrderDto;
 import com.fuint.common.enums.PayStatusEnum;
+import com.fuint.common.enums.PayTypeEnum;
 import com.fuint.common.enums.SettleStatusEnum;
 import com.fuint.common.enums.StatusEnum;
 import com.fuint.common.param.OrderListParam;
@@ -113,8 +115,15 @@ public class SettlementServiceImpl implements SettlementService {
         orderParam.setStartTime(requestParam.getStartTime());
         orderParam.setEndTime(requestParam.getEndTime());
         orderParam.setSettleStatus(SettleStatusEnum.WAIT.getKey());
-        orderParam.setPage(1);
-        orderParam.setPageSize(100000);
+
+        List<String> payType = new ArrayList<>();
+        payType.add(PayTypeEnum.JSAPI.getKey());
+        payType.add(PayTypeEnum.MICROPAY.getKey());
+        payType.add(PayTypeEnum.ALISCAN.getKey());
+        orderParam.setPayType(payType);
+
+        orderParam.setPage(Constants.PAGE_NUMBER);
+        orderParam.setPageSize(Constants.ALL_ROWS);
 
         PaginationResponse response = orderService.getUserOrderList(orderParam);
         List<UserOrderDto> orderList = response.getContent();