|
@@ -27,8 +27,8 @@ public class GuidePackageService extends ServiceImpl<GuidePackageMapper, GuidePa
|
|
|
public boolean addGuidePackage(Long guideId, Long packageId, BigDecimal price, BigDecimal commissionRate) {
|
|
public boolean addGuidePackage(Long guideId, Long packageId, BigDecimal price, BigDecimal commissionRate) {
|
|
|
// 检查是否已经存在
|
|
// 检查是否已经存在
|
|
|
LambdaQueryWrapper<GuidePackage> wrapper = new LambdaQueryWrapper<>();
|
|
LambdaQueryWrapper<GuidePackage> wrapper = new LambdaQueryWrapper<>();
|
|
|
- wrapper.eq(GuidePackage::getGuideId, guideId)
|
|
|
|
|
- .eq(GuidePackage::getPackageId, packageId);
|
|
|
|
|
|
|
+ wrapper.eq(GuidePackage::getId, guideId)
|
|
|
|
|
+ .eq(GuidePackage::getId, packageId);
|
|
|
|
|
|
|
|
if (this.count(wrapper) > 0) {
|
|
if (this.count(wrapper) > 0) {
|
|
|
return false; // 已经存在
|
|
return false; // 已经存在
|
|
@@ -41,11 +41,8 @@ public class GuidePackageService extends ServiceImpl<GuidePackageMapper, GuidePa
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
GuidePackage guidePackage = new GuidePackage();
|
|
GuidePackage guidePackage = new GuidePackage();
|
|
|
- guidePackage.setGuideId(guideId);
|
|
|
|
|
- guidePackage.setPackageId(packageId);
|
|
|
|
|
- guidePackage.setPackageName(taskPackage.getName());
|
|
|
|
|
|
|
+ guidePackage.setName(taskPackage.getName());
|
|
|
guidePackage.setPrice(price);
|
|
guidePackage.setPrice(price);
|
|
|
- guidePackage.setCommissionRate(commissionRate != null ? commissionRate : new BigDecimal("0.1"));
|
|
|
|
|
guidePackage.setStatus("active");
|
|
guidePackage.setStatus("active");
|
|
|
|
|
|
|
|
return this.save(guidePackage);
|
|
return this.save(guidePackage);
|
|
@@ -56,7 +53,7 @@ public class GuidePackageService extends ServiceImpl<GuidePackageMapper, GuidePa
|
|
|
*/
|
|
*/
|
|
|
public List<GuidePackage> getGuidePackages(Long guideId) {
|
|
public List<GuidePackage> getGuidePackages(Long guideId) {
|
|
|
LambdaQueryWrapper<GuidePackage> wrapper = new LambdaQueryWrapper<>();
|
|
LambdaQueryWrapper<GuidePackage> wrapper = new LambdaQueryWrapper<>();
|
|
|
- wrapper.eq(GuidePackage::getGuideId, guideId)
|
|
|
|
|
|
|
+ wrapper.eq(GuidePackage::getId, guideId)
|
|
|
.eq(GuidePackage::getStatus, "active")
|
|
.eq(GuidePackage::getStatus, "active")
|
|
|
.orderByDesc(GuidePackage::getCreatedAt);
|
|
.orderByDesc(GuidePackage::getCreatedAt);
|
|
|
|
|
|
|
@@ -67,23 +64,14 @@ public class GuidePackageService extends ServiceImpl<GuidePackageMapper, GuidePa
|
|
|
* 获取指导师对特定套餐的定价
|
|
* 获取指导师对特定套餐的定价
|
|
|
*/
|
|
*/
|
|
|
public GuidePackage getGuidePackage(Long guideId, Long packageId) {
|
|
public GuidePackage getGuidePackage(Long guideId, Long packageId) {
|
|
|
- LambdaQueryWrapper<GuidePackage> wrapper = new LambdaQueryWrapper<>();
|
|
|
|
|
- wrapper.eq(GuidePackage::getGuideId, guideId)
|
|
|
|
|
- .eq(GuidePackage::getPackageId, packageId)
|
|
|
|
|
- .eq(GuidePackage::getStatus, "active");
|
|
|
|
|
-
|
|
|
|
|
- return this.getOne(wrapper);
|
|
|
|
|
|
|
+ return this.getById(packageId);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* 更新指导师套餐价格
|
|
* 更新指导师套餐价格
|
|
|
*/
|
|
*/
|
|
|
public boolean updateGuidePackagePrice(Long guideId, Long packageId, BigDecimal price) {
|
|
public boolean updateGuidePackagePrice(Long guideId, Long packageId, BigDecimal price) {
|
|
|
- LambdaQueryWrapper<GuidePackage> wrapper = new LambdaQueryWrapper<>();
|
|
|
|
|
- wrapper.eq(GuidePackage::getGuideId, guideId)
|
|
|
|
|
- .eq(GuidePackage::getPackageId, packageId);
|
|
|
|
|
-
|
|
|
|
|
- GuidePackage guidePackage = this.getOne(wrapper);
|
|
|
|
|
|
|
+ GuidePackage guidePackage = this.getById(packageId);
|
|
|
if (guidePackage == null) {
|
|
if (guidePackage == null) {
|
|
|
return false;
|
|
return false;
|
|
|
}
|
|
}
|
|
@@ -96,11 +84,7 @@ public class GuidePackageService extends ServiceImpl<GuidePackageMapper, GuidePa
|
|
|
* 删除指导师套餐
|
|
* 删除指导师套餐
|
|
|
*/
|
|
*/
|
|
|
public boolean deleteGuidePackage(Long guideId, Long packageId) {
|
|
public boolean deleteGuidePackage(Long guideId, Long packageId) {
|
|
|
- LambdaQueryWrapper<GuidePackage> wrapper = new LambdaQueryWrapper<>();
|
|
|
|
|
- wrapper.eq(GuidePackage::getGuideId, guideId)
|
|
|
|
|
- .eq(GuidePackage::getPackageId, packageId);
|
|
|
|
|
-
|
|
|
|
|
- GuidePackage guidePackage = this.getOne(wrapper);
|
|
|
|
|
|
|
+ GuidePackage guidePackage = this.getById(packageId);
|
|
|
if (guidePackage == null) {
|
|
if (guidePackage == null) {
|
|
|
return false;
|
|
return false;
|
|
|
}
|
|
}
|
|
@@ -110,14 +94,30 @@ public class GuidePackageService extends ServiceImpl<GuidePackageMapper, GuidePa
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
- * 增加套餐销量
|
|
|
|
|
|
|
+ * 增加套餐销量 - 暂不实现
|
|
|
*/
|
|
*/
|
|
|
public boolean incrementSalesCount(Long packageId) {
|
|
public boolean incrementSalesCount(Long packageId) {
|
|
|
- GuidePackage pkg = this.getById(packageId);
|
|
|
|
|
- if (pkg == null) {
|
|
|
|
|
- return false;
|
|
|
|
|
- }
|
|
|
|
|
- pkg.setSalesCount(pkg.getSalesCount() == null ? 1 : pkg.getSalesCount() + 1);
|
|
|
|
|
- return this.updateById(pkg);
|
|
|
|
|
|
|
+ return true;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ /**
|
|
|
|
|
+ * 获取所有有效套餐
|
|
|
|
|
+ */
|
|
|
|
|
+ public List<GuidePackage> getActivePackages() {
|
|
|
|
|
+ LambdaQueryWrapper<GuidePackage> wrapper = new LambdaQueryWrapper<>();
|
|
|
|
|
+ wrapper.eq(GuidePackage::getStatus, "active")
|
|
|
|
|
+ .orderByDesc(GuidePackage::getSortOrder);
|
|
|
|
|
+ return this.list(wrapper);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ /**
|
|
|
|
|
+ * 根据等级获取套餐
|
|
|
|
|
+ */
|
|
|
|
|
+ public List<GuidePackage> getPackagesByLevel(String level) {
|
|
|
|
|
+ LambdaQueryWrapper<GuidePackage> wrapper = new LambdaQueryWrapper<>();
|
|
|
|
|
+ wrapper.eq(GuidePackage::getLevel, level)
|
|
|
|
|
+ .eq(GuidePackage::getStatus, "active")
|
|
|
|
|
+ .orderByDesc(GuidePackage::getSortOrder);
|
|
|
|
|
+ return this.list(wrapper);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|