From 9eeb9eae3901ce446908b97720c3347df19a567a Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 13 Jan 2021 18:41:53 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java | 86 +++++++++++++++++++++++++++++++-----------
1 files changed, 63 insertions(+), 23 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 6fe4a05..cb1407a 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
@@ -42,6 +42,7 @@
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Date;
import java.util.List;
/**
@@ -79,6 +80,9 @@
@Autowired
private SysVipInfoService sysVipInfoService;
+
+ @Autowired
+ private SysOrderFlowService sysOrderFlowService;
/**
@@ -122,9 +126,26 @@
}
-
-
-
+ /**
+ * 退款
+ *
+ * @param sysOrder
+ * @return
+ */
+ @RequestMapping(value = "/refundOrder")
+ @ResponseBody
+ @Transactional(rollbackFor = Exception.class)
+ public AjaxResult refundOrder(@RequestBody SysOrder sysOrder) {
+ SysUsers user = getMe();
+ sysOrder.setShopId(user.getShopId());
+ sysOrder.setStatu(Dictionary.ORDER_STATU_TK);
+ sysOrder.setOrderTime(new Date());
+ //校验订单是否满足结算调价，新订单则保存订单，已有订单则删除后更新
+ sysOrder = orderService.checkAndSaveOrder(sysOrder);
+ orderService.refundOrderMoney(sysOrder);
+ //处理用户购买的产品
+ return AjaxResult.buildSuccessInstance(Arrays.asList(sysOrder), "订单退款成功");
+ }
/**
@@ -141,7 +162,6 @@
//处理用户购买的产品
return AjaxResult.buildSuccessInstance(Arrays.asList(sysOrder), "订单保存成功");
}
-
/**
* 新建订单
@@ -353,22 +373,18 @@
return "admin/hive/beautySalon/point-order";
}
- /**
- * 跳转 消费流水详情页面
- *
- * @author jyy
- */
- @RequestMapping(value = "/orderItem")
- public String orderItem(SysOrder orderVo) {
+ @RequestMapping(value = "/findOrderDetailByIdOrNo")
+ @ResponseBody
+ public AjaxResult findOrderDetailByIdOrNo(SysOrder orderVo) {
// 根据id查到对应的订单信息
SysOrder order=null;
if(orderVo.getId()!=null){
- order = orderService.findById(orderVo.getId());
+ order = orderService.findById(orderVo.getId());
}else if(StringUtils.isNotBlank(orderVo.getOrderNo())){
- List<SysOrder> byModel = orderService.findByModel(orderVo);
- if(byModel.size()==1){
- order=orderService.findById(byModel.get(0).getId());
- }
+ List<SysOrder> byModel = orderService.findByModel(orderVo);
+ if(byModel.size()==1){
+ order=orderService.findById(byModel.get(0).getId());
+ }
}
List<SysOrderItem> sysOrderItems = orderItemDao.selectByOrderId(order.getId());
order.setItems(sysOrderItems);
@@ -376,18 +392,42 @@
SysVipInfo vipInfo = sysVipInfoService.findById(order.getVipId());
// 根据会员Id查到会员有效的会员卡
// 根据订单号查找订单条目
- SysOrderItem orderItem = new SysOrderItem();
- orderItem.setOrderId(order.getId());
- List<SysOrderItem> orderItems = orderItemService.findByModel(orderItem);
+ List<SysOrderItem> orderItems = orderItemService.findByOrderId(order.getId());
MoneyCardUse moneyCardUse = new MoneyCardUse();
moneyCardUse.setVipId(order.getVipId());
List<MoneyCardUse> cards = cardUseService.findByModel(moneyCardUse);
- WebUtil.getRequest().setAttribute("orderItems", orderItems);
- WebUtil.getRequest().setAttribute("order", order);
- WebUtil.getRequest().setAttribute("cards", cards);
- WebUtil.getRequest().setAttribute("vipInfo", vipInfo);
+ List<SysOrderFlow> flows = sysOrderFlowService.findByOrderId(order.getId());
+ order.setFlows(flows);
+
+ List<SysOrderFlow> payMethods = sysOrderFlowService.findPayMethodsAmount(order.getId());
+
+ List<AchieveNew> achieveList = achieveNewService.findOrderItemAchieve(order.getId());
+
+ AjaxResult ajaxResult = AjaxResult.buildSuccessInstance("获取成功");
+ ajaxResult.putInMap("orderItems", orderItems);
+ ajaxResult.putInMap("order", order);
+ ajaxResult.putInMap("cards", cards);
+ ajaxResult.putInMap("vipInfo", vipInfo);
+ ajaxResult.putInMap("payMethods", payMethods);
+ ajaxResult.putInMap("achieveList", achieveList);
+ return ajaxResult;
+ }
+
+ /**
+ * 跳转 消费流水详情页面
+ *
+ * @author jyy
+ */
+ @RequestMapping(value = "/orderItem")
+ public String orderItem(SysOrder orderVo) {
+
+ if(orderVo.getId()!=null){
+ WebUtil.getRequest().setAttribute("orderParam", orderVo.getId());
+ }else if(StringUtils.isNotBlank(orderVo.getOrderNo())){
+ WebUtil.getRequest().setAttribute("orderParam", orderVo.getOrderNo());
+ }
return "admin/hive/beautySalon/orderXq-form";
}
--
Gitblit v1.9.1