dd

ruoyi-admin/src/main/java/com/ruoyi/web/controller/line/OnlineOrderController.java

@@ -12,6 +12,7 @@ import com.ruoyi.businessDayBill.domain.bo.BusinessDayBillCountBo;
 import com.ruoyi.businessDayBill.domain.vo.BusinessDayBillVo;
 import com.ruoyi.businessDayBill.service.IBusinessDayBillService;
 import com.ruoyi.onlineorder.domain.vo.OnlineOrderCountVo;
+import com.ruoyi.onlineorder.enums.OnlinePayStatus;
 import com.ruoyi.subsidy.domain.bo.SubsidyQueueBo;
 import com.ruoyi.subsidy.enums.SubsidyCountType;
 import com.ruoyi.subsidy.service.ISubsidyQueueService;
@@ -224,6 +225,7 @@ public class OnlineOrderController extends BaseController {
 
 
         //累计收款
+        onlineOrderBo.setPayStatus(OnlinePayStatus.PAYED);
         OnlineOrderCountVo countVo = iOnlineOrderService.getStatistics(onlineOrderBo);
         map.put("totalAmount", 0.00);
         map.put("totalRefund", 0.00);
@@ -257,6 +259,7 @@ public class OnlineOrderController extends BaseController {
         map.put("todayAmount", ObjectUtil.isNotNull( statistics)? statistics.getOnlineOrderAmount() : 0);
 
         //累计收款
+        onlineOrderBo.setPayStatus(OnlinePayStatus.PAYED);
         OnlineOrderCountVo countVo = iOnlineOrderService.getStatistics(onlineOrderBo);
         map.put("totalAmount", 0.00);
         map.put("totalRefund", 0.00);

ruoyi-line/src/main/resources/mapper/onlineorder/OnlineOrderMapper.xml

@@ -58,6 +58,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="bo.orderStatus != null">
                 and too.order_status = #{bo.orderStatus.code}
             </if>
+            <if test="bo.payStatus != null">
+                and too.pay_status = #{bo.payStatus.code}
+            </if>
             <if test="bo.payType != null">
                 and too.pay_type = #{bo.payType.code}
             </if>