From a93d4f40f35ad4464ec1d5602262a1d8d8407ece Mon Sep 17 00:00:00 2001
From: lisy <linlangsur163@163.com>
Date: 星期二, 08 八月 2023 21:04:12 +0800
Subject: [PATCH] app端口：积分商品详情的字段处理
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 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 52771ce..dce6685 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
@@ -257,8 +257,10 @@
Coupon coupon = iCouponService.getById(detailRequest.getGoodId());
detailsVo.setGoodId(coupon.getId());
List<String> list3 = new ArrayList<>();
- list3.add(coupon.getCover());
- list3.addAll(Arrays.asList(StrUtils.splitStr2StrArr(coupon.getProductImages(), ",")));
+ 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())) {
@@ -276,12 +278,12 @@
detailsVo.setRedeemedNum(couponNums);
detailsVo.setResidueNum(coupon.getQuantityIssued()-couponNums);
detailsVo.setPerLimit(coupon.getPickUpQuantity());
- detailsVo.setExchangeType(merchandise.getRedemptionMethod());
- 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.setBelongs("全国通用");
@@ -297,8 +299,8 @@
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);
@@ -334,7 +336,7 @@
}
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);
}
@@ -453,6 +455,7 @@
@PostMapping("/base/pointMerchars/saveDetailsUserPointMercase")
public void saveDetailsUserPointMercase(@RequestBody UserPointsMerchandise merchandise){
+ merchandise.setInsertTime(new Date());
upmseService.save(merchandise);
}
--
Gitblit v1.7.1