From e4eaabefaaa2ca95f809c47a11712c3bee56e1b5 Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期四, 20 二月 2025 15:07:09 +0800
Subject: [PATCH] 修改物流信息导入模板
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java | 72 ++++++++++++++++++++++++++----------
1 files changed, 52 insertions(+), 20 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 123e8b0..2323b6d 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
@@ -22,6 +22,7 @@
import com.ruoyi.other.api.domain.PointSetting;
import com.ruoyi.other.api.feignClient.GoodsClient;
import com.ruoyi.other.api.feignClient.PointSettingClient;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -87,9 +88,9 @@
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){
List<String> goodNames = new ArrayList<>();
@@ -97,7 +98,9 @@
List<Goods> data1 = goodsClient.getAllGoods().getData();
List<String> collect = data1.stream().map(Goods::getName).collect(Collectors.toList());
goodNames.addAll(collect);
- }else{
+ }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);
if (goodsById.getData()!=null){
@@ -105,8 +108,8 @@
goodNames.add(datum.getName());
}
}
- vo.setGoodNames(goodNames);
}
+ vo.setGoodNames(goodNames);
}
record.setCouponInfoVo(vo);
@@ -131,23 +134,34 @@
@ApiOperation(value = "已领取列表", tags = {"管理后台-优惠劵"})
public R<Page<UserCoupon>> list1(@RequestParam Integer pageNum,
@RequestParam Integer pageSize,
+ String userName,
@ApiParam("1未使用2已使用3已过期") Integer status,
String phone,
Integer id) {
- Long appUserId = null;
- if (!StringUtils.isEmpty(phone)){
- AppUser appUser1 = appUserService.getOne(new LambdaQueryWrapper<AppUser>()
- .eq(AppUser::getPhone, phone));
- appUserId = appUser1.getId();
+ LambdaQueryWrapper<AppUser> queryWrapper = new LambdaQueryWrapper<>();
+ if (!StringUtils.isEmpty(phone)) {
+ queryWrapper.like(AppUser::getPhone, phone);
}
+ if (!StringUtils.isEmpty(userName)) {
+ queryWrapper.like(AppUser::getName, userName);
+ }
+
+ List<AppUser> appUserList = appUserService.list(queryWrapper);
+
+ if (CollectionUtils.isEmpty(appUserList)) {
+ return R.ok(Page.of(pageNum, pageSize));
+ }
+
+ List<Long> appUserIds = appUserList.stream().map(AppUser::getId).distinct().collect(Collectors.toList());
+
Page<UserCoupon> page = userCouponService.lambdaQuery()
.isNull(status!=null&&(status==1||status==3),UserCoupon::getUseTime)
.isNotNull(status!=null&&status==2,UserCoupon::getUseTime)
.eq(UserCoupon::getCouponId, id)
- .eq(appUserId != null,UserCoupon::getAppUserId, appUserId)
+ .in(!CollectionUtils.isEmpty(appUserIds),UserCoupon::getAppUserId, appUserIds)
.lt(status!=null&&status==3,UserCoupon::getEndTime, LocalDateTime.now()).page(Page.of(pageNum-1, pageSize));
for (UserCoupon record : page.getRecords()) {
record.setIdStr(record.getId().toString());
@@ -229,19 +243,24 @@
byId.setLavePoint(byId.getLavePoint() - point);
appUserService.updateById(byId);
- UserPoint userPoint = new UserPoint();
- userPoint.setType(11);
- 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));
@@ -373,5 +392,18 @@
userCouponService.updateById(userCoupon);
return R.ok();
}
+
+
+ /**
+ * 编辑用户优惠券使用时间
+ * @param userCoupon
+ * @return
+ */
+ @PostMapping("/editReturnUse")
+ public R editReturnUse(@RequestBody UserCoupon userCoupon){
+ userCouponService.update(new LambdaUpdateWrapper<UserCoupon>().eq(UserCoupon::getId, userCoupon.getId())
+ .set(UserCoupon::getUseTime, userCoupon.getUseTime()));
+ return R.ok();
+ }
}
--
Gitblit v1.7.1