diff --git a/src/main/java/com/sqx/modules/bl/massage/controller/MassagePackageDetailController.java b/src/main/java/com/sqx/modules/bl/massage/controller/MassagePackageDetailController.java index f692229..3598e62 100644 --- a/src/main/java/com/sqx/modules/bl/massage/controller/MassagePackageDetailController.java +++ b/src/main/java/com/sqx/modules/bl/massage/controller/MassagePackageDetailController.java @@ -29,6 +29,13 @@ public class MassagePackageDetailController { return service.findPage(massagePackageDetail); } + @PostMapping("/updatePrice") + @ApiOperation("修改优惠价格") + public Result updatePrice(MassagePackageDetail massagePackageDetail){ + service.updatePrice(massagePackageDetail); + return Result.success(); + } + @PostMapping("/updateCount") @ApiOperation("修改次数") public Result updateCount(MassagePackageDetail massagePackageDetail){ @@ -36,7 +43,6 @@ public class MassagePackageDetailController { return Result.success(); } - @PostMapping("/updateIntervalDays") @ApiOperation("修改时间间隔") public Result updateIntervalDays(MassagePackageDetail massagePackageDetail){ diff --git a/src/main/java/com/sqx/modules/bl/massage/dao/MassagePackageDao.java b/src/main/java/com/sqx/modules/bl/massage/dao/MassagePackageDao.java index 0f87d2b..7f37fd9 100644 --- a/src/main/java/com/sqx/modules/bl/massage/dao/MassagePackageDao.java +++ b/src/main/java/com/sqx/modules/bl/massage/dao/MassagePackageDao.java @@ -14,5 +14,6 @@ public interface MassagePackageDao extends BaseMapper { int updateSales(MassagePackage massagePackage); int updateEsteemRate(MassagePackage massagePackage); int updateStatus(MassagePackage massagePackage); + int updatePrice(MassagePackage massagePackage); int delete(MassagePackage massagePackage); } \ No newline at end of file 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 f5bbf91..70aa4f5 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 @@ -4,6 +4,7 @@ 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.common.utils.Result; +import com.sqx.modules.bl.massage.entity.MassagePackage; import com.sqx.modules.bl.massage.entity.MassagePackageDetail; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -12,6 +13,7 @@ import org.apache.ibatis.annotations.Param; public interface MassagePackageDetailDao extends BaseMapper { IPage findPage(Page page, @Param("params") MassagePackageDetail massagePackageDetail); + int updatePrice(MassagePackageDetail massagePackageDetail); int updateCount(MassagePackageDetail massagePackageDetail); int updateIntervalDays(MassagePackageDetail massagePackageDetail); int updateStatus(MassagePackageDetail massagePackageDetail); @@ -19,4 +21,5 @@ public interface MassagePackageDetailDao extends BaseMapper findMassagePage(Page page, @Param("params") MassagePackageDetail massagePackageDetail); int delete(MassagePackageDetail massagePackageDetail); + MassagePackage findPackagePrice(MassagePackageDetail massagePackageDetail); } \ No newline at end of file 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 cbb4409..870ac9b 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 @@ -37,6 +37,11 @@ public class MassagePackageDetail implements Serializable { */ private Long massageTypeId; + /** + * 服务优惠价格 + */ + private BigDecimal packagePrice; + /** * 服务次数 */ 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 4ec458b..44af046 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 @@ -7,10 +7,11 @@ import com.sqx.modules.bl.massage.entity.MassagePackageDetail; public interface MassagePackageDetailService extends IService { Result findPage(MassagePackageDetail massagePackageDetail); - int updateCount(MassagePackageDetail massagePackageDetail); - int updateIntervalDays(MassagePackageDetail massagePackageDetail); - int updateStatus(MassagePackageDetail massagePackageDetail); - int insertDetail(MassagePackageDetail massagePackageDetail); + void updatePrice(MassagePackageDetail massagePackageDetail); + void updateCount(MassagePackageDetail massagePackageDetail); + void updateIntervalDays(MassagePackageDetail massagePackageDetail); + void updateStatus(MassagePackageDetail massagePackageDetail); + void insertDetail(MassagePackageDetail massagePackageDetail); Result findMassagePage(MassagePackageDetail massagePackageDetail); - int delete(MassagePackageDetail massagePackageDetail); + void delete(MassagePackageDetail massagePackageDetail); } \ No newline at end of file diff --git a/src/main/java/com/sqx/modules/bl/massage/service/MassagePackageService.java b/src/main/java/com/sqx/modules/bl/massage/service/MassagePackageService.java index 34a9f94..fc17b5d 100644 --- a/src/main/java/com/sqx/modules/bl/massage/service/MassagePackageService.java +++ b/src/main/java/com/sqx/modules/bl/massage/service/MassagePackageService.java @@ -10,5 +10,6 @@ public interface MassagePackageService extends IService { int updateSales(MassagePackage massagePackage); int updateEsteemRate(MassagePackage massagePackage); int updateStatus(MassagePackage massagePackage); + int updatePrice(MassagePackage massagePackage); int delete(MassagePackage massagePackage); } \ No newline at end of file diff --git a/src/main/java/com/sqx/modules/bl/massage/service/impl/MassagePackageServiceDetailImpl.java b/src/main/java/com/sqx/modules/bl/massage/service/impl/MassagePackageServiceDetailImpl.java index 58c27d7..2d1c1b4 100644 --- a/src/main/java/com/sqx/modules/bl/massage/service/impl/MassagePackageServiceDetailImpl.java +++ b/src/main/java/com/sqx/modules/bl/massage/service/impl/MassagePackageServiceDetailImpl.java @@ -5,13 +5,21 @@ 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.massage.dao.MassagePackageDetailDao; +import com.sqx.modules.bl.massage.entity.MassagePackage; import com.sqx.modules.bl.massage.entity.MassagePackageDetail; import com.sqx.modules.bl.massage.service.MassagePackageDetailService; +import com.sqx.modules.bl.massage.service.MassagePackageService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.math.BigDecimal; + @Service public class MassagePackageServiceDetailImpl extends ServiceImpl implements MassagePackageDetailService { + @Autowired + private MassagePackageService packageService; + @Override public Result findPage(MassagePackageDetail massagePackageDetail){ Page pages=new Page<>(massagePackageDetail.getPage(),massagePackageDetail.getLimit()); @@ -19,24 +27,37 @@ public class MassagePackageServiceDetailImpl extends ServiceImpl + + update bl_massage_package set price=#{price} where id=#{id} + + delete from bl_massage_package where id=#{id} diff --git a/src/main/resources/mapper/bl/massage/MassagePackageDetailDao.xml b/src/main/resources/mapper/bl/massage/MassagePackageDetailDao.xml index b1e449b..5e67501 100644 --- a/src/main/resources/mapper/bl/massage/MassagePackageDetailDao.xml +++ b/src/main/resources/mapper/bl/massage/MassagePackageDetailDao.xml @@ -8,6 +8,7 @@ a.id, a.main_id, a.massage_type_id, + a.package_price, a.service_count, a.interval_days, b.massage_img, @@ -18,9 +19,14 @@ b.status, b.classify_id as type from bl_massage_package_detail a inner join massage_type b on a.massage_type_id = b.massage_type_id + where a.main_id = #{params.mainId} order by a.id desc + + update bl_massage_package_detail set package_price=#{packagePrice} where id=#{id} + + update bl_massage_package_detail set service_count=#{serviceCount} where id=#{id} @@ -138,8 +144,8 @@ - insert into bl_massage_package_detail(main_id,massage_type_id,service_count,interval_days) - values (#{mainId},#{massageTypeId},#{serviceCount},#{intervalDays}) + insert into bl_massage_package_detail(main_id,massage_type_id,package_price,service_count,interval_days) + values (#{mainId},#{massageTypeId},#{packagePrice},#{serviceCount},#{intervalDays}) + select + a.main_id as id, + ifnull(sum(package_price*service_count),0) as price + from bl_massage_package_detail a inner join massage_type b on a.massage_type_id = b.massage_type_id + where a.main_id = #{mainId} + and b.status = 1 + group by a.main_id + + \ No newline at end of file