From 49e96cc15baf35d710fe3a049fb97aff6a1af132 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 25 二月 2025 19:35:33 +0800
Subject: [PATCH] 修改分佣逻辑
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/CouponInfoController.java | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/CouponInfoController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/CouponInfoController.java
index 7bde80d..bafefaa 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/CouponInfoController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/CouponInfoController.java
@@ -62,6 +62,10 @@
public R<IPage<CouponInfo>> list(@RequestParam("pageNum") Integer pageNum,
@RequestParam("pageSize") Integer pageSize,
CouponInfo couponInfo) {
+ Integer periodType = couponInfo.getPeriodType();
+ if (periodType != null && periodType.equals(0)){
+ couponInfo.setPeriodType(null);
+ }
IPage<CouponInfo> couponInfoIPage = couponInfoService.queryCouponInfoPage(Page.of(pageNum, pageSize), couponInfo);
for (CouponInfo record : couponInfoIPage.getRecords()) {
R<Long> r = userCouponClient.getCouponCount(record.getId());
@@ -76,6 +80,9 @@
@ApiOperation(value = "优惠劵管理-详情", tags = {"管理后台-活动管理"})
public R<CouponInfo> detail(@RequestParam("id") Integer id) {
CouponInfo byId = couponInfoService.getById(id);
+ if (byId == null){
+ return R.fail("优惠劵不存在");
+ }
String forGoodIds = byId.getForGoodIds();
if (!"-1".equals(forGoodIds) && StringUtils.isNotEmpty(forGoodIds)){
List<Goods> goods = goodsService.listByIds(Arrays.asList(forGoodIds.split(",")));
@@ -170,18 +177,21 @@
private void count(Long userid, List<CouponInfo> list1, List<CouponInfo> returnList) {
for (CouponInfo couponInfo : list1) {
Long count = appUserClient.getCouponCount(-1L, couponInfo.getId()).getData();
- if(couponInfo.getSendNum() <= count){
- couponInfo.setMaxNum(count.intValue() - couponInfo.getSendNum());
- for (int i = 0; i < couponInfo.getMaxNum(); i++) {
- returnList.add(couponInfo);
- }
+ if(count >= couponInfo.getSendNum()){
continue;
}
count = appUserClient.getCouponCount(userid, couponInfo.getId()).getData();
couponInfo.setMaxNum(couponInfo.getMaxNum() - count.intValue());
- for (int i = 0; i < couponInfo.getMaxNum(); i++) {
- returnList.add(couponInfo);
+ if((couponInfo.getSendNum() - count) >= couponInfo.getMaxNum()){
+ for (int i = 0; i < couponInfo.getMaxNum(); i++) {
+ returnList.add(couponInfo);
+ }
+ }else{
+ for (int i = 0; i < (couponInfo.getSendNum() - count); i++) {
+ returnList.add(couponInfo);
+ }
}
+
}
}
--
Gitblit v1.7.1