From e52f7e0ddb2ccdd8000d3e874ebfc841f901a7d8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 30 十二月 2024 14:05:59 +0800
Subject: [PATCH] 小程序
---
manage/src/main/resources/mapping/TAppUserMapper.xml | 9 +++++++--
manage/src/main/java/com/jilongda/manage/query/TAppUserQuery.java | 5 ++++-
manage/src/main/java/com/jilongda/manage/controller/TCouponController.java | 11 ++++++++++-
manage/src/main/java/com/jilongda/manage/service/impl/TOrderAftersalesServiceImpl.java | 13 +++++++++++++
manage/src/main/java/com/jilongda/manage/vo/TCouponInfoVO.java | 9 +++++++--
manage/src/main/resources/mapping/TOrderAftersalesMapper.xml | 2 +-
6 files changed, 42 insertions(+), 7 deletions(-)
diff --git a/manage/src/main/java/com/jilongda/manage/controller/TCouponController.java b/manage/src/main/java/com/jilongda/manage/controller/TCouponController.java
index 28ac072..cd25446 100644
--- a/manage/src/main/java/com/jilongda/manage/controller/TCouponController.java
+++ b/manage/src/main/java/com/jilongda/manage/controller/TCouponController.java
@@ -154,9 +154,18 @@
.eq(TCouponReceive::getCouponId, id)
.eq(TCouponReceive::getStatus, 2)).size();
tCouponInfoVO.setUseCount(size1);
-
+ if (byId.getType()==3){
+ // 查询领取人
+ List<Integer> collect = couponReceiveService.lambdaQuery()
+ .eq(TCouponReceive::getCouponId, id).list()
+ .stream().map(TCouponReceive::getUserId)
+ .distinct()
+ .collect(Collectors.toList());
+ tCouponInfoVO.setUserIds(collect);
+ }
return ApiResult.success(tCouponInfoVO);
}
+
public static MultipartFile convert(BufferedImage bufferedImage, String fileName) throws IOException {
// 将 BufferedImage 转换为字节数组
ByteArrayOutputStream baos = new ByteArrayOutputStream();
diff --git a/manage/src/main/java/com/jilongda/manage/query/TAppUserQuery.java b/manage/src/main/java/com/jilongda/manage/query/TAppUserQuery.java
index 8c05187..c072ee7 100644
--- a/manage/src/main/java/com/jilongda/manage/query/TAppUserQuery.java
+++ b/manage/src/main/java/com/jilongda/manage/query/TAppUserQuery.java
@@ -5,6 +5,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.List;
+
@Data
@ApiModel(value = "用户管理查询条件")
public class TAppUserQuery extends BasePage {
@@ -22,6 +24,7 @@
@ApiModelProperty(value = "注册结束时间 例:2022-11-11")
private String endTime;
-
+ @ApiModelProperty(value = "用户ids")
+ private List<Integer> userIds;
}
diff --git a/manage/src/main/java/com/jilongda/manage/service/impl/TOrderAftersalesServiceImpl.java b/manage/src/main/java/com/jilongda/manage/service/impl/TOrderAftersalesServiceImpl.java
index 280fd6d..5a8b7ed 100644
--- a/manage/src/main/java/com/jilongda/manage/service/impl/TOrderAftersalesServiceImpl.java
+++ b/manage/src/main/java/com/jilongda/manage/service/impl/TOrderAftersalesServiceImpl.java
@@ -3,7 +3,9 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.jilongda.common.basic.PageInfo;
import com.jilongda.manage.mapper.TAppUserMapper;
+import com.jilongda.manage.mapper.TOrderMapper;
import com.jilongda.manage.model.TAppUser;
+import com.jilongda.manage.model.TOrder;
import com.jilongda.manage.model.TOrderAftersales;
import com.jilongda.manage.mapper.TOrderAftersalesMapper;
import com.jilongda.manage.query.TOrderAftersalesQuery;
@@ -32,6 +34,8 @@
@Autowired
private TAppUserMapper appUserMapper;
+ @Autowired
+ private TOrderMapper orderMapper;
@Override
public PageInfo<TOrderAftersalesVO> pageList(TOrderAftersalesQuery query) {
if (StringUtils.hasLength(query.getName())){
@@ -43,6 +47,15 @@
}
PageInfo<TOrderAftersalesVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
List<TOrderAftersalesVO> list = this.baseMapper.pageList(query,pageInfo);
+ for (TOrderAftersalesVO tOrderAftersalesVO : list) {
+ TOrder tOrder = orderMapper.selectById(tOrderAftersalesVO.getOrderId());
+ if (tOrder.getUserId()!=null){
+ TAppUser tAppUser = appUserMapper.selectById(tOrder.getUserId());
+ tOrderAftersalesVO.setName(tAppUser.getName());
+ tOrderAftersalesVO.setRealName(tAppUser.getRealName());
+ tOrderAftersalesVO.setPhone(tAppUser.getPhone());
+ }
+ }
pageInfo.setRecords(list);
return pageInfo;
}
diff --git a/manage/src/main/java/com/jilongda/manage/vo/TCouponInfoVO.java b/manage/src/main/java/com/jilongda/manage/vo/TCouponInfoVO.java
index 9d37dea..6ea7659 100644
--- a/manage/src/main/java/com/jilongda/manage/vo/TCouponInfoVO.java
+++ b/manage/src/main/java/com/jilongda/manage/vo/TCouponInfoVO.java
@@ -1,9 +1,12 @@
package com.jilongda.manage.vo;
+import com.jilongda.manage.model.TAppUser;
import com.jilongda.manage.model.TCoupon;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+
+import java.util.List;
@Data
@ApiModel(value = "优惠券详情VO")
@@ -15,7 +18,9 @@
private Integer grantCout;
@ApiModelProperty(value = "使用数量")
private Integer useCount;
-
-
+ @ApiModelProperty(value = "指定发放-用户ids")
+ private List<Integer> userIds;
+ @ApiModelProperty(value = "指定发放-用户列表")
+ private List<TAppUser> userList;
}
diff --git a/manage/src/main/resources/mapping/TAppUserMapper.xml b/manage/src/main/resources/mapping/TAppUserMapper.xml
index 41c640e..c04672f 100644
--- a/manage/src/main/resources/mapping/TAppUserMapper.xml
+++ b/manage/src/main/resources/mapping/TAppUserMapper.xml
@@ -34,11 +34,16 @@
<if test="query.realName != null and query.realName != ''">
and realName like concat('%',#{query.realName},'%')
</if>
- <if test="query.startTime != null and query.startTime != ''">
+ <if test="query.startTime != null and query.startTime != ''">
and (createTime between #{query.startTime} and #{query.endTime})
</if>
+ <if test="query.userIds != null and query.userIds.size()>0">
+ AND id IN
+ <foreach collection="query.userIds" close=")" open="(" item="id" separator=",">
+ #{id}
+ </foreach>
+ </if>
and isDelete = ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()}
-
</select>
</mapper>
diff --git a/manage/src/main/resources/mapping/TOrderAftersalesMapper.xml b/manage/src/main/resources/mapping/TOrderAftersalesMapper.xml
index a6f7e18..fb3332b 100644
--- a/manage/src/main/resources/mapping/TOrderAftersalesMapper.xml
+++ b/manage/src/main/resources/mapping/TOrderAftersalesMapper.xml
@@ -41,7 +41,7 @@
</foreach>
</if>
<if test="query.storeId != null">
- and o.storeId = #{query.phone}
+ and o.storeId = #{query.storeId}
</if>
<if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
and toa.createTime between #{query.startTime} and #{query.endTime}
--
Gitblit v1.7.1