From aca52db249c7ddcd84e1d4125573a6bb3524670f Mon Sep 17 00:00:00 2001
From: lisy <linlangsur163@163.com>
Date: 星期一, 07 八月 2023 21:29:50 +0800
Subject: [PATCH] app端：商品详情列表数据的处理bug
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 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 b0d9bb4..b6e5926 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
@@ -92,8 +92,12 @@
@PostMapping("/base/pointMerchars/getCommoditys")
public List<PointsMerchandise> getVicinityGoods(@RequestBody CommodityRequest request){
+ List<PointsMerchandise> list = new ArrayList<>();
String provinceCode = "";
String cityCode = "";
+ if (ToolUtil.isEmpty(request.getLon()) && ToolUtil.isEmpty(request.getLat())){
+ return list;
+ }
try {
Map<String, String> geocode = gdMapGeocodingUtil.geocode(request.getLon(), request.getLat());
provinceCode = geocode.get("provinceCode");
@@ -102,7 +106,7 @@
e.printStackTrace();
}
- List<PointsMerchandise> list = pmdsService.list(new QueryWrapper<PointsMerchandise>()
+ list = pmdsService.list(new QueryWrapper<PointsMerchandise>()
.eq("state", 1));
if (list.size() > 0 ){
Iterator<PointsMerchandise> iterator = list.iterator();
@@ -134,8 +138,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())) {
@@ -195,8 +200,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())) {
@@ -244,8 +251,9 @@
// 优惠券
Coupon coupon = iCouponService.getById(detailRequest.getGoodId());
detailsVo.setGoodId(coupon.getId());
- List<String> list3 = Arrays.asList(StrUtils.splitStr2StrArr(coupon.getProductImages(), ","));
+ List<String> list3 = new ArrayList<>();
list3.add(coupon.getCover());
+ list3.addAll(Arrays.asList(StrUtils.splitStr2StrArr(coupon.getProductImages(), ",")));
detailsVo.setPics(list3);
Collections.sort(detailsVo.getPics(), (s1, s2) -> {
if (s1.equals(coupon.getCover())) {
--
Gitblit v1.7.1