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); cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/model/PointMerchandiseVo.java
New file @@ -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; } 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)); 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: 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") 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);
New file @@ -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; } 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<>();
