From ab2879bbcb846256cc182198b9c04e50fbc276c1 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 26 Jan 2021 14:15:42 +0800
Subject: [PATCH] 1、新增消息推送提醒 2、修改业绩计算bug
---
zq-erp/src/main/java/com/matrix/system/hive/action/MoneyCardUseController.java | 36 +++++++++++++++++++++++++++++-------
1 files changed, 29 insertions(+), 7 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/MoneyCardUseController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/MoneyCardUseController.java
index 8f749b4..97cf6ed 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/MoneyCardUseController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/MoneyCardUseController.java
@@ -1,5 +1,6 @@
package com.matrix.system.hive.action;
+import com.matrix.component.rabbitmq.RabiitMqTemplate;
import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.exception.GlobleException;
import com.matrix.core.pojo.AjaxResult;
@@ -15,9 +16,13 @@
import com.matrix.core.tools.DateUtil;
import com.matrix.system.hive.pojo.CzXkVo;
import com.matrix.system.hive.service.*;
+import com.matrix.system.shopXcx.mqTask.MQTaskRouting;
+import com.matrix.system.wechart.templateMsg.UniformMsgParam;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -54,20 +59,27 @@
private MoneyCardUseFlowDao moneyCardUseFlowDao;
@Autowired
private MoneyCardUseDao moneyCardUseDao;
+
+
+ @Value("${evn}")
+ private String evn;
+
+ @Autowired
+ private RabiitMqTemplate rabiitMqTemplate;
+
+
/**
* 跳转 充值页面
*
* @author jyy
*/
@RequestMapping(value = "/editFormCz")
- public String editFormCz() {
- SysVipInfo info =
- (SysVipInfo) WebUtil.getSession().getAttribute(SystemConstance.CURRENT_CUSTOMER);
- MoneyCardUse cardUseInfo = cardUseService.findByVipId(info.getId());
+ public String editFormCz(Long id) {
+ MoneyCardUse cardUseInfo = cardUseService.findByVipId(id);
if (cardUseInfo == null) {
cardUseInfo = new MoneyCardUse();
- cardUseInfo.setVipId(info.getId());
+ cardUseInfo.setVipId(id);
cardUseInfo.setCardName("储值卡");
cardUseInfo.setIsVipCar(Dictionary.FLAG_YES_Y);
cardUseInfo.setRealMoney(0D);
@@ -89,9 +101,15 @@
*/
@RequestMapping(value = "/cz")
public @ResponseBody
- AjaxResult cz(CzXkVo czVo) {
+ AjaxResult cz(@RequestBody CzXkVo czVo) {
SysOrder order= orderService.updateAddCardMoney(czVo);
AjaxResult result = new AjaxResult(AjaxResult.STATUS_SUCCESS, "充值成功");
+
+ //发送微信公众号提醒
+ UniformMsgParam uniformMsgParam=new UniformMsgParam(order.getCompanyId(),UniformMsgParam.GZH_CZCG);
+ uniformMsgParam.put("orderId",order.getId());
+ rabiitMqTemplate.sendMsg(MQTaskRouting.SEND_UNIFORM_TEMPLATE_MSG+evn,uniformMsgParam.toJSONString());
+
result.putInMap("orderId",order.getId());
return result;
}
@@ -184,6 +202,10 @@
public String toBj(Long id) {
// 根据id查到对应的订单信息
SysOrder order = orderService.findById(id);
+ SysOrderItem item = new SysOrderItem();
+ item.setOrderId(order.getId());
+ List<SysOrderItem> items = orderItemService.findByModel(item);
+ order.setItems(items);
WebUtil.getRequest().setAttribute("order", order);
return "admin/hive/beautySalon/bj-form";
@@ -214,7 +236,7 @@
*/
@RequestMapping(value = "/bj")
public @ResponseBody
- AjaxResult bj(SysOrder order) throws GlobleException {
+ AjaxResult bj(@RequestBody SysOrder order) throws GlobleException {
orderService.updateAfterMoney(order);
return new AjaxResult(AjaxResult.STATUS_SUCCESS, "补交成功");
--
Gitblit v1.9.1