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 | 32 +++++++++++---------------------
1 files changed, 11 insertions(+), 21 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 c4c732b..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());
@@ -181,23 +180,14 @@
* @author jyy
*/
@RequestMapping(value = "/toBj")
- public String toBj(Long id, HttpServletRequest request) {
+ public String toBj(Long id) {
// 根据id查到对应的订单信息
SysOrder order = orderService.findById(id);
- WebUtil.getRequest().setAttribute("order", order);
-
SysOrderItem item = new SysOrderItem();
item.setOrderId(order.getId());
- item.setStatus(Dictionary.ORDER_STATU_QK);
- order.setItems(orderItemService.findByModel(item));
-
-
- MoneyCardUse moneyCardUse = new MoneyCardUse();
- moneyCardUse.setVipId(order.getVipId());
- moneyCardUse.setStatus(Dictionary.MONEYCARD_STATUS_YX);
- List<MoneyCardUse> cards = cardUseService.findByModel(moneyCardUse);
-
- WebUtil.getRequest().setAttribute("cards", cards);
+ List<SysOrderItem> items = orderItemService.findByModel(item);
+ order.setItems(items);
+ WebUtil.getRequest().setAttribute("order", order);
return "admin/hive/beautySalon/bj-form";
}
@@ -227,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, "补交成功");
@@ -296,7 +286,7 @@
if (newDate != null && newDate.before(today)) {
return new AjaxResult(AjaxResult.STATUS_FAIL, "有效期要大于当前日期");
}
- if (newDate == null && failTime.before(today)) {
+ if (newDate == null && (failTime == null || failTime.before(today))) {
//如果是已过期界面会提醒重新设置有效期
return new AjaxResult(AjaxResult.STATUS_SUCCESS, "已过期");
}
--
Gitblit v1.9.1