From eaa5c1ddde681e25ea6bd3da6bf496c78b8c5f69 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Sat, 23 Jan 2021 22:55:29 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/hive/action/MoneyCardUseController.java | 17 ++++++++++-------
1 files changed, 10 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..6db943c 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
@@ -18,6 +18,7 @@
import org.springframework.beans.factory.annotation.Autowired;
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;
@@ -60,14 +61,12 @@
* @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,7 +88,7 @@
*/
@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, "充值成功");
result.putInMap("orderId",order.getId());
@@ -184,6 +183,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 +217,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