From 62a447d89331aee1feae7724c7616aa1bb2cfe79 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 16 十月 2024 14:28:37 +0800
Subject: [PATCH] 将CMQ替换为rabbitmq
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareStorageControllerV2.java | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareStorageControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareStorageControllerV2.java
index 12d31be..64fe28b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareStorageControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareStorageControllerV2.java
@@ -17,7 +17,7 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
-import com.yeshi.fanli.dto.ConfigParamsDTO;
+import com.yeshi.fanli.dto.GoodsMoneyConfigParamsDTO;
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.user.UserGoodsStorage;
import com.yeshi.fanli.entity.goods.CommonGoods;
@@ -65,14 +65,12 @@
/**
* 鍗曚釜鍟嗗搧鍔犲叆閫夊搧搴�
- *
- * @param callback
- * @param storageIds
- * id鏁扮粍
+ *
+ * id鏁扮粍
* @param out
*/
@RequestMapping(value = "accordtorage", method = RequestMethod.POST)
- public void accordtorage(AcceptData acceptData, Long uid, long id, Integer goodsType, PrintWriter out) {
+ public void accordtorage(AcceptData acceptData, Long uid, String id, Integer goodsType, PrintWriter out) {
if (uid == null) {
out.print(JsonUtil.loadFalseResult("鐢ㄦ埛鏈櫥褰�"));
@@ -91,7 +89,7 @@
userGoodsStorageService.deleteByPrimaryKey(userGoodsStorage.getId());
} else {
// 鍔犲叆閫夊搧搴�
- Set<Long> set = new HashSet<Long>();
+ Set<String> set = new HashSet<>();
set.add(id);
userGoodsStorageService.save(uid, set, goodsType);
storageState = true;
@@ -187,7 +185,7 @@
// API缃戠粶鎺ュ彛楠岃瘉鏄惁鍦ㄥ敭
List<TaoBaoGoodsBrief> listTaoKeGoods = null;
if (goodsType == Constant.SOURCE_TYPE_TAOBAO) {
- List<Long> listGid = new ArrayList<Long>();
+ List<String> listGid = new ArrayList<>();
for (UserGoodsStorage userGoodsStorage : listStorage) {
CommonGoods commonGoods = userGoodsStorage.getCommonGoods();
if (commonGoods == null) {
@@ -210,7 +208,7 @@
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
- ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
+ GoodsMoneyConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
acceptData.getVersion(),acceptData.getSystem());
for (UserGoodsStorage userGoodsStorage : listStorage) {
@@ -223,9 +221,9 @@
if (goodsType == Constant.SOURCE_TYPE_TAOBAO) {
if (listTaoKeGoods != null && listTaoKeGoods.size() > 0) {
int state = 1; // 榛樿鍋滃敭
- Long goodsId = commonGoods.getGoodsId();
+ String goodsId = commonGoods.getGoodsId();
for (TaoBaoGoodsBrief taoKeGoods : listTaoKeGoods) {
- Long auctionId = taoKeGoods.getAuctionId();
+ String auctionId = taoKeGoods.getAuctionId();
if (goodsId == auctionId || goodsId.equals(auctionId)) {
state = 0; // 鍦ㄥ敭
break;
@@ -261,8 +259,7 @@
/**
* 鍒嗕韩鍟嗗搧杩斿洖浜岀淮鐮佸浘鐗�
- *
- * @param callback
+ *
* @param storageIds
* id鏁扮粍
* @param out
--
Gitblit v1.8.0