From 083bed1be51dc21792a245b035b50dfef0a24db3 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期二, 17 十月 2023 19:07:18 +0800
Subject: [PATCH] update
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 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 f85e7b7..c959663 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
@@ -15,6 +15,7 @@
import com.dsh.activity.model.CoachChangeStateVO;
import com.dsh.activity.model.PointMerchandiseIncomeVo;
import com.dsh.activity.model.PointMerchandiseVo;
+import com.dsh.activity.model.WriteOffDTO;
import com.dsh.activity.model.QueryDataFee;
import com.dsh.activity.model.request.*;
import com.dsh.activity.model.response.GoodsInfoOneVo;
@@ -90,6 +91,19 @@
@RequestMapping("/base/pointMerchars/changeState")
public Object changeState(@RequestBody CoachChangeStateVO dto){
return pmdsService.changeState(dto);
+ }
+ /**
+ * 门票核销
+ */
+ @RequestMapping("/base/pointMerchars/writeOff")
+ public Object writeOff(@RequestBody WriteOffDTO dto){
+ UserPointsMerchandise byId = userPointsMerchandiseService.getById(dto.getId());
+ byId.setStoreId(dto.getVerifiStoreId());
+ byId.setStatus(2);
+ byId.setVerificationTime(new Date());
+ byId.setUserId(null);
+ byId.setVerificationUserId(dto.getVerificationUserId());
+ return userPointsMerchandiseService.updateById(byId);
}
@ResponseBody
@PostMapping("/base/pointMerchars/ticketList")
@@ -167,7 +181,7 @@
for (PointsMerchandise merchandise : merchandises) {
IntegralCommodity integralCommodity = new IntegralCommodity();
integralCommodity.setCommodityId(merchandise.getId());
- integralCommodity.setCommodityImg(merchandise.getProductImages());
+ integralCommodity.setCommodityImg(merchandise.getCover());
integralCommodity.setCommodityName(merchandise.getName());
integralCommodity.setCommodityPrice(merchandise.getPrice());
integralCommodity.setGoodsType(merchandise.getType());
@@ -199,12 +213,12 @@
list = pmdsService.list(new QueryWrapper<PointsMerchandise>()
.eq("state", 1)
- .eq("shelves",1));
+ .eq("shelves",1).le("startTime",new Date()).ge("endTime",new Date()));
if (list.size() > 0 ){
Iterator<PointsMerchandise> iterator = list.iterator();
while (iterator.hasNext()) {
PointsMerchandise merchandise = iterator.next();
- if (merchandise.getUseScope() == 2 && (!Objects.equals(merchandise.getCityCode(), cityCode) && !Objects.equals(merchandise.getProvinceCode(), provinceCode))) {
+ if (merchandise.getUseScope() == 2 && (!cityCode.equals(merchandise.getCityCode()) || !provinceCode.equals(merchandise.getProvinceCode()))) {
iterator.remove(); // 移除符合条件的商品
}
}
@@ -296,7 +310,6 @@
detailsVo.setGoodId(merchandise.getId());
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) -> {
@@ -434,6 +447,16 @@
detailsResponse.setEndTime(simpleDateFormat.format(merchandise.getEndTime()));
detailsResponse.setUseStatus(pointsMerchandise.getStatus() == 1 ? 2 : 1);
detailsResponse.setGoodType(merchandise.getType());
+ if(merchandise.getType()==3){
+ detailsResponse.setUserId(appUserId);
+ if(merchandise.getUseScope()==1){
+ detailsResponse.setSid(0);
+ }else if(merchandise.getUseScope()==2){
+
+ }else if(merchandise.getUseScope()==3){
+
+ }
+ }
responses.add(detailsResponse);
}
detailsVo.setDetailsResponses(responses);
@@ -699,6 +722,8 @@
vo.setSort(byId.getSort());
vo.setContent(byId.getRedemptionInstructions());
}
+ int count = userPointsMerchandiseService.count(new LambdaQueryWrapper<UserPointsMerchandise>().eq(UserPointsMerchandise::getPointsMerchandiseId, pointMercharsId));
+ vo.setNum(count);
return vo;
}
--
Gitblit v1.7.1