From f4c9281d1b7f19fef0d8ee7cb03e166a218b33f2 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期四, 05 九月 2024 17:50:33 +0800
Subject: [PATCH] 完善功能
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java | 55 ++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 42 insertions(+), 13 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java
index ee13993..cefe4a4 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java
@@ -6,6 +6,7 @@
import com.ruoyi.account.api.dto.SendCouponDto;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.BasePage;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.other.api.domain.TCoupon;
import com.ruoyi.other.api.domain.TIntegralRule;
@@ -24,7 +25,9 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
+import java.time.LocalDateTime;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -52,8 +55,8 @@
}
@GetMapping("/delete")
@ApiOperation(tags = {"管理后台-会员管理"},value = "会员删除")
- public AjaxResult delete(Integer id) {
- vipService.removeById(id);
+ public AjaxResult delete(String ids) {
+ vipService.removeBatchByIds(Arrays.asList(ids.split(",")));
return AjaxResult.success();
}
@PostMapping("/updateVip")
@@ -84,14 +87,20 @@
public R<TVip> getInfo1(@RequestParam("id")Integer id) {
return R.ok(vipService.getById(id));
}
+
+
+
+
@ApiOperation(tags = {"管理后台-会员管理"},value = "会员列表分页查询")
@PostMapping(value = "/pageList")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "pageCurr", value = "分页参数，当前页码", required = true),
- @ApiImplicitParam(name = "pageSize", value = "分页参数，每页数量",required = true)
- })
- public AjaxResult<PageInfo<TVip>> pageList(Integer pageCurr,Integer pageSize) {
- return AjaxResult.ok(vipService.pageList(pageCurr,pageSize));
+ public AjaxResult<PageInfo<TVip>> pageList(@RequestBody BasePage basePage) {
+ return AjaxResult.ok(vipService.pageList(basePage.getPageCurr(), basePage.getPageSize()));
+ }
+
+ @ApiOperation(tags = {"会员下拉框"},value = "会员列表分页查询")
+ @GetMapping(value = "/select")
+ public AjaxResult<List<TVip>> select() {
+ return AjaxResult.ok(vipService.list());
}
//获取会员Map
@@ -122,7 +131,7 @@
.last("LIMIT 1")));
case 2:
return R.ok(vipService.getOne(Wrappers.lambdaQuery(TVip.class)
- .eq(TVip::getReveal,1)
+ .eq(TVip::getReveal,1).eq(TVip::getType,1)
.orderByAsc(TVip::getMonthlyCard)
.last("LIMIT 1")));
default:
@@ -135,19 +144,34 @@
@ApiOperation(value = "会员信息", tags = {"小程序-个人中心"})
- @PostMapping("/vipInfo")
- public AjaxResult vipInfo() {
+ @GetMapping("/vipInfo")
+ public R<List<VipInfoDto>> vipInfo() {
List<VipInfoDto> vipInfoDtos = new ArrayList<>();
List<TVip> vips = vipService.lambdaQuery().eq(TVip::getReveal, 1).list();
+ LocalDateTime now = LocalDateTime.now();
for (TVip vip : vips) {
VipInfoDto vipInfoDto = new VipInfoDto();
vipInfoDto.setMonthlyCard(vip.getMonthlyCardReveal()==1?vip.getMonthlyCard():null);
vipInfoDto.setSeasonCard(vip.getSeasonCardReveal()==1?vip.getSeasonCard():null);
vipInfoDto.setAnnualCard(vip.getAnnualCardReveal()==1?vip.getAnnualCard():null);
+ //判断是否在折扣时间内，然后设置折扣价格
+ if (vip.getMonthlyCardDiscountStart()!=null&&(now.isAfter(vip.getMonthlyCardDiscountStart())&&now.isBefore(vip.getMonthlyCardDiscountEnd()))){
+ vipInfoDto.setMonthlyCardDiscount(vip.getMonthlyCardDiscount());
+ }
+ if (vip.getSeasonCardDiscountStart()!=null&&(now.isAfter(vip.getSeasonCardDiscountStart())&&now.isBefore(vip.getSeasonCardDiscountEnd()))){
+ vipInfoDto.setSeasonCardDiscount(vip.getSeasonCardDiscount());
+ }
+ if (vip.getAnnualCardDiscountStart()!=null&&(now.isAfter(vip.getAnnualCardDiscountStart())&&now.isBefore(vip.getAnnualCardDiscountEnd()))){
+ vipInfoDto.setAnnualCardDiscount(vip.getAnnualCardDiscount());
+ }
+
+
+
vipInfoDto.setMaximumDeduction(vip.getMaximumDeduction());
vipInfoDto.setDiscountTimes(vip.getDiscountTimes());
vipInfoDto.setDoubleIntegration(vip.getDoubleIntegration());
vipInfoDto.setMallExclusivePrice(vip.getMallExclusivePrice());
+ vipInfoDto.setName(vip.getName());
List<SendCouponDto> javaList = JSON.parseArray(vip.getCoupon()).toJavaList(SendCouponDto.class);
List<VipCouponDto> vipCouponDtos = new ArrayList<>();
if (!javaList.isEmpty()){
@@ -167,12 +191,17 @@
total = total.add(vip.getMaximumDeduction().multiply(BigDecimal.valueOf(vip.getDiscountTimes())));
for (VipCouponDto vipCouponDto : vipCouponDtos) {
TCoupon tCoupon = vipCouponDto.getTCoupon();
- total.add(tCoupon.getDiscount());
+ if (tCoupon.getPreferentialMode()==2) {
+ total.add(tCoupon.getMaximumDiscountAmount());
+ }else {
+ total.add(tCoupon.getDiscountAmount());
+ }
}
vipInfoDto.setTotalDiscount(total);
+ vipInfoDto.setTimeAmount(vip.getMaximumDeduction().multiply(BigDecimal.valueOf(vip.getDiscountTimes())));
vipInfoDtos.add(vipInfoDto);
}
- return AjaxResult.success(vipInfoDtos);
+ return R.ok(vipInfoDtos);
}
}
--
Gitblit v1.7.1