From 3ba2d33c27aea91c14bbf34e04e72f3d758a5105 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期三, 22 十一月 2023 19:36:01 +0800
Subject: [PATCH] 11.21.2
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 49 +++++++++++++++++++++++++++----------------------
1 files changed, 27 insertions(+), 22 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 9394121..3d82719 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
@@ -300,7 +300,7 @@
List<PointsMerchandise> merchandises = pmdsService.list(new QueryWrapper<PointsMerchandise>()
.eq("state", 1)
.eq("shelves", 1)
- .gt("endTime", new Date()));
+ .gt("endTime", new Date()).last("ORDER BY sort desc,insertTime desc"));
if (merchandises.size() > 0){
for (PointsMerchandise merchandise : merchandises) {
IntegralCommodity integralCommodity = new IntegralCommodity();
@@ -309,6 +309,7 @@
integralCommodity.setCommodityName(merchandise.getName());
integralCommodity.setCommodityPrice(merchandise.getPrice());
integralCommodity.setGoodsType(merchandise.getType());
+ integralCommodity.setSort(merchandise.getSort());
commodity.add(integralCommodity);
}
// }
@@ -991,9 +992,10 @@
PointDetailsVo detailsVo = new PointDetailsVo();
UserPointsMerchandise byId = upmseService.getById(speMercharsId);
- List<PointsMerchandiseStore> stores = storeService.list(new QueryWrapper<PointsMerchandiseStore>().eq("pointsMerchandiseId", byId.getPointsMerchandiseId()));
if (ToolUtil.isNotEmpty(byId)){
+ List<PointsMerchandiseStore> stores = storeService.list(new QueryWrapper<PointsMerchandiseStore>().eq("pointsMerchandiseId", byId.getPointsMerchandiseId()));
+
PointsMerchandise pmdsServiceById = pmdsService.getById(byId.getPointsMerchandiseId());
// 2.0
detailsVo.setCardType(pmdsServiceById.getCardType());
@@ -1185,7 +1187,9 @@
detailsVo.setUseType(2);
}else {
detailsVo.setUseType(1);
- detailsVo.setWriteOffTime(simpleDateFormat.format(byId.getVerificationTime()));
+ if (pmdsServiceById.getType()!=2) {
+ detailsVo.setWriteOffTime(simpleDateFormat.format(byId.getVerificationTime()));
+ }
if (byId.getStoreId()!=null) {
StoreDetailOfCourse courseOfStore = stoClient.getCourseOfStore(byId.getStoreId());
detailsVo.setWriteOffName(courseOfStore.getStoreName());
@@ -1246,25 +1250,26 @@
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(coupon.getStartTime()));
-// detailsVo.setEndTime(format.format(coupon.getEndTime()));
+ 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()+"可用");
+ }
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+ detailsVo.setStartTime(format.format(coupon.getStartTime()));
+ detailsVo.setEndTime(format.format(coupon.getEndTime()));
detailsVo.setContents(coupon.getIllustrate());
detailsVo.setGoodType(4);
--
Gitblit v1.7.1