From 5a8ca3190f436f4ac4a4bfb7d19da62bc25379d4 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 19 八月 2025 09:39:14 +0800
Subject: [PATCH] 会员支付相关
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java | 112 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 102 insertions(+), 10 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 39b6df5..fc7cf21 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
@@ -7,10 +7,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dsh.activity.entity.Coupon;
-import com.dsh.activity.entity.CouponCity;
-import com.dsh.activity.entity.CouponStore;
-import com.dsh.activity.entity.UserCoupon;
+import com.dsh.activity.entity.*;
import com.dsh.activity.feignclient.account.AppUserClient;
import com.dsh.activity.feignclient.account.CityClient;
import com.dsh.activity.feignclient.account.StoreStaffClient;
@@ -29,14 +26,13 @@
import com.dsh.activity.feignclient.other.model.TOperatorCity;
import com.dsh.activity.model.CouponListVo;
import com.dsh.activity.model.CouponRecordQuery;
+import com.dsh.activity.model.VipDetailVO;
import com.dsh.activity.model.request.CommodityRequest;
import com.dsh.activity.model.request.CouponDataVo;
import com.dsh.activity.model.request.CouponPackageReq;
+import com.dsh.activity.model.request.VipDetailDto;
import com.dsh.activity.model.response.CouponPackageResp;
-import com.dsh.activity.service.CouponCityService;
-import com.dsh.activity.service.CouponStoreService;
-import com.dsh.activity.service.ICouponService;
-import com.dsh.activity.service.UserCouponService;
+import com.dsh.activity.service.*;
import com.dsh.activity.util.GDMapGeocodingUtil;
import com.dsh.activity.util.ResultUtil;
import com.dsh.activity.util.TokenUtil;
@@ -47,7 +43,9 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.models.auth.In;
import org.checkerframework.checker.units.qual.A;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -67,6 +65,8 @@
@Autowired
private ICouponService couponService;
+ @Autowired
+ private VipDetailService vipDetailService;
@Autowired
private TokenUtil tokenUtil;
@@ -106,7 +106,41 @@
+ @PostMapping("/base/coupon/vipDetail")
+ @ResponseBody
+ List<VipDetailVO> vipDetail(VipDetailDto vipDetailDto){
+ List<VipDetailVO> vipDetailVOS = new ArrayList<>();
+ List<VipDetail> list = vipDetailService.lambdaQuery()
+ .in(!vipDetailDto.getVipIds().isEmpty(), VipDetail::getVipId, vipDetailDto.getVipIds())
+ .in(!vipDetailDto.getUserIds().isEmpty(), VipDetail::getAppUserId, vipDetailDto.getUserIds())
+ .in(!vipDetailDto.getStoreIds().isEmpty(), VipDetail::getUseStoreId, vipDetailDto.getStoreIds())
+ .ge(StringUtils.hasLength(vipDetailDto.getStartTime()), VipDetail::getInsertTime, vipDetailDto.getStartTime())
+ .le(StringUtils.hasLength(vipDetailDto.getEndTime()), VipDetail::getInsertTime, vipDetailDto.getEndTime())
+ .ge(StringUtils.hasLength(vipDetailDto.getUseStartTime()), VipDetail::getUseTime, vipDetailDto.getUseStartTime())
+ .le(StringUtils.hasLength(vipDetailDto.getUseEndTime()), VipDetail::getUseTime, vipDetailDto.getUseEndTime())
+ .eq(vipDetailDto.getOperatorId() != null, VipDetail::getOperatorId, vipDetailDto.getOperatorId())
+ .eq(vipDetailDto.getType() != null, VipDetail::getType, vipDetailDto.getType())
+ .eq(vipDetailDto.getStatus() != null, VipDetail::getStatus, vipDetailDto.getStatus()).list();
+ // 使用 Stream + 手动拷贝提升性能和可读性（或使用 MapStruct）
+ vipDetailVOS = list.stream().map(vipDetail -> {
+ VipDetailVO vo = new VipDetailVO();
+ BeanUtils.copyProperties(vo, vipDetail); // 注意参数顺序是否正确
+ return vo;
+ }).collect(Collectors.toList());
+ List<Coupon> coupons = couponService.list();
+ for (VipDetailVO vipDetailVO : vipDetailVOS) {
+ if (vipDetailVO.getType()==1){
+ Coupon coupon = coupons.stream().filter(coupon1 -> coupon1.getId().equals(vipDetailVO.getCouponId())).findFirst().orElse(null);
+ if (coupon!=null){
+ vipDetailVO.setTicketName(coupon.getName());
+ vipDetailVO.setGoodsName(coupon.getName());
+ }
+ }
+
+ }
+ return vipDetailVOS;
+ }
/**
* 查询注册赠送优惠券 判断当前优惠券限领数量
@@ -184,6 +218,31 @@
try {
Coupon coupon = couponService.getById(id);
return coupon;
+ } catch (Exception e) {
+ e.printStackTrace();
+ return null;
+ }
+ }
+
+ @ResponseBody
+ @PostMapping("/coupon/queryCouponAll")
+ public List<Coupon> queryCouponAll() {
+ try {
+
+ return couponService.lambdaQuery().eq(Coupon::getState,1)
+ .eq(Coupon::getAuditStatus,2).list();
+ } catch (Exception e) {
+ e.printStackTrace();
+ return null;
+ }
+ }
+ @ResponseBody
+ @PostMapping("/coupon/queryCouponList")
+ public List<Coupon> queryCouponList() {
+ try {
+
+ return couponService.lambdaQuery().ne(Coupon::getState,3)
+ .eq(Coupon::getAuditStatus,2).list();
} catch (Exception e) {
e.printStackTrace();
return null;
@@ -420,6 +479,26 @@
}
return mapList;
}
+ @ResponseBody
+ @PostMapping("/base/coupon/getCouponListAllOfSearch")
+ public List<Map<String, Object>> getCouponListAllOfSearch(@RequestBody CouponListOfSearch ofSearch) {
+ List<Map<String, Object>> mapList1 = couponService.queryCouponListOfSearch(ofSearch);
+
+ List<Map<String, Object>> mapList = new ArrayList<>();
+ if (ofSearch.getStoreIds() == null) {
+ ArrayList<Integer> list = new ArrayList<>();
+ ofSearch.setStoreIds(list);
+ }
+ mapList = mapList1;
+ if (mapList.size() > 0) {
+ for (Map<String, Object> stringObjectMap : mapList) {
+ Object startTime = stringObjectMap.get("startTime");
+ Object endTime = stringObjectMap.get("endTime");
+ stringObjectMap.put("timeValue", startTime + "至" + endTime);
+ }
+ }
+ return mapList;
+ }
@ResponseBody
@@ -622,6 +701,9 @@
stringObjectHashMap.put("experienceName", dataVo.getExperience());
coupon.setContent(gson.toJson(stringObjectHashMap));
break;
+ case 4:
+ coupon.setGoodsId(dataVo.getGoodsId());
+ break;
default:
break;
}
@@ -796,19 +878,29 @@
List<CouponCity> list = cityService.list(new LambdaQueryWrapper<CouponCity>().eq(CouponCity::getCouponId, id));
return list;
}
+ @ResponseBody
+ @PostMapping("/base/coupon/queryAllCity")
+ public List<CouponCity> queryAllCity() {
+ List<CouponCity> list = cityService.list(new LambdaQueryWrapper<CouponCity>());
+ return list;
+ }
@ResponseBody
@PostMapping("/base/coupon/queryStore")
public List<Integer> queryStore(@RequestBody Integer id) {
return couStoreService.list(new LambdaQueryWrapper<CouponStore>().eq(CouponStore::getCouponId, id)).stream().map(CouponStore::getStoreId).collect(Collectors.toList());
}
+ @ResponseBody
+ @PostMapping("/base/coupon/queryAllStore")
+ public List<CouponStore> queryAllStore() {
+ return couStoreService.list(new LambdaQueryWrapper<CouponStore>());
+ }
@PostMapping("/base/coupon/listRecord")
@ResponseBody
public List<Map<String, Object>> listRecord(@RequestBody CouponRecordQuery ofSearch) {
- Page<Object> objectPage = new Page<>(ofSearch.getOffset(), ofSearch.getLimit());
- return couponService.listRecord(objectPage, ofSearch.getId(), ofSearch.getIds(), ofSearch.getType());
+ return couponService.listRecord(ofSearch.getId(), ofSearch.getIds(), ofSearch.getType());
}
--
Gitblit v1.7.1