商家结算卡信息

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

@@ -224,11 +224,14 @@ public class OnlineOrderController extends BaseController {
 
 
         //累计收款
-        OnlineOrderCountVo countVo = iOnlineOrderService.getStatistics(bo);
-        map.put("totalAmount", countVo.getOrderTotalAmount());
-
-        //已退款
-        map.put("totalRefund", countVo.getRefundTotalAmount());
+        OnlineOrderCountVo countVo = iOnlineOrderService.getStatistics(onlineOrderBo);
+        map.put("totalAmount", 0.00);
+        map.put("totalRefund", 0.00);
+        if (ObjectUtil.isNotNull(countVo)) {
+            map.put("totalAmount", countVo.getOrderTotalAmount());
+            //已退款
+            map.put("totalRefund", countVo.getRefundTotalAmount());
+        }
         return map;
     }
 
@@ -254,11 +257,14 @@ public class OnlineOrderController extends BaseController {
         map.put("todayAmount", ObjectUtil.isNotNull( statistics)? statistics.getOnlineOrderAmount() : 0);
 
         //累计收款
-        OnlineOrderCountVo countVo = iOnlineOrderService.getStatistics(bo);
-        map.put("totalAmount", countVo.getOrderTotalAmount());
-
-        //已退款
-        map.put("totalRefund", countVo.getRefundTotalAmount());
+        OnlineOrderCountVo countVo = iOnlineOrderService.getStatistics(onlineOrderBo);
+        map.put("totalAmount", 0.00);
+        map.put("totalRefund", 0.00);
+        if (ObjectUtil.isNotNull(countVo)) {
+            map.put("totalAmount", countVo.getOrderTotalAmount());
+            //已退款
+            map.put("totalRefund", countVo.getRefundTotalAmount());
+        }
         return map;
     }
 

ruoyi-api/src/main/java/com/ruoyi/api/controller/business/ApiBusinessApplyController.java

@@ -89,7 +89,7 @@ public class ApiBusinessApplyController extends AbstractApiController {
     @RepeatSubmit()
     @PostMapping("/add")
     public R<Void> add(@Validated(AddGroup.class) @RequestBody BusinessApplyBo bo) {
-        bo.setUserId(getUserId());
+        bo.setUserId(getUserId(true));
         bo.setAuditStatus(AuditStatus.WAIT_AUDIT.getCode());
         bo.setAgentAuditStatus(AuditStatus.WAIT_AUDIT.getCode());
         return toAjax(iBusinessApplyService.insertByBo(bo) ? 1 : 0);
@@ -99,7 +99,7 @@ public class ApiBusinessApplyController extends AbstractApiController {
     @RepeatSubmit()
     @PostMapping("/audit")
     public R<Void> audit(@RequestBody BusinessApplyBo bo) {
-        bo.setAgentAuditUserId(getUserId());
+        bo.setAuditUserId(getUserId(true));
         return toAjax(iBusinessApplyService.agentAudit(bo) ? 1 : 0);
     }
 

ruoyi-business/src/main/java/com/ruoyi/business/service/impl/BusinessApplyServiceImpl.java

@@ -129,6 +129,7 @@ public class BusinessApplyServiceImpl implements IBusinessApplyService {
         lqw.eq(bo.getAuditTime() != null, BusinessApply::getAuditTime, bo.getAuditTime());
         lqw.eq(bo.getAuditUserId() != null, BusinessApply::getAuditUserId, bo.getAuditUserId());
         lqw.eq(StringUtils.isNotBlank(bo.getAuditResult()), BusinessApply::getAuditResult, bo.getAuditResult());
+        lqw.eq(bo.getAgentAuditUserId() != null, BusinessApply::getAgentAuditUserId, bo.getAgentAuditUserId());
         lqw.eq(bo.getAgentAuditStatus() != null, BusinessApply::getAgentAuditStatus, bo.getAgentAuditStatus());
         lqw.in(CollUtil.isNotEmpty(bo.getAgentAuditStatusList()), BusinessApply::getAgentAuditStatus, bo.getAgentAuditStatusList());
         Date startTime = bo.getStartTime();

ruoyi-line/src/main/java/com/ruoyi/onlineorder/mapper/OnlineOrderMapper.java

@@ -27,5 +27,5 @@ public interface OnlineOrderMapper extends BaseMapperPlus<OnlineOrderMapper, Onl
 
     List<OnlineOrderVo> queryCustomList(@Param("bo") OnlineOrderBo bo);
 
-    OnlineOrderCountVo getStatistics(@Param("bo") BusinessDayBillCountBo bo);
+    OnlineOrderCountVo getStatistics(@Param("bo") OnlineOrderBo bo);
 }

ruoyi-line/src/main/java/com/ruoyi/onlineorder/service/IOnlineOrderService.java

@@ -159,5 +159,5 @@ public interface IOnlineOrderService {
      * @param bo 订单统计参数
      * @return 订单统计信息
      */
-    OnlineOrderCountVo getStatistics(BusinessDayBillCountBo bo);
+    OnlineOrderCountVo getStatistics(OnlineOrderBo bo);
 }

ruoyi-line/src/main/java/com/ruoyi/onlineorder/service/impl/OnlineOrderServiceImpl.java

@@ -374,7 +374,7 @@ public class OnlineOrderServiceImpl implements IOnlineOrderService {
     }
 
     @Override
-    public OnlineOrderCountVo getStatistics(BusinessDayBillCountBo bo) {
+    public OnlineOrderCountVo getStatistics(OnlineOrderBo bo) {
         return baseMapper.getStatistics(bo);
     }
 

ruoyi-line/src/main/resources/mapper/subsidy/SubsidyQueueMapper.xml

@@ -56,7 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="query.bo!=null and query.bo.orderNo!=null and query.bo.orderNo!=''">
             and tsq.order_no like concat('%',#{query.bo.orderNo},'%')
         </if>
-        <if test="query.bo!=null and bo.userMobile!=null and query.bo.userMobile!=''">
+        <if test="query.bo!=null and query.bo.userMobile!=null and query.bo.userMobile!=''">
             and tsq.user_mobile like concat('%',#{query.bo.userMobile},'%')
         </if>
         <if test="query.bo!=null and query.bo.userName!=null and query.bo.userName!=''">