diff --git a/src/main/java/com/sqx/modules/bl/massage/entity/MassagePackageDetail.java b/src/main/java/com/sqx/modules/bl/massage/entity/MassagePackageDetail.java index 870ac9b..952eaa2 100644 --- a/src/main/java/com/sqx/modules/bl/massage/entity/MassagePackageDetail.java +++ b/src/main/java/com/sqx/modules/bl/massage/entity/MassagePackageDetail.java @@ -10,7 +10,7 @@ import java.io.Serializable; import java.math.BigDecimal; /** - * @description massage_package + * @description bl_massage_package_detail * @author caolei * @date 2024-6-5 */ diff --git a/src/main/java/com/sqx/modules/bl/order/controller/UserPackageDetailController.java b/src/main/java/com/sqx/modules/bl/order/controller/UserPackageDetailController.java new file mode 100644 index 0000000..5d8b9b8 --- /dev/null +++ b/src/main/java/com/sqx/modules/bl/order/controller/UserPackageDetailController.java @@ -0,0 +1,29 @@ +package com.sqx.modules.bl.order.controller; + +import com.sqx.common.utils.Result; +import com.sqx.modules.bl.order.entity.UserPackageDetail; +import com.sqx.modules.bl.order.service.UserPackageDetailService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + + +@RestController +@RequestMapping("/user/package/detail") +@Api(value = "用户服务包详情管理", tags = {"用户服务包详情"}) +public class UserPackageDetailController { + + @Autowired + private UserPackageDetailService service; + + @GetMapping("/findDetailUsedQuantity") + @ApiOperation("查询服务包详情使用数量") + public Result findDetailUsedQuantity(UserPackageDetail userPackageDetail){ + return service.findDetailUsedQuantity(userPackageDetail); + } + + +} diff --git a/src/main/java/com/sqx/modules/bl/order/controller/UserPackageOrderController.java b/src/main/java/com/sqx/modules/bl/order/controller/UserPackageOrderController.java new file mode 100644 index 0000000..4681b97 --- /dev/null +++ b/src/main/java/com/sqx/modules/bl/order/controller/UserPackageOrderController.java @@ -0,0 +1,43 @@ +package com.sqx.modules.bl.order.controller; + +import com.sqx.common.utils.Result; +import com.sqx.modules.bl.order.entity.UserPackageOrder; +import com.sqx.modules.bl.order.service.UserPackageOrderService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + + +@RestController +@RequestMapping("/user/package/order") +@Api(value = "用户服务包订单管理", tags = {"用户服务包订单"}) +public class UserPackageOrderController { + + @Autowired + private UserPackageOrderService service; + + @GetMapping("/findPage") + @ApiOperation("查询服务包订单(分页)") + public Result findPage(UserPackageOrder userPackageOrder){ + return service.findPage(userPackageOrder); + } + + + @GetMapping("/findCoupon") + @ApiOperation("查询代金券") + public Result findCoupon(UserPackageOrder userPackageOrder){ + return service.findCoupon(userPackageOrder); + } + + @PostMapping("/refund") + @ApiOperation("退款") + public Result refund(UserPackageOrder userPackageOrder){ + service.refund(userPackageOrder); + return Result.success(); + } + +} diff --git a/src/main/java/com/sqx/modules/bl/order/dao/UserPackageDetailDao.java b/src/main/java/com/sqx/modules/bl/order/dao/UserPackageDetailDao.java new file mode 100644 index 0000000..d7a41e0 --- /dev/null +++ b/src/main/java/com/sqx/modules/bl/order/dao/UserPackageDetailDao.java @@ -0,0 +1,14 @@ +package com.sqx.modules.bl.order.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.sqx.modules.bl.order.entity.UserPackageDetail; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface UserPackageDetailDao extends BaseMapper { + + List findDetailUsedQuantity(UserPackageDetail userPackageDetail); + +} \ No newline at end of file diff --git a/src/main/java/com/sqx/modules/bl/order/dao/UserPackageOrderDao.java b/src/main/java/com/sqx/modules/bl/order/dao/UserPackageOrderDao.java new file mode 100644 index 0000000..80b48d0 --- /dev/null +++ b/src/main/java/com/sqx/modules/bl/order/dao/UserPackageOrderDao.java @@ -0,0 +1,21 @@ +package com.sqx.modules.bl.order.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.bl.order.entity.UserPackageOrder; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface UserPackageOrderDao extends BaseMapper { + + IPage findPage(Page page, @Param("params") UserPackageOrder userPackageOrder); + + List findCoupon(UserPackageOrder userPackageOrder); + + int refund(UserPackageOrder userPackageOrder); + +} \ No newline at end of file diff --git a/src/main/java/com/sqx/modules/bl/order/entity/UserPackage.java b/src/main/java/com/sqx/modules/bl/order/entity/UserPackage.java new file mode 100644 index 0000000..2c7b02d --- /dev/null +++ b/src/main/java/com/sqx/modules/bl/order/entity/UserPackage.java @@ -0,0 +1,107 @@ +package com.sqx.modules.bl.order.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * @description bl_user_package + * @author caolei + * @date 2024-6-8 + */ +@Data +@TableName("bl_user_package") +public class UserPackage implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(type = IdType.AUTO) + + /** + * 编号 + */ + private Long id; + + /** + * 用户id + */ + private Long userId; + + /** + * 服务包id + */ + private Long packageId; + + /** + * 订单id + */ + private Long ordersId; + + /** + * 订单号 + */ + private String ordersNo; + + /** + * 创建时间 + */ + private String createTime; + + /** + * 名称 + */ + private String title; + + /** + * 类型 + */ + private Integer type; + + /** + * 原价 + */ + private BigDecimal oldPrice; + + /** + * 现价 + */ + private BigDecimal price; + + /** + * 图片 + */ + private String packageImg; + + /** + * 内容 + */ + private String content; + + /** + * 详细内容 + */ + private String contentImg; + + /** + * 标签 + */ + private String labels; + + /** + * 城市 + */ + private String city; + + @TableField(exist = false) + private Integer page; + + @TableField(exist = false) + private Integer limit; + + public UserPackage() {} +} diff --git a/src/main/java/com/sqx/modules/bl/order/entity/UserPackageDetail.java b/src/main/java/com/sqx/modules/bl/order/entity/UserPackageDetail.java new file mode 100644 index 0000000..e4e479b --- /dev/null +++ b/src/main/java/com/sqx/modules/bl/order/entity/UserPackageDetail.java @@ -0,0 +1,161 @@ +package com.sqx.modules.bl.order.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * @description bl_user_package_order + * @author caolei + * @date 2024-6-8 + */ +@Data +@TableName("bl_user_package_detail") +public class UserPackageDetail implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(type = IdType.AUTO) + + /** + * 编号 + */ + private Long id; + + /** + * 主表id + */ + private Long mainId; + + /** + * 服务包明细id + */ + private Long packageDetailId; + + /** + * 按摩类型id + */ + private Long massageTypeId; + + /** + * 状态 1上 2下 + */ + private Integer status; + + /** + * 服务优惠价格 + */ + private BigDecimal packagePrice; + + /** + * 间隔天数 + */ + private String intervalDays; + + /** + * 创建时间 + */ + private String createTime; + + /** + * 名称 + */ + private String title; + + /** + * 图片 + */ + private String massageImg; + + /** + * 内容 + */ + private String content; + + /** + * 原价 + */ + private BigDecimal oldPrice; + + /** + * 现价 + */ + private BigDecimal price; + + /** + * 时长 + */ + private Integer duration; + + /** + * 是否限制性别 0不限制 1男 2女 + */ + private Integer isSex; + + /** + * 城市 + */ + private String city; + + /** + * 详细图片 + */ + private String contentImg; + + /** + * 标签 + */ + private String labels; + + /** + * 下级id加钟项目 + */ + private Integer parentId; + + /** + * 类型 + */ + private Integer classifyId; + + /** + * 适用人群 + */ + private String applyPeople; + + /** + * 简介 + */ + @TableField(exist = false) + private String jianjie; + + /** + * 订单id + */ + @TableField(exist = false) + private Long ordersId; + + /** + * 已使用数量 + */ + @TableField(exist = false) + private Integer usedQuantity; + + /** + * 未使用数量 + */ + @TableField(exist = false) + private Integer unUsedQuantity; + + @TableField(exist = false) + private Integer page; + + @TableField(exist = false) + private Integer limit; + + public UserPackageDetail() {} +} diff --git a/src/main/java/com/sqx/modules/bl/order/entity/UserPackageOrder.java b/src/main/java/com/sqx/modules/bl/order/entity/UserPackageOrder.java new file mode 100644 index 0000000..b54419e --- /dev/null +++ b/src/main/java/com/sqx/modules/bl/order/entity/UserPackageOrder.java @@ -0,0 +1,143 @@ +package com.sqx.modules.bl.order.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * @description bl_user_package_order + * @author caolei + * @date 2024-6-8 + */ +@Data +@TableName("bl_user_package_order") +public class UserPackageOrder implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(type = IdType.AUTO) + + /** + * 订单id + */ + private Long ordersId; + + /** + * 订单号 + */ + private String ordersNo; + + /** + * 用户id + */ + private Long userId; + + /** + * 姓名 + */ + private String userName; + + /** + * 服务包id + */ + private Long packageId; + + /** + * 服务包名称 + */ + private String packageName; + + /** + * 服务包类型 + */ + private Integer type; + + /** + * 会员优惠比例 + */ + private BigDecimal vipRate; + + /** + * 单价 + */ + private BigDecimal price; + + /** + * 数量 + */ + private Integer quantity; + + /** + * 原总金额 + */ + private BigDecimal oldSumMoney; + + /** + * 应付总金额 + */ + private BigDecimal sumMoney; + + /** + * 实际支付金额 + */ + private BigDecimal payMoney; + + /** + * 支付时间 + */ + private String payTime; + + /** + * 支付方式 + */ + private Integer payWay; + + /** + * 状态 + */ + private Integer status; + + /** + * 优惠券id,逗号拼接字符串 + */ + private String couponId; + + /** + * 代金券数量 + */ + private Integer couponCount; + + /** + * 代金券总金额 + */ + private BigDecimal couponMoney; + + /** + * 退款时间 + */ + private String refundTime; + + /** + * 退款金额 + */ + private BigDecimal refundMoney; + + /** + * 代金券名称 + */ + @TableField(exist = false) + private String couponName; + + @TableField(exist = false) + private Integer page; + + @TableField(exist = false) + private Integer limit; + + public UserPackageOrder() {} +} diff --git a/src/main/java/com/sqx/modules/bl/order/service/UserPackageDetailService.java b/src/main/java/com/sqx/modules/bl/order/service/UserPackageDetailService.java new file mode 100644 index 0000000..621226b --- /dev/null +++ b/src/main/java/com/sqx/modules/bl/order/service/UserPackageDetailService.java @@ -0,0 +1,9 @@ +package com.sqx.modules.bl.order.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.sqx.common.utils.Result; +import com.sqx.modules.bl.order.entity.UserPackageDetail; + +public interface UserPackageDetailService extends IService { + Result findDetailUsedQuantity(UserPackageDetail userPackageDetail); +} diff --git a/src/main/java/com/sqx/modules/bl/order/service/UserPackageOrderService.java b/src/main/java/com/sqx/modules/bl/order/service/UserPackageOrderService.java new file mode 100644 index 0000000..7a00fb8 --- /dev/null +++ b/src/main/java/com/sqx/modules/bl/order/service/UserPackageOrderService.java @@ -0,0 +1,11 @@ +package com.sqx.modules.bl.order.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.sqx.common.utils.Result; +import com.sqx.modules.bl.order.entity.UserPackageOrder; + +public interface UserPackageOrderService extends IService { + Result findPage(UserPackageOrder userPackageOrder); + Result findCoupon(UserPackageOrder userPackageOrder); + int refund(UserPackageOrder userPackageOrder); +} diff --git a/src/main/java/com/sqx/modules/bl/order/service/impl/UserPackageDetailServiceImpl.java b/src/main/java/com/sqx/modules/bl/order/service/impl/UserPackageDetailServiceImpl.java new file mode 100644 index 0000000..c30b31a --- /dev/null +++ b/src/main/java/com/sqx/modules/bl/order/service/impl/UserPackageDetailServiceImpl.java @@ -0,0 +1,18 @@ +package com.sqx.modules.bl.order.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.sqx.common.utils.Result; +import com.sqx.modules.bl.order.dao.UserPackageDetailDao; +import com.sqx.modules.bl.order.entity.UserPackageDetail; +import com.sqx.modules.bl.order.service.UserPackageDetailService; +import org.springframework.stereotype.Service; + +@Service +public class UserPackageDetailServiceImpl extends ServiceImpl implements UserPackageDetailService { + + @Override + public Result findDetailUsedQuantity(UserPackageDetail userPackageDetail){ + return Result.success().put("data",baseMapper.findDetailUsedQuantity(userPackageDetail)); + } + +} \ No newline at end of file diff --git a/src/main/java/com/sqx/modules/bl/order/service/impl/UserPackageOrderServiceImpl.java b/src/main/java/com/sqx/modules/bl/order/service/impl/UserPackageOrderServiceImpl.java new file mode 100644 index 0000000..62f4254 --- /dev/null +++ b/src/main/java/com/sqx/modules/bl/order/service/impl/UserPackageOrderServiceImpl.java @@ -0,0 +1,36 @@ +package com.sqx.modules.bl.order.service.impl; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.sqx.common.utils.PageUtils; +import com.sqx.common.utils.Result; +import com.sqx.modules.bl.order.dao.UserPackageOrderDao; +import com.sqx.modules.bl.order.entity.UserPackageOrder; +import com.sqx.modules.bl.order.service.UserPackageOrderService; +import org.springframework.stereotype.Service; + +import java.text.SimpleDateFormat; +import java.util.Date; + +@Service +public class UserPackageOrderServiceImpl extends ServiceImpl implements UserPackageOrderService { + + @Override + public Result findPage(UserPackageOrder userPackageOrder){ + Page pages=new Page<>(userPackageOrder.getPage(),userPackageOrder.getLimit()); + return Result.success().put("data",new PageUtils(baseMapper.findPage(pages,userPackageOrder))); + } + + @Override + public Result findCoupon(UserPackageOrder userPackageOrder){ + return Result.success().put("data",baseMapper.findCoupon(userPackageOrder)); + } + + @Override + public int refund(UserPackageOrder userPackageOrder){ + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + userPackageOrder.setRefundTime(sdf.format(new Date())); + return baseMapper.refund(userPackageOrder); + } + +} \ 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 new file mode 100644 index 0000000..3e96c5b --- /dev/null +++ b/src/main/resources/mapper/bl/order/UserPackageDetailDao.xml @@ -0,0 +1,21 @@ + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/bl/order/UserPackageOrderDao.xml b/src/main/resources/mapper/bl/order/UserPackageOrderDao.xml new file mode 100644 index 0000000..896f2d4 --- /dev/null +++ b/src/main/resources/mapper/bl/order/UserPackageOrderDao.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + update bl_user_package_order + set + refund_time = #{refundTime}, + refund_money = #{refundMoney}, + status = 2 + where orders_id = #{ordersId} + + + \ No newline at end of file