From 631a5aa09e0147ca81fffcb1434e57b1cd1ba6f6 Mon Sep 17 00:00:00 2001
From: lisy <linlangsur163@163.com>
Date: 星期三, 09 八月 2023 09:34:53 +0800
Subject: [PATCH] app端口:积分变动记录增加变动类型字段，代码同步更新；积分兑换操作的数量校验功能完善
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 89 +++++++++++++++++++++++++++++++-------------
1 files changed, 62 insertions(+), 27 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
index cb9957e..0c446a5 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
@@ -11,6 +11,8 @@
import com.dsh.activity.feignclient.model.*;
import com.dsh.activity.feignclient.other.StoreClient;
import com.dsh.activity.feignclient.other.model.StoreDetailOfCourse;
+import com.dsh.activity.model.PointMerchandiseVo;
+import com.dsh.activity.model.request.AppUserGoodResp;
import com.dsh.activity.model.request.CommodityRequest;
import com.dsh.activity.service.*;
import com.dsh.activity.util.GDMapGeocodingUtil;
@@ -90,13 +92,15 @@
}
+ @ResponseBody
@PostMapping("/base/pointMerchars/getCommoditys")
- public List<PointsMerchandise> getVicinityGoods(@RequestBody CommodityRequest request){
+ public PointMerchandiseVo getVicinityGoods(@RequestBody CommodityRequest request){
+ PointMerchandiseVo pointMerchandiseVo = new PointMerchandiseVo();
List<PointsMerchandise> list = new ArrayList<>();
String provinceCode = "";
String cityCode = "";
if (ToolUtil.isEmpty(request.getLon()) && ToolUtil.isEmpty(request.getLat())){
- return list;
+ return pointMerchandiseVo;
}
try {
Map<String, String> geocode = gdMapGeocodingUtil.geocode(request.getLon(), request.getLat());
@@ -116,8 +120,9 @@
iterator.remove(); // 移除符合条件的商品
}
}
+ pointMerchandiseVo.setMerchandises(list);
}
- return list;
+ return pointMerchandiseVo;
}
@PostMapping("/base/pointMerchars/getRedeemedNums")
@@ -138,8 +143,9 @@
CoursePackage coursePackage = cpClient.queryCoursePackageById(merchandise.getCoursePackageId());
detailsVo.setGoodId(coursePackage.getId());
- List<String> list1 = Arrays.asList(StrUtils.splitStr2StrArr(coursePackage.getDetailDrawing(), ","));
+ List<String> list1 = new ArrayList<>();
list1.add(coursePackage.getCoverDrawing());
+ list1.addAll(Arrays.asList(StrUtils.splitStr2StrArr(coursePackage.getDetailDrawing(), ",")));
detailsVo.setPics(list1);
Collections.sort(detailsVo.getPics(), (s1, s2) -> {
if (s1.equals(coursePackage.getCoverDrawing())) {
@@ -155,7 +161,7 @@
int coursePackageNums = upmseService.count(new QueryWrapper<UserPointsMerchandise>()
.eq("pointsMerchandiseId",merchandise.getId() ));
detailsVo.setRedeemedNum(coursePackageNums);
- detailsVo.setResidueNum(merchandise.getQuantityIssued() - coursePackageNums);
+ detailsVo.setResidueNum(Math.max(merchandise.getQuantityIssued() - coursePackageNums, 0));
detailsVo.setPerLimit(merchandise.getPickUpQuantity());
if (merchandise.getRedemptionMethod() == 1){
detailsVo.setExchangeType(1);
@@ -199,8 +205,10 @@
case 3:
detailsVo.setGoodId(merchandise.getId());
- List<String> list2 = Arrays.asList(StrUtils.splitStr2StrArr(merchandise.getProductImages(), ","));
- list2.add(merchandise.getCover());
+ List<String> list2 = new ArrayList<>();
+ String cover = merchandise.getCover();
+ list2.add(cover);
+ list2.addAll(Arrays.asList(StrUtils.splitStr2StrArr(merchandise.getProductImages(), ",")));
detailsVo.setPics(list2);
Collections.sort(detailsVo.getPics(), (s1, s2) -> {
if (s1.equals(merchandise.getCover())) {
@@ -217,8 +225,9 @@
int count = upmseService.count(new QueryWrapper<UserPointsMerchandise>()
.eq("pointsMerchandiseId",merchandise.getId() ));
detailsVo.setRedeemedNum(count);
- detailsVo.setResidueNum(merchandise.getQuantityIssued()-count);
+ detailsVo.setResidueNum(Math.max(merchandise.getQuantityIssued() - count, 0));
detailsVo.setPerLimit(merchandise.getPickUpQuantity());
+ detailsVo.setExchangeType(merchandise.getRedemptionMethod());
if (merchandise.getRedemptionMethod() == 1){
detailsVo.setIntegral(merchandise.getIntegral());
}else {
@@ -227,10 +236,13 @@
}
detailsVo.setCost(merchandise.getPrice());
if (merchandise.getUseScope() == 1){
+ detailsVo.setExchangeAddrType(1);
detailsVo.setBelongs("全国通用");
}else if (merchandise.getUseScope() == 2){
+ detailsVo.setExchangeAddrType(2);
detailsVo.setBelongs(merchandise.getProvince()+"|"+merchandise.getCity() + "用户可用");
}else {
+ detailsVo.setExchangeAddrType(3);
List<PointsMerchandiseStore> list = pmdstoService.list(new QueryWrapper<PointsMerchandiseStore>()
.eq("pointsMerchandiseId",merchandise.getId() ));
PointsMerchandiseStore pointsMerchandiseStore = list.get(0);
@@ -248,8 +260,11 @@
// 优惠券
Coupon coupon = iCouponService.getById(detailRequest.getGoodId());
detailsVo.setGoodId(coupon.getId());
- List<String> list3 = Arrays.asList(StrUtils.splitStr2StrArr(coupon.getProductImages(), ","));
- list3.add(coupon.getCover());
+ List<String> list3 = new ArrayList<>();
+ list3.add(ToolUtil.isEmpty(coupon.getCover()) ? "" : coupon.getCover());
+ if (ToolUtil.isNotEmpty(coupon.getProductImages())){
+ list3.addAll(Arrays.asList(StrUtils.splitStr2StrArr(coupon.getProductImages(), ",")));
+ }
detailsVo.setPics(list3);
Collections.sort(detailsVo.getPics(), (s1, s2) -> {
if (s1.equals(coupon.getCover())) {
@@ -262,33 +277,37 @@
});
detailsVo.setGoodName(coupon.getName());
detailsVo.setBelongsScope(coupon.getUserPopulation());
- int couponNums = uconService.count(new QueryWrapper<UserCoupon>()
- .eq("couponId",coupon.getId() ));
+ int couponNums = upmseService.count(new QueryWrapper<UserPointsMerchandise>()
+ .eq("pointsMerchandiseId",merchandise.getId() ));
detailsVo.setRedeemedNum(couponNums);
- detailsVo.setResidueNum(coupon.getQuantityIssued()-couponNums);
+ detailsVo.setResidueNum(Math.max(coupon.getQuantityIssued() - couponNums, 0));
detailsVo.setPerLimit(coupon.getPickUpQuantity());
- if (merchandise.getRedemptionMethod() == 1){
- detailsVo.setIntegral(merchandise.getIntegral());
+ detailsVo.setExchangeType(coupon.getRedemptionMethod());
+ if (coupon.getRedemptionMethod() == 1){
+ detailsVo.setIntegral(coupon.getIntegral().intValue());
}else {
- detailsVo.setIntegral(merchandise.getIntegral());
- detailsVo.setCash(merchandise.getCash());
+ detailsVo.setIntegral(coupon.getIntegral().intValue());
+ detailsVo.setCash(coupon.getCash());
}
if (coupon.getUseScope() == 1){
+ detailsVo.setExchangeAddrType(1);
detailsVo.setBelongs("全国通用");
}else if (coupon.getUseScope() == 2){
+ detailsVo.setExchangeAddrType(2);
List<CouponCity> list = ccityService.list(new LambdaQueryWrapper<CouponCity>()
.eq(CouponCity::getCouponId, coupon.getId()));
if (list.size() > 0){
detailsVo.setBelongs(list.get(0).getProvince()+"|"+list.get(0).getCity() + "用户可用");
}
}else {
+ detailsVo.setExchangeAddrType(3);
List<CouponStore> list = cstoreService.list(new QueryWrapper<CouponStore>()
.eq("couponId",coupon.getId() ));
StoreDetailOfCourse courseOfStore = stoClient.getCourseOfStore(list.get(0).getStoreId());
detailsVo.setBelongs(courseOfStore.getStoreName()+"可用");
}
- detailsVo.setStartTime(format.format(merchandise.getStartTime()));
- detailsVo.setEndTime(format.format(merchandise.getEndTime()));
+ detailsVo.setStartTime(format.format(coupon.getStartTime()));
+ detailsVo.setEndTime(format.format(coupon.getEndTime()));
detailsVo.setContents(coupon.getIllustrate());
detailsVo.setGoodType(4);
@@ -300,9 +319,10 @@
}
-
+ @ResponseBody
@PostMapping("/base/pointMerchars/getDetailsOfExchange")
- public List<ExchangeDetailsResponse> getIntegralExchangeDetails(@RequestBody Integer appUserId){
+ public ExchangeDetailsVo getIntegralExchangeDetails(@RequestBody Integer appUserId){
+ ExchangeDetailsVo detailsVo = new ExchangeDetailsVo();
List<ExchangeDetailsResponse> responses = new ArrayList<>();
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
List<UserPointsMerchandise> pointsMerchandises = upmseService.list(new QueryWrapper<UserPointsMerchandise>()
@@ -323,16 +343,17 @@
}
detailsResponse.setStartTime(simpleDateFormat.format(merchandise.getStartTime()));
detailsResponse.setEndTime(simpleDateFormat.format(merchandise.getEndTime()));
- detailsResponse.setUseStatus(pointsMerchandise.getStatus());
+ detailsResponse.setUseStatus(pointsMerchandise.getStatus() == 1 ? 2 : 1);
detailsResponse.setGoodType(merchandise.getType());
responses.add(detailsResponse);
}
+ detailsVo.setDetailsResponses(responses);
}
- return responses;
+ return detailsVo;
}
-
+ @ResponseBody
@PostMapping("/base/pointMerchars/getSpecificsOfGoods")
public PointDetailsVo getSpecificsOfGoods(@RequestBody Integer speMercharsId){
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
@@ -421,9 +442,7 @@
detailsVo.setBelongs(pmdsServiceById.getProvince()+pmdsServiceById.getCity());
break;
case 3:
- PointsMerchandiseStore one = pmdstoService.getOne(new QueryWrapper<PointsMerchandiseStore>()
- .eq("pointsMerchandiseId",pmdsServiceById.getId() ));
- StoreDetailOfCourse courseOfStore = stoClient.getCourseOfStore(one.getStoreId());
+ StoreDetailOfCourse courseOfStore = stoClient.getCourseOfStore(byId.getStoreId());
detailsVo.setBelongs(courseOfStore.getStoreName()+" "+courseOfStore.getStoreAddr());
break;
default:
@@ -443,6 +462,7 @@
@PostMapping("/base/pointMerchars/saveDetailsUserPointMercase")
public void saveDetailsUserPointMercase(@RequestBody UserPointsMerchandise merchandise){
+ merchandise.setInsertTime(new Date());
upmseService.save(merchandise);
}
@@ -470,4 +490,19 @@
return storeIds;
}
+ /**
+ * 获取用户已兑换商品的数量
+ * @param goodResp
+ * @return 数量
+ */
+ @ResponseBody
+ @PostMapping("/base/pointMerchars/queryUserHasGoodsNums")
+ public int queryUserHasGoodsNums(@RequestBody AppUserGoodResp goodResp){
+ int count = upmseService.count(new LambdaQueryWrapper<UserPointsMerchandise>()
+ .eq(UserPointsMerchandise::getUserId,goodResp.getGoodId())
+ .eq(UserPointsMerchandise::getPointsMerchandiseId,goodResp.getGoodId()));
+ System.out.println(count);
+ return count;
+ }
+
}
--
Gitblit v1.7.1