From 3d4a143874ca8371abb66888ff376408ef54ac61 Mon Sep 17 00:00:00 2001
From: lisy <linlangsur163@163.com>
Date: 星期二, 08 八月 2023 15:12:21 +0800
Subject: [PATCH] app端的福利主页积分商城的feign返回值封装处理
---
cloud-server-activity/src/main/java/com/dsh/activity/feignclient/MerChandiseClient.java | 3 ---
cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java | 6 +++---
cloud-server-other/src/main/java/com/dsh/other/controller/StoredValueConfigController.java | 1 -
cloud-server-activity/src/main/java/com/dsh/activity/model/PointMerchandiseVo.java | 18 ++++++++++++++++++
cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/MerChandiseClient.java | 2 +-
cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/model/PointMerchandiseVo.java | 17 +++++++++++++++++
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 10 +++++++---
cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java | 2 +-
8 files changed, 47 insertions(+), 12 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/MerChandiseClient.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/MerChandiseClient.java
index b7e381a..ebc2f3f 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/MerChandiseClient.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/MerChandiseClient.java
@@ -19,7 +19,7 @@
@PostMapping("/base/pointMerchars/getCommoditys")
- public List<PointsMerchandise> getVicinityGoods(@RequestBody CommodityRequest request);
+ PointMerchandiseVo getVicinityGoods(@RequestBody CommodityRequest request);
@PostMapping("/base/pointMerchars/getRedeemedNums")
public int getRedeemedQuantity(@RequestBody Integer goodId);
diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/model/PointMerchandiseVo.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/model/PointMerchandiseVo.java
new file mode 100644
index 0000000..c2d3c3e
--- /dev/null
+++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/model/PointMerchandiseVo.java
@@ -0,0 +1,17 @@
+package com.dsh.account.feignclient.activity.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class PointMerchandiseVo {
+
+
+ List<PointsMerchandise> merchandises;
+
+}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java
index f387614..a56044c 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java
@@ -183,7 +183,7 @@
BigDecimal amount = BigDecimal.ZERO;
if (rechargeConfig.size() > 0){
for (Map<String, Object> stringObjectMap : rechargeConfig) {
- Long o = (Long) stringObjectMap.get("money");
+ double o = (double) stringObjectMap.get("money");
if (BigDecimal.valueOf(o).compareTo(request.getAmount()) == 0) {
amount = BigDecimal.valueOf(o);
rechargeRecords.setAmount(BigDecimal.valueOf(o));
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
index c4a005c..79f5e44 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
@@ -671,9 +671,9 @@
CommodityRequest commodityRequest = new CommodityRequest();
commodityRequest.setLon(request.getLon());
commodityRequest.setLat(request.getLat());
- List<PointsMerchandise> vicinityGoods = mcClient.getVicinityGoods(commodityRequest);
- if (vicinityGoods.size() > 0) {
- for (PointsMerchandise vicinityGood : vicinityGoods) {
+ PointMerchandiseVo vicinityGoods = mcClient.getVicinityGoods(commodityRequest);
+ if (ToolUtil.isNotEmpty(vicinityGoods.getMerchandises())) {
+ for (PointsMerchandise vicinityGood : vicinityGoods.getMerchandises()) {
Goods commodity = new Goods();
switch (vicinityGood.getType()) {
case 1:
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 c4b5025..92e4c4f 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
@@ -11,6 +11,7 @@
import com.dsh.activity.feignclient.model.*;
import com.dsh.activity.feignclient.other.StoreClient;
import com.dsh.activity.feignclient.other.model.StoreDetailOfCourse;
+import com.dsh.activity.model.PointMerchandiseVo;
import com.dsh.activity.model.request.CommodityRequest;
import com.dsh.activity.service.*;
import com.dsh.activity.util.GDMapGeocodingUtil;
@@ -90,13 +91,15 @@
}
+ @ResponseBody
@PostMapping("/base/pointMerchars/getCommoditys")
- public List<PointsMerchandise> getVicinityGoods(@RequestBody CommodityRequest request){
+ public PointMerchandiseVo getVicinityGoods(@RequestBody CommodityRequest request){
+ PointMerchandiseVo pointMerchandiseVo = new PointMerchandiseVo();
List<PointsMerchandise> list = new ArrayList<>();
String provinceCode = "";
String cityCode = "";
if (ToolUtil.isEmpty(request.getLon()) && ToolUtil.isEmpty(request.getLat())){
- return list;
+ return pointMerchandiseVo;
}
try {
Map<String, String> geocode = gdMapGeocodingUtil.geocode(request.getLon(), request.getLat());
@@ -116,8 +119,9 @@
iterator.remove(); // 移除符合条件的商品
}
}
+ pointMerchandiseVo.setMerchandises(list);
}
- return list;
+ return pointMerchandiseVo;
}
@PostMapping("/base/pointMerchars/getRedeemedNums")
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/MerChandiseClient.java b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/MerChandiseClient.java
index 2ffb151..6d4533e 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/MerChandiseClient.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/MerChandiseClient.java
@@ -17,9 +17,6 @@
@PostMapping("/base/pointMerchars/convertGoods")
public List<IntegralCommodity> getConvertibleGoods();
- @PostMapping("/base/pointMerchars/getCommoditys")
- public List<PointsMerchandise> getVicinityGoods(@RequestBody CommodityRequest request);
-
@PostMapping("/base/pointMerchars/getRedeemedNums")
public int getRedeemedQuantity(@RequestBody Integer goodId);
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/model/PointMerchandiseVo.java b/cloud-server-activity/src/main/java/com/dsh/activity/model/PointMerchandiseVo.java
new file mode 100644
index 0000000..4386110
--- /dev/null
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/model/PointMerchandiseVo.java
@@ -0,0 +1,18 @@
+package com.dsh.activity.model;
+
+import com.dsh.activity.entity.PointsMerchandise;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class PointMerchandiseVo {
+
+
+ List<PointsMerchandise> merchandises;
+
+}
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/StoredValueConfigController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/StoredValueConfigController.java
index 3ac028f..b232622 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/StoredValueConfigController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/StoredValueConfigController.java
@@ -34,7 +34,6 @@
private StoredValueConfigService svconfigService;
@ResponseBody
-
@PostMapping("/base/stored/getRechargeArrange")
public List<Map<String,Object>> getRechargeConfig(){
List<Map<String,Object>> responses = new ArrayList<>();
--
Gitblit v1.7.1