diff --git a/src/main/java/com/sqx/modules/app/controller/app/AppVipDetailsController.java b/src/main/java/com/sqx/modules/app/controller/app/AppVipDetailsController.java index b36db45..6ffd051 100644 --- a/src/main/java/com/sqx/modules/app/controller/app/AppVipDetailsController.java +++ b/src/main/java/com/sqx/modules/app/controller/app/AppVipDetailsController.java @@ -29,6 +29,18 @@ public class AppVipDetailsController { return appVipDetailsService.selectVipDetails(); } + /** + * 获取会员的详情信息 + * + * @return + */ + @Login + @ApiParam("获取会员的详情信息") + @GetMapping("/getVipDetailByUser") + public Result getVipDetailByUser(Long userId) { + return appVipDetailsService.getVipDetailByUser(userId); + } + /** * 添加会员的详情信息 * diff --git a/src/main/java/com/sqx/modules/app/entity/VipDetails.java b/src/main/java/com/sqx/modules/app/entity/VipDetails.java index 6a28aa6..aa12587 100644 --- a/src/main/java/com/sqx/modules/app/entity/VipDetails.java +++ b/src/main/java/com/sqx/modules/app/entity/VipDetails.java @@ -9,7 +9,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import weixin.popular.bean.card.Discount; import java.io.Serializable; import java.math.BigDecimal; @@ -40,4 +39,10 @@ public class VipDetails implements Serializable { private Integer vipType; //优惠力度 private BigDecimal rate; + + /** + * 用户ID + */ + @TableField(exist = false) + private Long userId; } diff --git a/src/main/java/com/sqx/modules/app/service/VipDetailsService.java b/src/main/java/com/sqx/modules/app/service/VipDetailsService.java index 3c436f3..2b63196 100644 --- a/src/main/java/com/sqx/modules/app/service/VipDetailsService.java +++ b/src/main/java/com/sqx/modules/app/service/VipDetailsService.java @@ -13,6 +13,13 @@ public interface VipDetailsService extends IService { */ Result selectVipDetails(); + /** + * 获取会员的详情信息 + * + * @return + */ + Result getVipDetailByUser(Long userId); + /** * 添加会员的详情信息 * diff --git a/src/main/java/com/sqx/modules/app/service/impl/VipDetailsServiceImpl.java b/src/main/java/com/sqx/modules/app/service/impl/VipDetailsServiceImpl.java index d704aed..8bdf879 100644 --- a/src/main/java/com/sqx/modules/app/service/impl/VipDetailsServiceImpl.java +++ b/src/main/java/com/sqx/modules/app/service/impl/VipDetailsServiceImpl.java @@ -1,5 +1,6 @@ package com.sqx.modules.app.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.sqx.common.utils.Result; import com.sqx.modules.app.dao.VipDetailsDao; @@ -7,12 +8,24 @@ import com.sqx.modules.app.entity.VipDetails; import com.sqx.modules.app.service.VipDetailsService; import org.springframework.stereotype.Service; +import java.util.List; + @Service public class VipDetailsServiceImpl extends ServiceImpl implements VipDetailsService { @Override public Result selectVipDetails() { - return Result.success().put("data", baseMapper.selectList(null)); + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("vip_type", 0); + queryWrapper.orderByAsc("id"); + List list = baseMapper.selectList(queryWrapper); + return Result.success().put("data", list); + } + + @Override + public Result getVipDetailByUser(Long userId){ + VipDetails vipDetails = baseMapper.getVipDetailByUser(userId); + return Result.success().put("data", vipDetails); } @Override diff --git a/src/main/java/com/sqx/modules/bl/order/app/AppUserPackageOrderController.java b/src/main/java/com/sqx/modules/bl/order/app/AppUserPackageOrderController.java index 3406b4a..e43c033 100644 --- a/src/main/java/com/sqx/modules/bl/order/app/AppUserPackageOrderController.java +++ b/src/main/java/com/sqx/modules/bl/order/app/AppUserPackageOrderController.java @@ -21,7 +21,7 @@ public class AppUserPackageOrderController { @Autowired private UserPackageOrderService service; - @Login +// @Login @PostMapping("/insertOrders") @ApiOperation("添加订单") public Result insertOrders(@RequestBody UserPackageOrder userPackageOrder){ @@ -29,7 +29,7 @@ public class AppUserPackageOrderController { return service.insertOrders(userPackageOrder); } - @Login +// @Login @PostMapping("/payOrder") @ApiOperation("钱包支付订单") public Result payOrder(Long ordersId){ diff --git a/src/main/java/com/sqx/modules/bl/order/controller/UserPackageController.java b/src/main/java/com/sqx/modules/bl/order/controller/UserPackageController.java new file mode 100644 index 0000000..753cd84 --- /dev/null +++ b/src/main/java/com/sqx/modules/bl/order/controller/UserPackageController.java @@ -0,0 +1,28 @@ +package com.sqx.modules.bl.order.controller; + +import com.sqx.common.utils.Result; +import com.sqx.modules.bl.order.entity.UserPackage; +import com.sqx.modules.bl.order.service.UserPackageService; +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") +@Api(value = "用户服务包管理", tags = {"用户服务包"}) +public class UserPackageController { + + @Autowired + private UserPackageService service; + + @GetMapping("/findList") + @ApiOperation("查询服务包") + public Result findList(UserPackage userPackage){ + return service.findList(userPackage); + } + +} 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 index 5d8b9b8..297fc15 100644 --- a/src/main/java/com/sqx/modules/bl/order/controller/UserPackageDetailController.java +++ b/src/main/java/com/sqx/modules/bl/order/controller/UserPackageDetailController.java @@ -10,6 +10,8 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + @RestController @RequestMapping("/user/package/detail") @@ -25,5 +27,4 @@ public class UserPackageDetailController { return service.findDetailUsedQuantity(userPackageDetail); } - } diff --git a/src/main/java/com/sqx/modules/bl/order/dao/UserPackageDao.java b/src/main/java/com/sqx/modules/bl/order/dao/UserPackageDao.java index 34091f6..9daf692 100644 --- a/src/main/java/com/sqx/modules/bl/order/dao/UserPackageDao.java +++ b/src/main/java/com/sqx/modules/bl/order/dao/UserPackageDao.java @@ -5,8 +5,14 @@ import com.sqx.modules.bl.massage.entity.MassagePackage; import com.sqx.modules.bl.order.entity.UserPackage; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + @Mapper public interface UserPackageDao extends BaseMapper { + List findList(UserPackage userPackage); + + List findListByMapping(UserPackage userPackage); + int insert(UserPackage userPackage); } \ 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 index 5668b00..3748ce0 100644 --- a/src/main/java/com/sqx/modules/bl/order/entity/UserPackage.java +++ b/src/main/java/com/sqx/modules/bl/order/entity/UserPackage.java @@ -98,6 +98,12 @@ public class UserPackage implements Serializable { */ private String city; + /** + * 状态 0待支付 + */ + @TableField(exist = false) + private Integer status; + @TableField(exist = false) private Integer page; diff --git a/src/main/java/com/sqx/modules/bl/order/service/UserPackageService.java b/src/main/java/com/sqx/modules/bl/order/service/UserPackageService.java index 76e4668..afb756f 100644 --- a/src/main/java/com/sqx/modules/bl/order/service/UserPackageService.java +++ b/src/main/java/com/sqx/modules/bl/order/service/UserPackageService.java @@ -1,9 +1,12 @@ 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.UserPackage; public interface UserPackageService extends IService { + Result findList(UserPackage userPackage); + int insert(UserPackage userPackage); } \ No newline at end of file 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 index 4182f9f..536d108 100644 --- 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 @@ -1,6 +1,7 @@ package com.sqx.modules.bl.order.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.google.common.collect.Lists; import com.sqx.common.utils.Result; import com.sqx.modules.bl.order.dao.UserPackageDetailDao; import com.sqx.modules.bl.order.entity.UserPackageDetail; @@ -14,7 +15,13 @@ public class UserPackageDetailServiceImpl extends ServiceImpl list = Lists.newArrayList(); + if(userPackageDetail.getStatus() == 0){ + list = baseMapper.findMassagePackageDetails(userPackageDetail); + }else{ + list = baseMapper.findDetailUsedQuantity(userPackageDetail); + } + return Result.success().put("data",list); } @Override diff --git a/src/main/java/com/sqx/modules/bl/order/service/impl/UserPackageServiceImpl.java b/src/main/java/com/sqx/modules/bl/order/service/impl/UserPackageServiceImpl.java index 9427bf1..ee7ab2a 100644 --- a/src/main/java/com/sqx/modules/bl/order/service/impl/UserPackageServiceImpl.java +++ b/src/main/java/com/sqx/modules/bl/order/service/impl/UserPackageServiceImpl.java @@ -1,14 +1,33 @@ package com.sqx.modules.bl.order.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.google.common.collect.Lists; +import com.sqx.common.utils.Result; import com.sqx.modules.bl.order.dao.UserPackageDao; import com.sqx.modules.bl.order.entity.UserPackage; import com.sqx.modules.bl.order.service.UserPackageService; import org.springframework.stereotype.Service; +import java.util.List; + @Service public class UserPackageServiceImpl extends ServiceImpl implements UserPackageService { + @Override + public Result findList(UserPackage userPackage){ + List list = Lists.newArrayList(); + if(userPackage.getStatus() == 0){ + list = baseMapper.findListByMapping(userPackage); + }else{ + list = baseMapper.findList(userPackage); + } + for(int i=0;i + and b.status=#{params.status} + order by a.id desc diff --git a/src/main/resources/mapper/bl/order/UserPackageDao.xml b/src/main/resources/mapper/bl/order/UserPackageDao.xml index 25b2a5c..4e881d3 100644 --- a/src/main/resources/mapper/bl/order/UserPackageDao.xml +++ b/src/main/resources/mapper/bl/order/UserPackageDao.xml @@ -3,6 +3,45 @@ + + + + insert into bl_user_package( user_id, diff --git a/src/main/resources/mapper/bl/order/UserPackageDetailDao.xml b/src/main/resources/mapper/bl/order/UserPackageDetailDao.xml index 854fae5..eff2a11 100644 --- a/src/main/resources/mapper/bl/order/UserPackageDetailDao.xml +++ b/src/main/resources/mapper/bl/order/UserPackageDetailDao.xml @@ -12,8 +12,8 @@ a.price, (case a.status when 1 then 1 else 0 end) as usedQuantity, (case a.status when 0 then 1 else 0 end) as unUsedQuantity - from bl_user_package_detail a inner join bl_user_package b on a.main_id = b.id - where b.orders_id = #{ordersId} + from bl_user_package_detail a + where a.main_id = #{mainId} group by a.massage_type_id,a.title,a.massage_img,a.package_price,a.price order by a.massage_type_id