czg_team
/
video_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'test' into dev

This commit is contained in:
GYJ 2025-04-17 16:02:34 +08:00
parent 02226f183f 608453cd5f
commit 88f01b4be9
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/sqx/modules/orders/controller/OrdersController.java
View File

@ -1,6 +1,7 @@
package com.sqx.modules.orders.controller;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.NumberUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@ -91,12 +92,13 @@ public class OrdersController extends AbstractController {
Double daiMemberOrdersMoney = ordersService.selectOrdersMoney(0, 2, flag, time, null, sysUserId);
Double wanMemberOrdersMoney = ordersService.selectOrdersMoney(1, 2, flag, time, null, sysUserId);
Double tuiMemberOrdersMoney = ordersService.selectOrdersMoney(2, 2, flag, time, null, sysUserId);
DateTime parse = DateUtil.parse(time, "yyyy-MM-dd");
//提现
Integer cashCount = cashOutDao.selectCount(new QueryWrapper<CashOut>()
// .eq("sys_user_id", sysUserId)
.eq("state", 1)
.gt("create_at", DateUtil.format(DateUtil.parse(time, "yyyy-MM-dd"), "yyyy-MM-dd HH:mm:ss")));
Double cashSum = cashOutDao.selectSysUserCashOutSum(null, DateUtil.format(DateUtil.parse(time, "yyyy-MM-dd"), "yyyy-MM-dd HH:mm:ss"));
Double cashSum = cashOutDao.selectSysUserCashOutSum(null, DateUtil.beginOfDay(parse), DateUtil.endOfDay(parse));
Map<String, Object> result = new HashMap<>();

2
src/main/java/com/sqx/modules/pay/dao/CashOutDao.java
View File

@ -27,7 +27,7 @@ public interface CashOutDao extends BaseMapper<CashOut> {
Integer selectTodayCashCount(@Param("userId") Long userId, @Param("stateList") List<Integer> stateList,@Param("time") String time);
Double selectSysUserCashOutSum(@Param("sysUserId") Long sysUserId, @Param("time") String time);
Double selectSysUserCashOutSum(@Param("sysUserId") Long sysUserId, @Param("startTime") Date startTime, @Param("endTime") Date endTime);
Double sumMoney(@Param("start") String start, @Param("end") String end, @Param("flag") Integer flag);

2
src/main/resources/mapper/orders/OrdersDao.xml
View File

@ -227,6 +227,8 @@
<if test="flag!=null and flag==3">
and date_format(create_time,'%Y')=date_format(#{time},'%Y')
</if>
and pay_way = 9
AND `status` = 1
</select>
<select id="selectFenXiaoMoney" resultType="Double">

2
src/main/resources/mapper/pay/CashDao.xml
View File

@ -30,7 +30,7 @@
<if test="sysUserId != null">
and user_id=#{sysUserId}
</if>
and create_at &gt; #{time}
and create_at &gt; #{startTime} and create_at &lt;= #{endTime}
</select>
<select id="sumMoney" resultType="Double">