From c436afe89419da51a5ce593ecd69d3a2f65c5faa Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 27 九月 2024 10:35:24 +0800
Subject: [PATCH] 对接邮箱 受理开票后发送
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java | 64 +++++++++++++++++++++++++++++++
1 files changed, 63 insertions(+), 1 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 b60c3de..797da3c 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
@@ -2,12 +2,16 @@
import com.alibaba.fastjson2.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
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.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.other.api.domain.TCoupon;
import com.ruoyi.other.api.domain.TIntegralRule;
import com.ruoyi.other.api.domain.TUserTag;
@@ -47,20 +51,25 @@
private TVipService vipService;
@Resource
private TCouponService couponService;
+ @Resource
+ private TokenService tokenService;
@PostMapping("/saveVip")
@ApiOperation(tags = {"管理后台-会员管理"},value = "会员添加")
+ @Log(title = "【会员管理】添加会员", businessType = BusinessType.INSERT)
public AjaxResult saveVip(@RequestBody TVip dto) {
vipService.save(dto);
return AjaxResult.success();
}
@GetMapping("/delete")
@ApiOperation(tags = {"管理后台-会员管理"},value = "会员删除")
+ @Log(title = "【会员管理】删除会员", businessType = BusinessType.DELETE)
public AjaxResult delete(String ids) {
vipService.removeBatchByIds(Arrays.asList(ids.split(",")));
return AjaxResult.success();
}
@PostMapping("/updateVip")
@ApiOperation(tags = {"管理后台-会员管理"},value = "会员修改")
+ @Log(title = "【会员管理】修改会员", businessType = BusinessType.UPDATE)
public AjaxResult updateVip(@RequestBody TVip dto) {
vipService.updateById(dto);
return AjaxResult.success();
@@ -128,6 +137,7 @@
return R.ok(vipService.getOne(Wrappers.lambdaQuery(TVip.class)
.eq(TVip::getReveal,1)
.orderByDesc(TVip::getMaximumDeduction)
+ .orderByDesc(TVip::getCreateTime)
.last("LIMIT 1")));
case 2:
return R.ok(vipService.getOne(Wrappers.lambdaQuery(TVip.class)
@@ -138,6 +148,7 @@
return R.ok(vipService.getOne(Wrappers.lambdaQuery(TVip.class)
.eq(TVip::getReveal,1)
.orderByDesc(TVip::getMonthlyCardDiscount)
+ .orderByDesc(TVip::getCreateTime)
.last("LIMIT 1")));
}
}
@@ -172,6 +183,7 @@
vipInfoDto.setDoubleIntegration(vip.getDoubleIntegration());
vipInfoDto.setMallExclusivePrice(vip.getMallExclusivePrice());
vipInfoDto.setName(vip.getName());
+ vipInfoDto.setId(vip.getId());
List<SendCouponDto> javaList = JSON.parseArray(vip.getCoupon()).toJavaList(SendCouponDto.class);
List<VipCouponDto> vipCouponDtos = new ArrayList<>();
if (!javaList.isEmpty()){
@@ -191,7 +203,11 @@
total = total.add(vip.getMaximumDeduction().multiply(BigDecimal.valueOf(vip.getDiscountTimes())));
for (VipCouponDto vipCouponDto : vipCouponDtos) {
TCoupon tCoupon = vipCouponDto.getTCoupon();
- total.add(tCoupon.getMaximumDiscountAmount());
+ 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())));
@@ -200,5 +216,51 @@
return R.ok(vipInfoDtos);
}
+
+ @ApiOperation(value = "购买会员", tags = {"小程序-个人中心"})
+ @GetMapping("/vipInfo/pay")
+ public R vipInfoPay(@RequestParam("vipId")Integer vipId,@RequestParam("buyType") Integer buyType,
+ @RequestParam("payType") Integer payType
+ ) {
+
+ TVip byId = vipService.getById(vipId);
+ BigDecimal payMoney = BigDecimal.ZERO;
+ BigDecimal discountMoney = BigDecimal.ZERO;
+ BigDecimal discount = BigDecimal.ZERO;
+ LocalDateTime now = LocalDateTime.now();
+ switch (buyType){
+ case 1:
+ if (byId.getMonthlyCardDiscountStart()!=null&&(now.isAfter(byId.getMonthlyCardDiscountStart())&&now.isBefore(byId.getMonthlyCardDiscountEnd()))){
+ payMoney = byId.getMonthlyCard().multiply(byId.getMonthlyCardDiscount());
+ discountMoney = byId.getMonthlyCard().subtract(payMoney);
+ discount = byId.getMonthlyCardDiscount();
+ }else {
+ payMoney = byId.getMonthlyCard();
+ }
+ break;
+ case 2:
+ if (byId.getSeasonCardDiscountStart()!=null&&(now.isAfter(byId.getSeasonCardDiscountStart())&&now.isBefore(byId.getSeasonCardDiscountEnd()))){
+ payMoney = byId.getSeasonCard().multiply(byId.getSeasonCardDiscount());
+ discountMoney = byId.getSeasonCard().subtract(payMoney);
+ discount = byId.getSeasonCardDiscount();
+ }else {
+ payMoney = byId.getSeasonCard();
+ }
+ break;
+ case 3:
+ if (byId.getAnnualCardDiscountStart()!=null&&(now.isAfter(byId.getAnnualCardDiscountStart())&&now.isBefore(byId.getAnnualCardDiscountEnd()))){
+ payMoney = byId.getAnnualCard().multiply(byId.getAnnualCardDiscount());
+ discountMoney = byId.getAnnualCard().subtract(payMoney);
+ discount = byId.getAnnualCardDiscount();
+ }else {
+ payMoney = byId.getAnnualCard();
+ }
+ break;
+ }
+
+ Long userId = tokenService.getLoginUserApplet().getUserId();
+
+ return R.ok(vipService.vipInfoPay(byId,payMoney,payType,discountMoney,discount,buyType,userId));
+ }
}
--
Gitblit v1.7.1