From add2d28c3aeccfe57338c439967abbb83117b20e Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期二, 17 十月 2023 09:56:55 +0800
Subject: [PATCH] 修改bug
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 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..50e420e 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());
@@ -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) -> {
--
Gitblit v1.7.1