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

Merge remote-tracking branch 'origin/test' into test

This commit is contained in:
GYJ 2024-12-30 19:21:28 +08:00
parent 4355b9f292 52efab0331
commit 808a5f9ce6
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/sqx/modules/message/controller/app/AppMessageController.java
View File

@ -70,6 +70,14 @@ public class AppMessageController {
return Result.success();
}
@Login
@PostMapping("/sendMessage")
@ApiOperation("添加投诉")
public Result sendMessage(@RequestBody MessageInfo messageInfo){
messageService.saveBody(messageInfo);
return Result.success();
}

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

@ -93,7 +93,7 @@ public class OrdersController extends AbstractController {
Double tuiMemberOrdersMoney = ordersService.selectOrdersMoney(2, 2, flag, time, null, sysUserId);
//提现
Integer cashCount = cashOutDao.selectCount(new QueryWrapper<CashOut>()
.eq("sys_user_id", sysUserId)
// .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(sysUserId, DateUtil.format(DateUtil.parse(time, "yyyy-MM-dd"), "yyyy-MM-dd HH:mm:ss"));