From d482faae0aec0e5ebc40dda10c3f7536ac829f9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Mon, 17 Jun 2024 21:57:13 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E9=92=B1=E5=8C=85=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E6=B5=81=E6=B0=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/app/dao/UserMoneyDetailsDao.java | 5 ++++ .../modules/app/entity/UserMoneyDetails.java | 7 +++++ .../service/impl/UserMoneyServiceImpl.java | 6 ++-- .../controller/ArtificerController.java | 4 +-- .../app/AppArtificerController.java | 24 +++++++++++---- .../sqx/modules/artificer/dao/OrdersDao.java | 2 +- .../sqx/modules/artificer/entity/Orders.java | 4 +++ .../artificer/service/OrdersService.java | 2 +- .../service/impl/OrdersServiceImpl.java | 4 +-- .../bl/collect/entity/CollectMassage.java | 17 ++++++++++- .../AppMassagePackageDetailController.java | 13 +++++++-- .../massage/dao/MassagePackageDetailDao.java | 1 + .../service/MassagePackageDetailService.java | 1 + .../impl/MassagePackageServiceDetailImpl.java | 6 ++++ .../impl/UserPackageDetailServiceImpl.java | 2 +- .../com/sqx/modules/coupon/entity/Coupon.java | 2 +- .../service/impl/CouponUserServiceImpl.java | 12 ++++---- .../pay/controller/app/AliPayController.java | 1 + .../pay/service/impl/WxServiceImpl.java | 1 + .../mapper/app/UserMoneyDetailsDao.xml | 15 ++++++++++ .../resources/mapper/artificer/OrdersDao.xml | 3 ++ .../mapper/bl/collect/CollectMassageDao.xml | 26 +++++++++++++---- .../mapper/bl/massage/MassagePackageDao.xml | 6 ++-- .../bl/massage/MassagePackageDetailDao.xml | 29 +++++++++++++++++++ .../mapper/bl/order/UserPackageDetailDao.xml | 6 ++-- 25 files changed, 161 insertions(+), 38 deletions(-) diff --git a/src/main/java/com/sqx/modules/app/dao/UserMoneyDetailsDao.java b/src/main/java/com/sqx/modules/app/dao/UserMoneyDetailsDao.java index ea4af03..0b415a5 100644 --- a/src/main/java/com/sqx/modules/app/dao/UserMoneyDetailsDao.java +++ b/src/main/java/com/sqx/modules/app/dao/UserMoneyDetailsDao.java @@ -1,6 +1,9 @@ package com.sqx.modules.app.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.sqx.modules.app.entity.UserMoneyDetails; +import com.sqx.modules.bl.collect.entity.CollectMassage; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -14,4 +17,6 @@ public interface UserMoneyDetailsDao extends BaseMapper { BigDecimal selectSumRefund(Long userId,String startTime,String endTime); int insert(UserMoneyDetails userMoneyDetails); + + IPage findUserMontyDetailPage(Page page, @Param("userId") Long userId); } diff --git a/src/main/java/com/sqx/modules/app/entity/UserMoneyDetails.java b/src/main/java/com/sqx/modules/app/entity/UserMoneyDetails.java index e29a1f0..efceacc 100644 --- a/src/main/java/com/sqx/modules/app/entity/UserMoneyDetails.java +++ b/src/main/java/com/sqx/modules/app/entity/UserMoneyDetails.java @@ -99,4 +99,11 @@ public class UserMoneyDetails implements Serializable { private Integer blFlag; + @TableField(exist = false) + private Integer page; + + @TableField(exist = false) + private Integer limit; + + } diff --git a/src/main/java/com/sqx/modules/app/service/impl/UserMoneyServiceImpl.java b/src/main/java/com/sqx/modules/app/service/impl/UserMoneyServiceImpl.java index 592429d..0a598f6 100644 --- a/src/main/java/com/sqx/modules/app/service/impl/UserMoneyServiceImpl.java +++ b/src/main/java/com/sqx/modules/app/service/impl/UserMoneyServiceImpl.java @@ -14,6 +14,7 @@ import com.sqx.modules.app.service.*; import com.sqx.modules.artificer.entity.Artificer; import com.sqx.modules.artificer.entity.Period; import com.sqx.modules.artificer.service.ArtificerService; +import com.sqx.modules.bl.collect.entity.CollectMassage; import com.sqx.modules.message.entity.MessageInfo; import com.sqx.modules.message.service.MessageService; import com.sqx.modules.utils.PeriodUtil; @@ -143,11 +144,10 @@ public class UserMoneyServiceImpl extends ServiceImpl i return userMoneyDetailsDao.selectMyProfit(userId); } - - @Override public PageUtils balanceDetailed(Long userId, Page pages) { - return new PageUtils(userMoneyDetailsDao.selectPage(pages,new QueryWrapper().eq("user_id",userId).orderByDesc("create_time "))); +// return new PageUtils(userMoneyDetailsDao.selectPage(pages,new QueryWrapper().eq("user_id",userId).orderByDesc("create_time "))); + return new PageUtils(userMoneyDetailsDao.findUserMontyDetailPage(pages,userId)); } @Override diff --git a/src/main/java/com/sqx/modules/artificer/controller/ArtificerController.java b/src/main/java/com/sqx/modules/artificer/controller/ArtificerController.java index 28e0f2c..f579730 100644 --- a/src/main/java/com/sqx/modules/artificer/controller/ArtificerController.java +++ b/src/main/java/com/sqx/modules/artificer/controller/ArtificerController.java @@ -195,10 +195,10 @@ public class ArtificerController { String endTime,Integer isAdd,String ordersNo,String artificerName, String oneUserName,String oneArtificerUserName, String startServeTime,String endServeTime,Integer overTimeOrders,Long shopId, - String shopName,Integer warning,String title,String classifyId){ + String shopName,Integer warning,String title,String classifyId, Long userPackageId){ return ordersService.selectOrdersList(userId, page, limit, status, city, name, phone, artificerId, parentId, startTime, endTime, isAdd, ordersNo, artificerName, - oneUserName, oneArtificerUserName, startServeTime, endServeTime,overTimeOrders,shopId,shopName,warning,title,classifyId); + oneUserName, oneArtificerUserName, startServeTime, endServeTime,overTimeOrders,shopId,shopName,warning,title,classifyId, userPackageId); } @GetMapping("/excelOrdersList") diff --git a/src/main/java/com/sqx/modules/artificer/controller/app/AppArtificerController.java b/src/main/java/com/sqx/modules/artificer/controller/app/AppArtificerController.java index fe8974a..85ce3a1 100644 --- a/src/main/java/com/sqx/modules/artificer/controller/app/AppArtificerController.java +++ b/src/main/java/com/sqx/modules/artificer/controller/app/AppArtificerController.java @@ -19,6 +19,8 @@ import com.sqx.modules.artificer.dao.ArtificerDao; import com.sqx.modules.artificer.dao.UserRechargeDao; import com.sqx.modules.artificer.entity.*; import com.sqx.modules.artificer.service.*; +import com.sqx.modules.bl.collect.entity.CollectMassage; +import com.sqx.modules.bl.collect.service.CollectMassageService; import com.sqx.modules.common.dao.CommonInfoDao; import com.sqx.modules.common.entity.CommonInfo; import com.sqx.modules.common.service.CommonInfoService; @@ -80,7 +82,8 @@ public class AppArtificerController { private ArtificerDao artificerDao; @Autowired private UserRechargeDao userRechargeDao; - + @Autowired + private CollectMassageService collectMassageService; @GetMapping("/selectMassageTypePage") @ApiOperation("查询按摩分类（分页）") @@ -100,7 +103,16 @@ public class AppArtificerController { @GetMapping("/selectMassageTypeById") @ApiOperation("查询详情") - public Result selectMassageTypeById(Long massageTypeId){ + public Result selectMassageTypeById(Long massageTypeId,Long userId){ + if(userId!=null){ + //插入浏览历史 + CollectMassage collectMassage=new CollectMassage(); + collectMassage.setClassify(2); + collectMassage.setUserId(userId); + collectMassage.setProjectId(massageTypeId); + collectMassage.setFlag(1); + collectMassageService.insertCollect(collectMassage); + } MassageType massageType = massageTypeService.getById(massageTypeId); SysDictEntity sysDictEntity = sysDictService.getById(massageType.getClassifyId()); if(sysDictEntity!=null){ @@ -194,10 +206,10 @@ public class AppArtificerController { Integer isAdd,String ordersNo,String artificerName, String oneUserName,String oneArtificerUserName, String startServeTime,String endServeTime,Integer overTimeOrders, - Long shopId,String shopName,Integer warning,String title,String classifyId){ + Long shopId,String shopName,Integer warning,String title,String classifyId, Long userPackageId){ return ordersService.selectOrdersList(userId, page, limit, status, city, userName, phone, artificerId, parentId, startTime, endTime, isAdd, ordersNo, artificerName, oneUserName, oneArtificerUserName, - startServeTime, endServeTime,overTimeOrders,shopId,shopName,warning,title,classifyId); + startServeTime, endServeTime,overTimeOrders,shopId,shopName,warning,title,classifyId, userPackageId); } @Login @@ -208,10 +220,10 @@ public class AppArtificerController { Integer isAdd,String ordersNo,String artificerName, String oneUserName,String oneArtificerUserName, String startServeTime,String endServeTime,Integer overTimeOrders,Long shopId, - String shopName,Integer warning,String title,String classifyId){ + String shopName,Integer warning,String title,String classifyId, Long userPackageId){ return ordersService.selectOrdersList(userId, page, limit, status, city, userName, phone, artificerId, parentId, startTime, endTime, isAdd, ordersNo, artificerName, oneUserName, oneArtificerUserName, - startServeTime, endServeTime,overTimeOrders,shopId,shopName,warning,title,classifyId); + startServeTime, endServeTime,overTimeOrders,shopId,shopName,warning,title,classifyId, userPackageId); } @Login diff --git a/src/main/java/com/sqx/modules/artificer/dao/OrdersDao.java b/src/main/java/com/sqx/modules/artificer/dao/OrdersDao.java index 31e3254..db720f6 100644 --- a/src/main/java/com/sqx/modules/artificer/dao/OrdersDao.java +++ b/src/main/java/com/sqx/modules/artificer/dao/OrdersDao.java @@ -26,7 +26,7 @@ public interface OrdersDao extends BaseMapper { @Param("endTime") String endTime,@Param("isAdd") Integer isAdd,String ordersNo,String artificerName, String oneUserName,String oneArtificerUserName, String startServeTime,String endServeTime,Integer overTimeOrders,Long shopId,String shopName,Integer warning, - String title,String classifyId); + String title,String classifyId,Long userPackageId); List excelOrdersList(@Param("userId") Long userId,@Param("status") Integer status, @Param("city") String city,@Param("userName") String userName,@Param("phone") String phone, diff --git a/src/main/java/com/sqx/modules/artificer/entity/Orders.java b/src/main/java/com/sqx/modules/artificer/entity/Orders.java index ae2261f..808934d 100644 --- a/src/main/java/com/sqx/modules/artificer/entity/Orders.java +++ b/src/main/java/com/sqx/modules/artificer/entity/Orders.java @@ -301,6 +301,10 @@ public class Orders implements Serializable { * 用户服务包ID */ private Long userPackageId; + /** + * 用户服务包明细ID + */ + private Long userPackageDetailId; /** * 项目名称 diff --git a/src/main/java/com/sqx/modules/artificer/service/OrdersService.java b/src/main/java/com/sqx/modules/artificer/service/OrdersService.java index 3d07c41..97b64ee 100644 --- a/src/main/java/com/sqx/modules/artificer/service/OrdersService.java +++ b/src/main/java/com/sqx/modules/artificer/service/OrdersService.java @@ -31,7 +31,7 @@ public interface OrdersService extends IService { String endTime,Integer isAdd,String ordersNo,String artificerName, String oneUserName,String oneArtificerUserName, String startServeTime,String endServeTime,Integer overTimeOrders,Long shopId, - String shopName,Integer warning,String title,String classifyId); + String shopName,Integer warning,String title,String classifyId, Long userPackageId); ExcelData excelOrdersList(Long userId,Integer status,String city, String name,String phone,Long artificerId,Long parentId,String startTime, diff --git a/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java b/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java index 7fd44a5..1435989 100644 --- a/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java +++ b/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java @@ -1203,11 +1203,11 @@ public class OrdersServiceImpl extends ServiceImpl implements String endTime, Integer isAdd, String ordersNo, String artificerName, String oneUserName, String oneArtificerUserName, String startServeTime, String endServeTime, Integer overTimeOrders, - Long shopId, String shopName, Integer warning, String title, String classifyId) { + Long shopId, String shopName, Integer warning, String title, String classifyId, Long userPackageId) { Page pages = new Page<>(page, limit); IPage ordersIPage = baseMapper.selectOrdersList(pages, userId, status, city, name, phone, artificerId, parentId, startTime, endTime, isAdd, ordersNo, - artificerName, oneUserName, oneArtificerUserName, startServeTime, endServeTime, overTimeOrders, shopId, shopName, warning, title, classifyId); + artificerName, oneUserName, oneArtificerUserName, startServeTime, endServeTime, overTimeOrders, shopId, shopName, warning, title, classifyId, userPackageId); List records = ordersIPage.getRecords(); for (Orders orders : records) { List ordersMassageList = ordersMassageService.list(new QueryWrapper().eq("orders_id", orders.getOrdersId())); diff --git a/src/main/java/com/sqx/modules/bl/collect/entity/CollectMassage.java b/src/main/java/com/sqx/modules/bl/collect/entity/CollectMassage.java index 6665960..e3abbdd 100644 --- a/src/main/java/com/sqx/modules/bl/collect/entity/CollectMassage.java +++ b/src/main/java/com/sqx/modules/bl/collect/entity/CollectMassage.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import java.io.Serializable; +import java.math.BigDecimal; /** * 浏览记录 @@ -25,7 +26,7 @@ public class CollectMassage implements Serializable { private long collectId; /** - * 技师id + * 服务或项目id */ private Long projectId; @@ -59,4 +60,18 @@ public class CollectMassage implements Serializable { private Integer limit; + @TableField(exist = false) + private String title; + @TableField(exist = false) + private String massageImg; + @TableField(exist = false) + private BigDecimal oldPrice; + @TableField(exist = false) + private BigDecimal price; + @TableField(exist = false) + private String content; + @TableField(exist = false) + private String type; + @TableField(exist = false) + private String remarks; } diff --git a/src/main/java/com/sqx/modules/bl/massage/app/AppMassagePackageDetailController.java b/src/main/java/com/sqx/modules/bl/massage/app/AppMassagePackageDetailController.java index 112fff1..a22f81f 100644 --- a/src/main/java/com/sqx/modules/bl/massage/app/AppMassagePackageDetailController.java +++ b/src/main/java/com/sqx/modules/bl/massage/app/AppMassagePackageDetailController.java @@ -20,11 +20,18 @@ public class AppMassagePackageDetailController { private MassagePackageDetailService service; @Login - @GetMapping("/findPage") + @GetMapping("/findAppPage") @ApiOperation("查询按服务包详情（分页）") - public Result findPage(MassagePackageDetail massagePackageDetail){ + public Result findAppPage(MassagePackageDetail massagePackageDetail){ massagePackageDetail.setStatus(1); - return service.findPage(massagePackageDetail); + return service.findAppPage(massagePackageDetail); + } + + @Login + @GetMapping("/getAppPackageDetail") + @ApiOperation("查询服务包详情") + public Result getAppPackageDetail(MassagePackageDetail massagePackageDetail){ + return service.getAppPackageDetail(massagePackageDetail); } } diff --git a/src/main/java/com/sqx/modules/bl/massage/dao/MassagePackageDetailDao.java b/src/main/java/com/sqx/modules/bl/massage/dao/MassagePackageDetailDao.java index 70aa4f5..91cef21 100644 --- a/src/main/java/com/sqx/modules/bl/massage/dao/MassagePackageDetailDao.java +++ b/src/main/java/com/sqx/modules/bl/massage/dao/MassagePackageDetailDao.java @@ -22,4 +22,5 @@ public interface MassagePackageDetailDao extends BaseMapper findMassagePage(Page page, @Param("params") MassagePackageDetail massagePackageDetail); int delete(MassagePackageDetail massagePackageDetail); MassagePackage findPackagePrice(MassagePackageDetail massagePackageDetail); + MassagePackageDetail getAppPackageDetail(Long id); } \ No newline at end of file diff --git a/src/main/java/com/sqx/modules/bl/massage/service/MassagePackageDetailService.java b/src/main/java/com/sqx/modules/bl/massage/service/MassagePackageDetailService.java index 3c49bb5..9dc83f0 100644 --- a/src/main/java/com/sqx/modules/bl/massage/service/MassagePackageDetailService.java +++ b/src/main/java/com/sqx/modules/bl/massage/service/MassagePackageDetailService.java @@ -16,4 +16,5 @@ public interface MassagePackageDetailService extends IService map = new HashMap(); UserPackage userPackage = userPackageService.getMyPackageById(userPackageDetail.getMainId()); - map.put("mainData",userPackage); int type = userPackage.getType(); List list = Lists.newArrayList(); if(type == 104){ @@ -57,6 +56,7 @@ public class UserPackageDetailServiceImpl extends ServiceImpl7){ - return Result.error("您已经过了新人优惠期"); + return Result.error("已过新人优惠期"); } //获取所有新人优惠卷 diff --git a/src/main/java/com/sqx/modules/pay/controller/app/AliPayController.java b/src/main/java/com/sqx/modules/pay/controller/app/AliPayController.java index 02cf65d..39e68c0 100644 --- a/src/main/java/com/sqx/modules/pay/controller/app/AliPayController.java +++ b/src/main/java/com/sqx/modules/pay/controller/app/AliPayController.java @@ -678,6 +678,7 @@ public class AliPayController { userPackage.setContentImg(massagePackage.getContentImg()); userPackage.setLabels(massagePackage.getLabels()); userPackage.setCity(massagePackage.getCity()); + userPackage.setClassifyId(massagePackage.getClassifyId()); userPackageService.insert(userPackage); Long mainId = userPackage.getId(); //拆分插入用户服务器项目详情 diff --git a/src/main/java/com/sqx/modules/pay/service/impl/WxServiceImpl.java b/src/main/java/com/sqx/modules/pay/service/impl/WxServiceImpl.java index aa79d19..39b7d82 100644 --- a/src/main/java/com/sqx/modules/pay/service/impl/WxServiceImpl.java +++ b/src/main/java/com/sqx/modules/pay/service/impl/WxServiceImpl.java @@ -1151,6 +1151,7 @@ public class WxServiceImpl implements WxService { userPackage.setContentImg(massagePackage.getContentImg()); userPackage.setLabels(massagePackage.getLabels()); userPackage.setCity(massagePackage.getCity()); + userPackage.setClassifyId(massagePackage.getClassifyId()); userPackageService.insert(userPackage); Long mainId = userPackage.getId(); //拆分插入用户服务器项目详情 diff --git a/src/main/resources/mapper/app/UserMoneyDetailsDao.xml b/src/main/resources/mapper/app/UserMoneyDetailsDao.xml index 1432eae..3e8a828 100644 --- a/src/main/resources/mapper/app/UserMoneyDetailsDao.xml +++ b/src/main/resources/mapper/app/UserMoneyDetailsDao.xml @@ -111,4 +111,19 @@ + + \ No newline at end of file diff --git a/src/main/resources/mapper/artificer/OrdersDao.xml b/src/main/resources/mapper/artificer/OrdersDao.xml index d63c658..98aa798 100644 --- a/src/main/resources/mapper/artificer/OrdersDao.xml +++ b/src/main/resources/mapper/artificer/OrdersDao.xml @@ -284,6 +284,9 @@ left join tb_user u on u.user_id=o.user_id left join consortia c on c.consortia_id=o.consortia_id where 1=1 + + and o.user_package_id = #{userPackageId} + and o.orders_id in (select orders_id from orders_massage where massage_id in (select massage_type_id from massage_type where classify_id=#{classifyId} )) diff --git a/src/main/resources/mapper/bl/collect/CollectMassageDao.xml b/src/main/resources/mapper/bl/collect/CollectMassageDao.xml index 6b3cae6..a5853fe 100644 --- a/src/main/resources/mapper/bl/collect/CollectMassageDao.xml +++ b/src/main/resources/mapper/bl/collect/CollectMassageDao.xml @@ -4,19 +4,33 @@ diff --git a/src/main/resources/mapper/bl/massage/MassagePackageDao.xml b/src/main/resources/mapper/bl/massage/MassagePackageDao.xml index bfc83d2..08fe649 100644 --- a/src/main/resources/mapper/bl/massage/MassagePackageDao.xml +++ b/src/main/resources/mapper/bl/massage/MassagePackageDao.xml @@ -54,7 +54,7 @@ diff --git a/src/main/resources/mapper/bl/massage/MassagePackageDetailDao.xml b/src/main/resources/mapper/bl/massage/MassagePackageDetailDao.xml index 166047e..696bdba 100644 --- a/src/main/resources/mapper/bl/massage/MassagePackageDetailDao.xml +++ b/src/main/resources/mapper/bl/massage/MassagePackageDetailDao.xml @@ -186,4 +186,33 @@ group by a.main_id + + \ No newline at end of file diff --git a/src/main/resources/mapper/bl/order/UserPackageDetailDao.xml b/src/main/resources/mapper/bl/order/UserPackageDetailDao.xml index 04ae63c..d57359a 100644 --- a/src/main/resources/mapper/bl/order/UserPackageDetailDao.xml +++ b/src/main/resources/mapper/bl/order/UserPackageDetailDao.xml @@ -36,13 +36,14 @@ a.massage_type_id, a.title, a.massage_img, + a.content_img, round(avg(a.package_price),2) as package_price, round(avg(a.price),2) as price, sum(case a.status when 1 then 1 else 0 end) as usedQuantity, sum(case a.status when 0 then 1 else 0 end) as unUsedQuantity from bl_user_package_detail a where a.main_id = #{mainId} - group by a.massage_type_id,a.title,a.massage_img + group by a.massage_type_id,a.title,a.massage_img,a.content_img order by a.massage_type_id @@ -51,6 +52,7 @@ a.massage_type_id, a.title, a.massage_img, + a.content_img, round(avg(a.package_price),2) as package_price, round(avg(a.price),2) as price, sum(case a.status when 1 then 1 else 0 end) as usedQuantity, @@ -60,7 +62,7 @@ from bl_user_package_detail a inner join bl_user_package b on a.main_id = b.id where a.main_id = #{mainId} - group by a.massage_type_id,a.title,a.massage_img + group by a.massage_type_id,a.title,a.massage_img,a.content_img order by a.massage_type_id