From 4f97bdbaadcdc19df9dfb0971b930d799c4aeddc Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期四, 13 三月 2025 14:52:26 +0800
Subject: [PATCH] 迭代版本：2.28
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java | 38 ++++++++++++++++++++++----------------
1 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java
index fe902b7..ee196ff 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java
@@ -75,7 +75,8 @@
public R<Page<UserCoupon>> minelist(@RequestParam Integer pageNum, @RequestParam Integer pageSize, @ApiParam("1未使用2已使用3已过期") Integer status) {
Long userid = tokenService.getLoginUserApplet().getUserid();
LambdaQueryChainWrapper<UserCoupon> chainWrapper = userCouponService.lambdaQuery()
- .eq(UserCoupon::getAppUserId, userid);
+ .eq(UserCoupon::getAppUserId, userid)
+ .isNotNull(UserCoupon::getCouponInfo);
if(null != status && 1 == status){
chainWrapper.isNull(UserCoupon::getUseTime).gt(UserCoupon::getEndTime, LocalDateTime.now());
}
@@ -88,18 +89,18 @@
Page<UserCoupon> page = chainWrapper.page(Page.of(pageNum-1, pageSize));
for (UserCoupon record : page.getRecords()) {
record.setIdStr(record.getId().toString());
- CouponInfo data = couponClient.detail(record.getCouponId()).getData();
- CouponInfoVo vo = new CouponInfoVo();
- BeanUtils.copyProperties(data,vo);
+ String couponInfo = record.getCouponInfo();
+ CouponInfoVo vo = JSON.parseObject(couponInfo, CouponInfoVo.class);
+// BeanUtils.copyProperties(data,vo);
//如果是商品券，将商品名称返回
- if (vo.getCouponType()==4){
+ if (vo != null && vo.getCouponType()==4){
List<String> goodNames = new ArrayList<>();
if (vo.getForGoodIds().equals("-1")){
List<Goods> data1 = goodsClient.getAllGoods().getData();
List<String> collect = data1.stream().map(Goods::getName).collect(Collectors.toList());
goodNames.addAll(collect);
- }else if(StringUtils.isEmpty(data.getForGoodIds())){
- goodNames.addAll(JSON.parseArray(data.getGoodsNameJson(), String.class));
+ }else if(StringUtils.isEmpty(vo.getForGoodIds())){
+ goodNames.addAll(JSON.parseArray(vo.getGoodsNameJson(), String.class));
}else {
String[] split = vo.getForGoodIds().split(",");
R<List<Goods>> goodsById = goodsClient.getGoodsById(split);
@@ -243,19 +244,24 @@
byId.setLavePoint(byId.getLavePoint() - point);
appUserService.updateById(byId);
- UserPoint userPoint = new UserPoint();
- userPoint.setType(15);
- userPoint.setHistoricalPoint(lavePoint);
- userPoint.setVariablePoint(point);
- userPoint.setBalance(byId.getLavePoint());
- userPoint.setAppUserId(userid);
- userPoint.setObjectId(Long.valueOf(data.getId()));
- userPoint.setCreateTime(LocalDateTime.now());
- userPointService.save(userPoint);
+ if(point > 0){
+ UserPoint userPoint = new UserPoint();
+ userPoint.setType(15);
+ userPoint.setHistoricalPoint(lavePoint);
+ userPoint.setVariablePoint(point);
+ userPoint.setBalance(byId.getLavePoint());
+ userPoint.setAppUserId(userid);
+ userPoint.setObjectId(Long.valueOf(data.getId()));
+ userPoint.setCreateTime(LocalDateTime.now());
+ userPointService.save(userPoint);
+ }
}
+
+
//增加优惠券记录,根据时间类型设置开始结束时间
UserCoupon userCoupon = new UserCoupon();
userCoupon.setAppUserId(userid);
+ userCoupon.setCouponInfo(JSON.toJSONString(data));
if (data.getPeriodType()==1) {
userCoupon.setStartTime(data.getPeriodStartTime().atTime(0, 0, 0));
userCoupon.setEndTime(data.getPeriodEndTime().atTime(23, 59, 59));
--
Gitblit v1.7.1