From 315a341e416c1cbea82166057553268fe146f4de Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Mon, 30 Dec 2024 19:00:36 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=8F=90=E7=8E=B0=E6=AC=A1=E6=95=B0/?= =?UTF-8?q?=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/sqx/modules/orders/controller/OrdersController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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")); From 52efab03318de70ae0120fb097ac4132c55e9a9e Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Mon, 30 Dec 2024 19:12:15 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=84=8F=E8=A7=81=E5=8F=8D=E9=A6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../message/controller/app/AppMessageController.java | 8 ++++++++ 1 file changed, 8 insertions(+) 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(); + } + From 4355b9f2924b08c132f42653cc92fc721032d6cd Mon Sep 17 00:00:00 2001 From: GYJ <1157756119@qq.com> Date: Mon, 30 Dec 2024 19:21:19 +0800 Subject: [PATCH 3/6] =?UTF-8?q?sql=20=E6=8A=A5=E9=94=99=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/sqx/modules/app/dao/UserDao.java | 2 +- .../app/service/impl/UserServiceImpl.java | 17 ++++++++-- .../pay/controller/CashController.java | 20 +++++++++-- .../com/sqx/modules/pay/dao/CashOutDao.java | 6 ++-- .../modules/pay/service/CashOutService.java | 6 ++-- .../pay/service/impl/CashOutServiceImpl.java | 12 +++---- src/main/resources/mapper/app/UserDao.xml | 18 +++------- src/main/resources/mapper/pay/CashDao.xml | 34 ++----------------- 8 files changed, 53 insertions(+), 62 deletions(-) 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/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 ef279061..8a473631 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 @@ -144,15 +144,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 ) a order by a.coursenum desc @@ -335,4 +327,4 @@ - \ No newline at end of file + 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 @@ SELECT + MAX(u.update_time) AS produceEndTime, + c.*, + d1.course_details_name AS courseDetailsName, + d1.course_details_id AS courseDetailsId, + COUNT(d2.course_details_id) AS courseDetailsCount + FROM + course_collect u + LEFT JOIN + course c ON u.course_id = c.course_id + LEFT JOIN + course_collect cc1 ON cc1.course_id = u.course_id + AND cc1.classify = 3 + AND cc1.user_id = #{userId} + LEFT JOIN + course_details d1 ON cc1.course_details_id = d1.course_details_id + LEFT JOIN + course_details d2 ON d2.course_id = c.course_id + WHERE + u.user_id = #{userId} + AND c.course_id IS NOT NULL + AND u.classify = #{classify} + GROUP BY + u.course_id, c.course_id + ORDER BY + produceEndTime DESC; + + + - \ No newline at end of file + diff --git a/src/main/resources/mapper/course/CourseDao.xml b/src/main/resources/mapper/course/CourseDao.xml index c5e96f94..b11f0451 100644 --- a/src/main/resources/mapper/course/CourseDao.xml +++ b/src/main/resources/mapper/course/CourseDao.xml @@ -7,6 +7,103 @@ where course_id = #{id} - SELECT - c.classify_id AS classifyId, - c.course_id AS courseId, - c.course_label AS courseLabel, - c.create_time AS createTime, - c.details, - c.img, - c.banner_img AS bannerImg, - c.status, - c.is_delete AS isDelete, - c.msg_type AS msgType, - c.msg_url AS msgUrl, - c.pay_num AS payNum, - c.price, - c.wholesale_price AS wholesalePrice, - c.is_over AS isOver, - c.title, - c.is_price AS isPrice, - c.title_img AS titleImg, - c.update_time AS updateTime, - cc.classification_name AS classificationName, - c.course_type AS courseType, - c.banner_id AS bannerId, - b.name AS bannerName, - 0 AS viewCounts, - c.dy_img_id AS dyImgId, - c.dy_course_id AS dyCourseId, - c.wx_course_id AS wxCourseId, - c.wx_show AS wxShow, - c.dy_show AS dyShow, - c.sort, - ROUND(10000 * RAND(), 0) AS goodNum, - d.courseDetailsCount, - NULL AS courseDetailsName, - NULL AS courseDetailsId, - ROUND(10000 * RAND(), 0) AS weekGoodNum, - 0 AS isRecommend - FROM - course AS c - LEFT JOIN - course_classification AS cc ON c.classify_id = cc.classification_id - LEFT JOIN - banner AS b ON b.id = c.banner_id - LEFT JOIN - (SELECT course_id, COUNT(*) AS courseDetailsCount - FROM course_details - GROUP BY course_id) AS d ON c.course_id = d.course_id - LEFT JOIN - (SELECT course_id FROM course_details WHERE good = 1) AS gd ON c.course_id = gd.course_id - WHERE - c.is_delete = 0 - - AND c.wx_show = #{wxShow} - - - AND (c.wx_show = #{wxShow} OR c.wx_show IS NULL) - - - AND c.dy_show = #{dyShow} - - - AND (c.dy_show = #{dyShow} OR c.dy_show IS NULL) - - - AND c.title LIKE CONCAT('%', #{title}, '%') - - - AND c.classify_id = #{classifyId} - - - AND c.banner_id = #{bannerId} - - - AND c.is_recommend = 1 - - - AND c.is_over = #{over} - - - AND gd.course_id IS NOT NULL - - - AND c.status = #{status} - - - AND c.is_price = #{isPrice} - - - AND c.wx_course_id IS NOT NULL - - - AND c.dy_status = 4 - - - ORDER BY c.sort ASC, c.create_time DESC - - - ORDER BY goodNum DESC - - - ORDER BY weekGoodNum DESC - ; - - - + + + +