APP断,套餐包接口编写
This commit is contained in:
parent
5a4684c710
commit
21c9ed6243
|
@ -23,7 +23,7 @@ public class AppMassagePackageController {
|
|||
@Autowired
|
||||
private MassagePackageService service;
|
||||
|
||||
@Login
|
||||
// @Login
|
||||
@GetMapping("/findPage")
|
||||
@ApiOperation("查询按服务包(分页)")
|
||||
public Result findPage(MassagePackage massagePackage){
|
||||
|
@ -31,4 +31,12 @@ public class AppMassagePackageController {
|
|||
return service.findPage(massagePackage);
|
||||
}
|
||||
|
||||
// @Login
|
||||
@GetMapping("/findPackageAndMassagePage")
|
||||
@ApiOperation("查询按服务包及项目(分页)")
|
||||
public Result findPackageAndMassagePage(MassagePackage massagePackage){
|
||||
massagePackage.setStatus(1);
|
||||
return service.findPackageAndMassagePage(massagePackage);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -18,4 +18,5 @@ public interface MassagePackageDao extends BaseMapper<MassagePackage> {
|
|||
int updateStatus(MassagePackage massagePackage);
|
||||
int updatePrice(MassagePackage massagePackage);
|
||||
int delete(MassagePackage massagePackage);
|
||||
IPage<MassagePackage> findPackageAndMassagePage(Page<MassagePackage> page,@Param("params") MassagePackage massagePackage);
|
||||
}
|
|
@ -14,4 +14,6 @@ public interface MassagePackageService extends IService<MassagePackage> {
|
|||
int updateStatus(MassagePackage massagePackage);
|
||||
int updatePrice(MassagePackage massagePackage);
|
||||
int delete(MassagePackage massagePackage);
|
||||
|
||||
Result findPackageAndMassagePage(MassagePackage massagePackage);
|
||||
}
|
|
@ -52,4 +52,10 @@ public class MassagePackageServiceImpl extends ServiceImpl<MassagePackageDao, Ma
|
|||
return baseMapper.delete(massagePackage);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Result findPackageAndMassagePage(MassagePackage massagePackage){
|
||||
Page<MassagePackage> pages=new Page<>(massagePackage.getPage(),massagePackage.getLimit());
|
||||
return Result.success().put("data",new PageUtils(baseMapper.findPackageAndMassagePage(pages,massagePackage)));
|
||||
}
|
||||
|
||||
}
|
|
@ -0,0 +1,30 @@
|
|||
package com.sqx.modules.bl.order.app;
|
||||
|
||||
import com.sqx.common.utils.Result;
|
||||
import com.sqx.modules.app.annotation.Login;
|
||||
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("/app/user/package")
|
||||
@Api(value = "用户服务包管理", tags = {"用户服务包"})
|
||||
public class AppUserPackageController {
|
||||
|
||||
@Autowired
|
||||
private UserPackageService service;
|
||||
|
||||
@Login
|
||||
@GetMapping("/findMyPackageList")
|
||||
@ApiOperation("查询服务包")
|
||||
public Result findMyPackageList(UserPackage userPackage){
|
||||
return service.findMyPackageList(userPackage);
|
||||
}
|
||||
|
||||
}
|
|
@ -37,4 +37,12 @@ public class AppUserPackageOrderController {
|
|||
return service.payOrder(ordersId);
|
||||
}
|
||||
|
||||
// @Login
|
||||
@PostMapping("/findUserPackageOrders")
|
||||
@ApiOperation("查询服务包订单")
|
||||
public Result findUserPackageOrders(@RequestBody UserPackageOrder userPackageOrder){
|
||||
//入参:用户ID,代金券IDS,原总金额,应付总金额,会员优惠比,
|
||||
return service.findUserPackageOrders(userPackageOrder);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -1,9 +1,11 @@
|
|||
package com.sqx.modules.bl.order.dao;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.sqx.modules.bl.massage.entity.MassagePackage;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.sqx.modules.bl.order.entity.UserPackage;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
@ -15,4 +17,9 @@ public interface UserPackageDao extends BaseMapper<UserPackage> {
|
|||
List<UserPackage> findListByMapping(UserPackage userPackage);
|
||||
|
||||
int insert(UserPackage userPackage);
|
||||
|
||||
int updateStatusByOrder(UserPackage userPackage);
|
||||
|
||||
IPage<UserPackage> findMyPackageList(Page<UserPackage> page, @Param("params") UserPackage userPackage);
|
||||
|
||||
}
|
|
@ -28,6 +28,9 @@ public interface UserPackageOrderDao extends BaseMapper<UserPackageOrder> {
|
|||
|
||||
List<UserPackageOrder> selectOrdersStatusByTime(String time);
|
||||
|
||||
IPage<UserPackageOrder> findUserPackageOrders(Page<UserPackageOrder> page,@Param("params") UserPackageOrder userPackageOrder);
|
||||
|
||||
int updateStatus(UserPackageOrder userPackageOrder);
|
||||
|
||||
|
||||
}
|
|
@ -99,9 +99,8 @@ public class UserPackage implements Serializable {
|
|||
private String city;
|
||||
|
||||
/**
|
||||
* 状态 0待支付
|
||||
* 状态 1正常 2用完 3无效
|
||||
*/
|
||||
@TableField(exist = false)
|
||||
private Integer status;
|
||||
|
||||
@TableField(exist = false)
|
||||
|
|
|
@ -115,7 +115,11 @@ public class UserPackageOrder implements Serializable {
|
|||
*/
|
||||
private String createTime;
|
||||
|
||||
|
||||
/**
|
||||
* 服务包类型
|
||||
*/
|
||||
@TableField(exist = false)
|
||||
private Long type;
|
||||
/**
|
||||
* 代金券名称
|
||||
*/
|
||||
|
|
|
@ -14,4 +14,7 @@ public interface UserPackageOrderService extends IService<UserPackageOrder> {
|
|||
Result insertOrders(UserPackageOrder userPackageOrder);
|
||||
|
||||
Result payOrder(Long ordersId);
|
||||
|
||||
Result findUserPackageOrders(UserPackageOrder userPackageOrder);
|
||||
|
||||
}
|
||||
|
|
|
@ -9,4 +9,8 @@ public interface UserPackageService extends IService<UserPackage> {
|
|||
Result findList(UserPackage userPackage);
|
||||
|
||||
int insert(UserPackage userPackage);
|
||||
|
||||
int updateStatusByOrder(UserPackage userPackage);
|
||||
|
||||
Result findMyPackageList(UserPackage userPackage);
|
||||
}
|
|
@ -16,7 +16,7 @@ public class UserPackageDetailServiceImpl extends ServiceImpl<UserPackageDetailD
|
|||
@Override
|
||||
public Result findDetailUsedQuantity(UserPackageDetail userPackageDetail){
|
||||
List<UserPackageDetail> list = Lists.newArrayList();
|
||||
if(userPackageDetail.getStatus() == 0){
|
||||
if(userPackageDetail.getStatus() == 0 || userPackageDetail.getStatus() == 3){
|
||||
list = baseMapper.findMassagePackageDetails(userPackageDetail);
|
||||
}else{
|
||||
list = baseMapper.findDetailUsedQuantity(userPackageDetail);
|
||||
|
|
|
@ -113,6 +113,10 @@ public class UserPackageOrderServiceImpl extends ServiceImpl<UserPackageOrderDao
|
|||
//修改订单表
|
||||
userPackageOrder.setRefundTime(sdf.format(new Date()));
|
||||
baseMapper.refund(userPackageOrder);
|
||||
UserPackage userPackage = new UserPackage();
|
||||
userPackage.setOrdersId(userPackageOrder.getOrdersId());
|
||||
userPackage.setStatus(2);
|
||||
userPackageService.updateStatusByOrder(userPackage);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -336,6 +340,12 @@ public class UserPackageOrderServiceImpl extends ServiceImpl<UserPackageOrderDao
|
|||
return Result.success();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Result findUserPackageOrders(UserPackageOrder userPackageOrder){
|
||||
Page<UserPackageOrder> pages=new Page<>(userPackageOrder.getPage(),userPackageOrder.getLimit());
|
||||
return Result.success().put("data", baseMapper.findUserPackageOrders(pages,userPackageOrder));
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 每5分钟自动扫描未支付订单,进行取消,释放代金券
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
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.google.common.collect.Lists;
|
||||
import com.sqx.common.utils.Result;
|
||||
|
@ -16,15 +17,15 @@ public class UserPackageServiceImpl extends ServiceImpl<UserPackageDao, UserPack
|
|||
@Override
|
||||
public Result findList(UserPackage userPackage){
|
||||
List<UserPackage> list = Lists.newArrayList();
|
||||
if(userPackage.getStatus() == 0){
|
||||
if(userPackage.getStatus() == 0 || userPackage.getStatus() == 3){
|
||||
list = baseMapper.findListByMapping(userPackage);
|
||||
for(int i=0;i<list.size();i++){
|
||||
UserPackage up = list.get(i);
|
||||
up.setStatus(userPackage.getStatus());
|
||||
}
|
||||
}else{
|
||||
list = baseMapper.findList(userPackage);
|
||||
}
|
||||
for(int i=0;i<list.size();i++){
|
||||
UserPackage up = list.get(i);
|
||||
up.setStatus(userPackage.getStatus());
|
||||
}
|
||||
return Result.success().put("data",list);
|
||||
}
|
||||
|
||||
|
@ -33,4 +34,15 @@ public class UserPackageServiceImpl extends ServiceImpl<UserPackageDao, UserPack
|
|||
return baseMapper.insert(userPackage);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int updateStatusByOrder(UserPackage userPackage){
|
||||
return baseMapper.updateStatusByOrder(userPackage);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Result findMyPackageList(UserPackage userPackage){
|
||||
Page<UserPackage> pages=new Page<>(userPackage.getPage(),userPackage.getLimit());
|
||||
return Result.success().put("data",baseMapper.findMyPackageList(pages,userPackage));
|
||||
}
|
||||
|
||||
}
|
|
@ -19,7 +19,7 @@
|
|||
<if test="params.title!=null and params.title!=''">
|
||||
and m.title like concat('%',#{params.title},'%')
|
||||
</if>
|
||||
order by type
|
||||
order by type acs,sales desc,id acs
|
||||
</select>
|
||||
|
||||
<update id="updateSales" parameterType="com.sqx.modules.bl.massage.entity.MassagePackage">
|
||||
|
@ -50,4 +50,22 @@
|
|||
delete from bl_massage_package where id=#{id}
|
||||
</delete>
|
||||
|
||||
<select id="findPackageAndMassagePage" resultType="com.sqx.modules.bl.massage.entity.MassagePackage">
|
||||
select a.id as massage_type_id,title,a.type,b.value as type_name,old_price,price,package_img,content,content_img,add_num,sales,labels,'套餐' as flag
|
||||
from bl_massage_package a inner join sys_dict b on a.type = b.id
|
||||
where a.status = 1
|
||||
<if test="params.city!=null and params.city!=''">
|
||||
and (a.city like concat('%',#{params.city},'%') or a.city='不限')
|
||||
</if>
|
||||
union all
|
||||
select massage_type_id,title,classify_id as type,b.value as type_name,old_price,price,massage_img,jianjie,content_img,add_num,sales,labels,'项目' as flag
|
||||
from massage_type a inner join sys_dict b on a.classify_id = b.id
|
||||
where a.status = 1
|
||||
<if test="params.city!=null and params.city!=''">
|
||||
and (a.city like concat('%',#{params.city},'%') or a.city='不限')
|
||||
</if>
|
||||
order by sales desc,massage_type_id asc
|
||||
</select>
|
||||
|
||||
|
||||
</mapper>
|
|
@ -11,6 +11,7 @@
|
|||
orders_id,
|
||||
orders_no,
|
||||
create_time,
|
||||
status,
|
||||
title,
|
||||
type,
|
||||
old_price,
|
||||
|
@ -76,4 +77,34 @@
|
|||
)
|
||||
</insert>
|
||||
|
||||
<update id="updateStatusByOrder">
|
||||
update bl_user_package
|
||||
set status = #{status}
|
||||
where orders_id = #{ordersId}
|
||||
</update>
|
||||
|
||||
<select id="findMyPackageList" resultType="com.sqx.modules.bl.order.entity.UserPackage">
|
||||
select
|
||||
id,
|
||||
user_id,
|
||||
package_id,
|
||||
orders_id,
|
||||
orders_no,
|
||||
create_time,
|
||||
status,
|
||||
title,
|
||||
type,
|
||||
old_price,
|
||||
price,
|
||||
package_img,
|
||||
content,
|
||||
content_img,
|
||||
labels,
|
||||
city
|
||||
from bl_user_package
|
||||
where user_id = #{params.userId}
|
||||
and type = #{params.type}
|
||||
order by id
|
||||
</select>
|
||||
|
||||
</mapper>
|
|
@ -192,6 +192,28 @@
|
|||
select * from bl_user_package_order where now()>= DATE_ADD( create_time, INTERVAL #{time} MINUTE ) and status=0
|
||||
</select>
|
||||
|
||||
<select id="findUserPackageOrders" resultType="com.sqx.modules.bl.order.entity.UserPackageOrder">
|
||||
select
|
||||
a.orders_id,
|
||||
a.orders_no,
|
||||
a.user_id,
|
||||
a.vip_rate,
|
||||
a.old_sum_money,
|
||||
a.sum_money,
|
||||
a.pay_money,
|
||||
a.pay_time,
|
||||
a.pay_way,
|
||||
a.status,
|
||||
a.coupon_id,
|
||||
a.coupon_count,
|
||||
a.coupon_money,
|
||||
a.refund_time,
|
||||
a.refund_money,
|
||||
a.create_time
|
||||
from bl_user_package_order a inner join bl_user_package b on a.orders_id = b.orders_id and b.type=#{params.type}
|
||||
where a.user_id =#{params.userId}
|
||||
</select>
|
||||
|
||||
<update id="updateStatus">
|
||||
update bl_user_package_order
|
||||
set
|
||||
|
|
Loading…
Reference in New Issue