From 4351e71d782741143a98f86f6648acd16689165f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 27 May 2022 19:48:02 +0800
Subject: [PATCH] Merge branch 'developer' into hive2.0
---
zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopDeliveryInfoAction.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopDeliveryInfoAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopDeliveryInfoAction.java
index 209d475..82954ed 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopDeliveryInfoAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopDeliveryInfoAction.java
@@ -1,6 +1,6 @@
package com.matrix.system.shopXcx.action;
-import com.matrix.component.rabbitmq.RabiitMqTemplate;
+import com.matrix.component.asyncmessage.AsyncMessageManager;
import com.matrix.core.anotations.RemoveRequestToken;
import com.matrix.core.anotations.SaveRequestToken;
import com.matrix.core.constance.MatrixConstance;
@@ -24,7 +24,7 @@
import com.matrix.system.shopXcx.dao.ShopDeliveryInfoDao;
import com.matrix.system.shopXcx.dao.ShopLogisticsInfoDao;
import com.matrix.system.shopXcx.dao.ShopOrderDao;
-import com.matrix.system.shopXcx.mqTask.MQTaskRouting;
+import com.matrix.system.shopXcx.mqTask.AsyncMessageRouting;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -59,14 +59,14 @@
@Autowired
SystemDictionaryDao systemDictionaryDao;
+ @Autowired
+ private AsyncMessageManager asyncMessageManager;
@Autowired
private WxShopOrderUtil wxShopOrderUtil;
@Autowired
private ShopLogisticsInfoDao shopLogisticsInfoDao;
- @Autowired
- private RabiitMqTemplate rabiitMqTemplate;
//记录编辑前的值Before_Edit_Value
public static final String BEV = "ShopDeliveryInfo_BEV";
@@ -83,8 +83,8 @@
SysUsers sysUsers = getMe();
pageVo.setSort("create_time");
pageVo.setOrder("desc");
-// shopDeliveryInfo.setCompanyId(sysUsers.getCompanyId());
- shopDeliveryInfo.setShopId(sysUsers.getShopId());
+ shopDeliveryInfo.setCompanyId(sysUsers.getCompanyId());
+// shopDeliveryInfo.setShopId(sysUsers.getShopId());
List<ShopDeliveryInfo> dataList = shopDeliveryInfoDao.selectInPage(shopDeliveryInfo, pageVo);
AjaxResult result = new AjaxResult(AjaxResult.STATUS_SUCCESS, dataList,
shopDeliveryInfoDao.selectTotalRecord(shopDeliveryInfo));
@@ -160,6 +160,7 @@
info.setRemarks(deliveryInfo.getRemarks());
info.setLogisticsStatus(AppConstance.LOGISTICS_STATUS_OF_RECEIVE);
info.setDeliveryTime(new Date());
+ info.setCompanyId(user.getCompanyId());
shopDeliveryInfoDao.updateByModel(info);
//构建需要修改订单信息Map
@@ -169,8 +170,8 @@
shopOrderDao.updateByMap(modifyMap);
//发送创建订单的消息
- rabiitMqTemplate.sendMsg(MQTaskRouting.ORDER_OUT_SOTORE+evn, shopOrderDao.selectById(deliveryInfo.getOrderId()).getOrderNo());
-
+ String orderNo = shopOrderDao.selectById(deliveryInfo.getOrderId()).getOrderNo();
+ asyncMessageManager.sendMsg(AsyncMessageRouting.ORDER_OUT_SOTORE ,"orderNo=%s",orderNo);
return new AjaxResult(AjaxResult.STATUS_SUCCESS, "发货成功");
}
--
Gitblit v1.9.1