From 61bbd595ee2bc3c67b40878894dcc07174c6eea6 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 24 九月 2024 10:15:30 +0800
Subject: [PATCH] 玩湃微信商户分账
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java
index c862916..d3c2feb 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java
@@ -97,10 +97,16 @@
@Resource
private CouponCityService cityService;
- @Autowired
+ @Resource
private AppUserClient appUserClient;
- @Autowired
+
+ @Resource
private StudentClient studentClient;
+
+
+
+
+
/**
* 查询注册赠送优惠券 判断当前优惠券限领数量
@@ -122,8 +128,7 @@
// 优惠券已领取数量
int couponId = ucService.count(new QueryWrapper<UserCoupon>().eq("couponId", coupon.getId()));
// 用户已领取该优惠券数量
- int count = ucService.count(new QueryWrapper<UserCoupon>().eq("couponId", coupon.getId()
- ).eq("userId", userId));
+ int count = ucService.count(new QueryWrapper<UserCoupon>().eq("couponId", coupon.getId()).eq("userId", userId));
if (couponId >= quantityIssued) {
continue;
}
@@ -228,7 +233,7 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<List<CouponPackageResp>> queryAppuserCouponList(CouponPackageReq req) {
+ public ResultUtil<List<CouponPackageResp>> queryCouponPackage(CouponPackageReq req) {
try {
Integer uid = tokenUtil.getUserIdFormRedis();
if (null == uid) {
@@ -607,12 +612,15 @@
coupon.setIllustrate(dataVo.getIllustrate());
coupon.setDistributionMethod(dataVo.getDistributionMethod());
coupon.setRedemptionMethod(dataVo.getExchangeMethod());
- if (dataVo.getExchangeMethod() != null) {
+ if (dataVo.getExchangeMethod() != null&&dataVo.getDistributionMethod()!=4) {
switch (dataVo.getExchangeMethod()) {
case 1:
coupon.setIntegral(BigDecimal.valueOf(dataVo.getRequiredPoints()));
break;
-
+ case 2:
+ coupon.setIntegral(BigDecimal.valueOf(dataVo.getRequiredPoints()));
+ coupon.setCash(dataVo.getRequiredCash());
+ break;
case 3:
coupon.setCash(dataVo.getRequiredCash());
break;
@@ -761,6 +769,7 @@
}
return true;
} catch (Exception e) {
+ e.printStackTrace();
return false;
}
}
--
Gitblit v1.7.1