diff --git a/src/main/java/com/sqx/modules/app/dao/UserDao.java b/src/main/java/com/sqx/modules/app/dao/UserDao.java index f7b0dc5c..97df46fd 100644 --- a/src/main/java/com/sqx/modules/app/dao/UserDao.java +++ b/src/main/java/com/sqx/modules/app/dao/UserDao.java @@ -31,7 +31,7 @@ public interface UserDao extends BaseMapper { Double queryPayMoney(@Param("type") int type, @Param("date") String date,String qdCode); - IPage> queryCourseOrder(Page iPage,@Param("type") int type, @Param("date") String date,Long sysUserId); + IPage> queryCourseOrder(Page iPage,@Param("type") int type, @Param("start") String start, @Param("end") String end,Long sysUserId); int userMessage( String date, int type,String qdCode,Integer vipType); diff --git a/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java b/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java index 8cdb91da..306d5d47 100644 --- a/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java +++ b/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java @@ -1,6 +1,7 @@ package com.sqx.modules.app.service.impl; +import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import cn.hutool.core.thread.ThreadUtil; import cn.hutool.json.JSONUtil; @@ -55,6 +56,7 @@ import com.sqx.modules.sys.service.SysUserService; import com.sqx.modules.utils.HttpClientUtil; import com.sqx.modules.utils.InvitationCodeUtil; import com.sqx.modules.utils.MD5Util; +import com.sqx.modules.utils.TimeCompleteUtils; import com.tencentcloudapi.common.Credential; import com.tencentcloudapi.common.exception.TencentCloudSDKException; import com.tencentcloudapi.common.profile.ClientProfile; @@ -1335,7 +1337,7 @@ public class UserServiceImpl extends ServiceImpl implements String invitationCode, String startTime, String endTime, String qdCode, String sysUserName, Integer vipType) { Page pages = new Page<>(page, limit); return new PageUtils(baseMapper.selectUserPage(pages, search, sex, platform, sysPhone, status, member, - inviterCode, userName, invitationCode, startTime, endTime, qdCode, sysUserName, vipType)); + inviterCode, userName, invitationCode, TimeCompleteUtils.completeStartTime(startTime), TimeCompleteUtils.completeEndTime(endTime), qdCode, sysUserName, vipType)); } @Override @@ -1367,7 +1369,18 @@ public class UserServiceImpl extends ServiceImpl implements @Override public IPage> queryCourseOrder(Page> iPage, int type, String date, Long sysUserId) { - return baseMapper.queryCourseOrder(iPage, type, date, sysUserId); + DateTime parse = DateUtil.parse(date, "yyyy-MM-dd"); + + String startTime = DateUtil.format(parse, "yyyy-MM-dd 00:00:00"); + String endTime = DateUtil.format(parse, "yyyy-MM-dd 23:59:59"); + if (type == 2) { + startTime = DateUtil.format(DateUtil.beginOfMonth(parse), "yyyy-MM-dd 00:00:00"); + endTime = DateUtil.format(DateUtil.endOfMonth(parse), "yyyy-MM-dd 23:59:59"); + } else if (type == 3) { + startTime = DateUtil.format(DateUtil.beginOfYear(parse), "yyyy-MM-dd 00:00:00"); + endTime = DateUtil.format(DateUtil.endOfYear(parse), "yyyy-MM-dd 23:59:59"); + } + return baseMapper.queryCourseOrder(iPage, type, startTime, endTime, sysUserId); } @Override diff --git a/src/main/java/com/sqx/modules/message/controller/app/AppMessageController.java b/src/main/java/com/sqx/modules/message/controller/app/AppMessageController.java index 5c88fe00..fea87a1e 100644 --- a/src/main/java/com/sqx/modules/message/controller/app/AppMessageController.java +++ b/src/main/java/com/sqx/modules/message/controller/app/AppMessageController.java @@ -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(); + } + diff --git a/src/main/java/com/sqx/modules/orders/controller/OrdersController.java b/src/main/java/com/sqx/modules/orders/controller/OrdersController.java index 3c6d5511..0eb417f9 100644 --- a/src/main/java/com/sqx/modules/orders/controller/OrdersController.java +++ b/src/main/java/com/sqx/modules/orders/controller/OrdersController.java @@ -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() - .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")); diff --git a/src/main/java/com/sqx/modules/pay/controller/CashController.java b/src/main/java/com/sqx/modules/pay/controller/CashController.java index ea98a0b8..63167c20 100644 --- a/src/main/java/com/sqx/modules/pay/controller/CashController.java +++ b/src/main/java/com/sqx/modules/pay/controller/CashController.java @@ -1,6 +1,8 @@ package com.sqx.modules.pay.controller; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSON; import com.alipay.api.AlipayApiException; import com.alipay.api.AlipayClient; @@ -211,9 +213,21 @@ public class CashController { @ApiOperation("财务提现统计") @GetMapping("/statisticsCashMoney") public Result statisticsMoney(String time, Integer flag) { - Double sumMoney = cashOutService.sumMoney(time, flag); - Integer countMoney = cashOutService.countMoney(time, flag); - Integer stayMoney = cashOutService.stayMoney(time, flag); + DateTime parse = DateUtil.parse(time, "yyyy-MM-dd"); + + String startTime = DateUtil.format(parse, "yyyy-MM-dd 00:00:00"); + String endTime = DateUtil.format(parse, "yyyy-MM-dd 23:59:59"); + if (flag == 2) { + startTime = DateUtil.format(DateUtil.beginOfMonth(parse), "yyyy-MM-dd 00:00:00"); + endTime = DateUtil.format(DateUtil.endOfMonth(parse), "yyyy-MM-dd 23:59:59"); + } else if (flag == 3) { + startTime = DateUtil.format(DateUtil.beginOfYear(parse), "yyyy-MM-dd 00:00:00"); + endTime = DateUtil.format(DateUtil.endOfYear(parse), "yyyy-MM-dd 23:59:59"); + } + + Double sumMoney = cashOutService.sumMoney(startTime, endTime, flag); + Integer countMoney = cashOutService.countMoney(startTime, endTime, flag); + Integer stayMoney = cashOutService.stayMoney(startTime, endTime, flag); Map map = new HashMap<>(); map.put("sumMoney", sumMoney == null ? 0.00 : sumMoney); map.put("countMoney", countMoney == null ? 0 : countMoney); diff --git a/src/main/java/com/sqx/modules/pay/dao/CashOutDao.java b/src/main/java/com/sqx/modules/pay/dao/CashOutDao.java index d06d8a83..655a3000 100644 --- a/src/main/java/com/sqx/modules/pay/dao/CashOutDao.java +++ b/src/main/java/com/sqx/modules/pay/dao/CashOutDao.java @@ -32,11 +32,11 @@ public interface CashOutDao extends BaseMapper { Double selectSysUserCashOutSum(@Param("sysUserId") Long sysUserId, @Param("time") String time); - Double sumMoney(@Param("time") String time, @Param("flag") Integer flag); + Double sumMoney(@Param("start") String start, @Param("end") String end, @Param("flag") Integer flag); - Integer countMoney(@Param("time") String time, @Param("flag") Integer flag); + Integer countMoney(@Param("start") String start, @Param("end") String end, @Param("flag") Integer flag); - Integer stayMoney(@Param("time") String time, @Param("flag") Integer flag); + Integer stayMoney(@Param("start") String start, @Param("end") String end, @Param("flag") Integer flag); void updateMayMoney(@Param("type") Integer type, @Param("userId") Long userId, @Param("money") Double money); diff --git a/src/main/java/com/sqx/modules/pay/service/CashOutService.java b/src/main/java/com/sqx/modules/pay/service/CashOutService.java index 5e733f61..56736921 100644 --- a/src/main/java/com/sqx/modules/pay/service/CashOutService.java +++ b/src/main/java/com/sqx/modules/pay/service/CashOutService.java @@ -31,11 +31,11 @@ public interface CashOutService { Double selectCashOutSum(Long userId, Date startTime, Date endTime); - Double sumMoney(String time, Integer flag); + Double sumMoney(String time, String end, Integer flag); - Integer countMoney(String time, Integer flag); + Integer countMoney(String time, String end, Integer flag); - Integer stayMoney(String time, Integer flag); + Integer stayMoney(String time, String end, Integer flag); void updateMayMoney(int i, Long userId, Double money); diff --git a/src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java b/src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java index dbfd8b06..06a23e7a 100644 --- a/src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java +++ b/src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java @@ -250,18 +250,18 @@ public class CashOutServiceImpl extends ServiceImpl impleme } @Override - public Double sumMoney(String time, Integer flag) { - return cashOutDao.sumMoney(time, flag); + public Double sumMoney(String start, String end, Integer flag) { + return cashOutDao.sumMoney(start, end, flag); } @Override - public Integer countMoney(String time, Integer flag) { - return cashOutDao.countMoney(time, flag); + public Integer countMoney(String start, String end, Integer flag) { + return cashOutDao.countMoney(start, end, flag); } @Override - public Integer stayMoney(String time, Integer flag) { - return cashOutDao.stayMoney(time, flag); + public Integer stayMoney(String start, String end, Integer flag) { + return cashOutDao.stayMoney(start, end, flag); } @Override diff --git a/src/main/resources/mapper/app/UserDao.xml b/src/main/resources/mapper/app/UserDao.xml index ccfce902..6a2e79b7 100644 --- a/src/main/resources/mapper/app/UserDao.xml +++ b/src/main/resources/mapper/app/UserDao.xml @@ -52,13 +52,13 @@ - and date_format(u.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime} + and u.create_time BETWEEN #{startTime} and #{endTime} - and date_format(u.create_time,'%Y-%m-%d') >= #{startTime} + and u.create_time >= #{startTime} - and date_format(u.create_time,'%Y-%m-%d') <= #{endTime} + and u.create_time <= #{endTime} order by create_time desc @@ -143,15 +143,7 @@ and sys_user_id=#{sysUserId} - - and date_format(o.create_time,'%Y-%m-%d')=date_format(#{date},'%Y-%m-%d') - - - and date_format(o.create_time,'%Y-%m')=date_format(#{date},'%Y-%m') - - - and date_format(o.create_time,'%Y')=date_format(#{date},'%Y') - + and o.create_time between #{start} and #{end} group by c.course_id order by coursenum desc diff --git a/src/main/resources/mapper/course/CourseDao.xml b/src/main/resources/mapper/course/CourseDao.xml index b11f0451..cc786738 100644 --- a/src/main/resources/mapper/course/CourseDao.xml +++ b/src/main/resources/mapper/course/CourseDao.xml @@ -7,103 +7,6 @@ where course_id = #{id} select c.course_details_id as courseDetailsId,c.course_id as courseId,c.wx_course_details_id as wxCourseDetailsId, c.course_details_name as courseDetailsName,c.create_time as createTime, + c.title_img as titleImg,c.content,c.good_num as goodNum,c.price, if(c.is_price!=1,c.video_url,'') as videoUrl, - c.dy_episode_id as dyEpisodeId,c.advertising, c.view_count as viewCount, c.play_complete_count as playCompleteCount, - (select count(*) from course_collect cc where cc.user_id=#{userId} and cc.course_details_id=c.course_details_id and cc.classify=2) as isGood, - c.title_img as titleImg,c.content,c.good_num as goodNum,c.price + c.dy_episode_id as dyEpisodeId,c.advertising, + c.view_count as viewCount, + c.play_complete_count as playCompleteCount, + (select count(*) from course_collect cc where cc.user_id=#{userId} and cc.course_details_id=c.course_details_id and cc.classify=2) as isGood from course_details c where c.course_id=#{id} order by c.sort asc diff --git a/src/main/resources/mapper/pay/CashDao.xml b/src/main/resources/mapper/pay/CashDao.xml index 1533132c..0e3cf72b 100644 --- a/src/main/resources/mapper/pay/CashDao.xml +++ b/src/main/resources/mapper/pay/CashDao.xml @@ -30,43 +30,15 @@