From a7f47c8953b2055e7971df01b1aad3b40b128b17 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Thu, 04 Mar 2021 08:45:35 +0800
Subject: [PATCH] 修改业绩
---
zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java
index 55f0ffd..68afcae 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java
@@ -15,13 +15,8 @@
import com.matrix.system.common.tools.ResponseHeadUtil;
import com.matrix.system.constance.Dictionary;
import com.matrix.system.constance.SystemConstance;
-import com.matrix.system.hive.action.util.QueryUtil;
import com.matrix.system.hive.bean.*;
-import com.matrix.system.hive.dao.MoneyCardUseDao;
-import com.matrix.system.hive.dao.SysOrderDao;
-import com.matrix.system.hive.dao.SysOrderItemDao;
-import com.matrix.system.hive.dao.SysShopInfoDao;
-import com.matrix.core.tools.DateUtil;
+import com.matrix.system.hive.dao.*;
import com.matrix.system.hive.plugin.util.CollectionUtils;
import com.matrix.system.hive.pojo.ShoppingCarItem;
import com.matrix.system.hive.pojo.ShoppingCarItemsVo;
@@ -90,6 +85,9 @@
private SysOrderFlowService sysOrderFlowService;
@Autowired
+ private SysOrderFlowDao sysOrderFlowDao;
+
+ @Autowired
RabiitMqTemplate rabiitMqTemplate;
@Value("${evn}")
private String evn;
@@ -132,9 +130,9 @@
orderService.updateReceiptMoney(sysOrder);
//发送微信公众号提醒
-// UniformMsgParam uniformMsgParam=new UniformMsgParam(user.getCompanyId(),UniformMsgParam.GZH_GMCG);
-// uniformMsgParam.put("orderId",sysOrder.getId());
-// rabiitMqTemplate.sendMsg(MQTaskRouting.SEND_UNIFORM_TEMPLATE_MSG+evn,uniformMsgParam.toJSONString());
+ UniformMsgParam uniformMsgParam=new UniformMsgParam(user.getCompanyId(),UniformMsgParam.GZH_GMCG);
+ uniformMsgParam.put("orderId",sysOrder.getId());
+ rabiitMqTemplate.sendMsg(MQTaskRouting.SEND_UNIFORM_TEMPLATE_MSG+evn,uniformMsgParam.toJSONString());
//处理用户购买的产品
@@ -285,13 +283,17 @@
public @ResponseBody
AjaxResult updateOrderTime(SysOrder sysOrder) {
- sysOrderDao.updateOrderTime(sysOrder.getOrderTime(), sysOrder.getId());
+ sysOrderDao.updateOrderTime(sysOrder.getPayTime(), sysOrder.getId());
// 修改业绩时间
// 更新业绩时间
AchieveNew achieveNew = new AchieveNew();
achieveNew.setOrderId(sysOrder.getId());
- achieveNew.setDatatime(sysOrder.getOrderTime());
+ achieveNew.setDatatime(sysOrder.getPayTime());
achieveNewService.modifyAchieveTime(achieveNew);
+ //更新收款流水时间
+ sysOrderFlowDao.updateTimeByOrderId(sysOrder.getId(),sysOrder.getPayTime());
+
+
return new AjaxResult(AjaxResult.STATUS_SUCCESS, "修改成功");
}
--
Gitblit v1.9.1