From c9b157e19d101fd2d9a79c3db673f0c2cacd481c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 12 Jan 2021 18:10:50 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java | 72 ++++++++++++++++++++++++-----------
1 files changed, 49 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 ccdc352..e9db49e 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,21 +15,15 @@
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.AchieveNew;
-import com.matrix.system.hive.bean.MoneyCardUse;
-import com.matrix.system.hive.bean.SysOrder;
-import com.matrix.system.hive.bean.SysOrderItem;
+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.system.hive.plugin.util.DateUtils;
+import com.matrix.core.tools.DateUtil;
import com.matrix.system.hive.pojo.ShoppingCarItem;
import com.matrix.system.hive.pojo.ShoppingCarItemsVo;
-import com.matrix.system.hive.service.AchieveNewService;
-import com.matrix.system.hive.service.MoneyCardUseService;
-import com.matrix.system.hive.service.SysOrderItemService;
-import com.matrix.system.hive.service.SysOrderService;
+import com.matrix.system.hive.service.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.transaction.annotation.Transactional;
@@ -83,6 +77,12 @@
@Autowired
SysShopInfoDao shopInfoDao;
+ @Autowired
+ private SysVipInfoService sysVipInfoService;
+
+ @Autowired
+ private SysOrderFlowService sysOrderFlowService;
+
/**
* 计算订单金额
@@ -125,9 +125,25 @@
}
-
-
-
+ /**
+ * 退款
+ *
+ * @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 = orderService.checkAndSaveOrder(sysOrder);
+ orderService.refundOrderMoney(sysOrder);
+ //处理用户购买的产品
+ return AjaxResult.buildSuccessInstance(Arrays.asList(sysOrder), "订单退款成功");
+ }
/**
@@ -144,7 +160,6 @@
//处理用户购买的产品
return AjaxResult.buildSuccessInstance(Arrays.asList(sysOrder), "订单保存成功");
}
-
/**
* 新建订单
@@ -175,6 +190,9 @@
}
//设置过滤后的购物车条目
car.setCarItems(carItems);
+
+ SysVipInfo info = (SysVipInfo) WebUtil.getSession().getAttribute(SystemConstance.CURRENT_CUSTOMER);
+ car.setVipId(info.getId());
// 添加新订单
int i = orderService.createOrder(WebUtil.getSession(), car);
@@ -362,30 +380,38 @@
public String orderItem(SysOrder orderVo) {
// 根据id查到对应的订单信息
SysOrder order=null;
- if(orderVo.getId()!=null){
- order = orderService.findById(orderVo.getId());
- }else if(StringUtils.isNotBlank(orderVo.getOrderNo())){
+ if(orderVo.getId()!=null){
+ 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<SysOrderItem> sysOrderItems = orderItemDao.selectByOrderId(order.getId());
order.setItems(sysOrderItems);
- WebUtil.getRequest().setAttribute("order", order);
+ SysVipInfo vipInfo = sysVipInfoService.findById(order.getVipId());
// 根据会员Id查到会员有效的会员卡
// 根据订单号查找订单条目
- SysOrderItem orderItem = new SysOrderItem();
- orderItem.setOrderId(order.getId());
- List<SysOrderItem> orderItems = orderItemService.findByModel(orderItem);
- WebUtil.getRequest().setAttribute("orderItems", orderItems);
+ List<SysOrderItem> orderItems = orderItemService.findByOrderId(order.getId());
MoneyCardUse moneyCardUse = new MoneyCardUse();
moneyCardUse.setVipId(order.getVipId());
List<MoneyCardUse> cards = cardUseService.findByModel(moneyCardUse);
+ List<SysOrderFlow> flows = sysOrderFlowService.findByOrderId(order.getId());
+ order.setFlows(flows);
+
+ List<SysOrderFlow> payMethods = sysOrderFlowService.findPayMethodsAmount(order.getId());
+
+ List<AchieveNew> achieveList = achieveNewService.findOrderItemAchieve(order.getId());
+ WebUtil.getRequest().setAttribute("orderItems", orderItems);
+ WebUtil.getRequest().setAttribute("order", order);
WebUtil.getRequest().setAttribute("cards", cards);
+ WebUtil.getRequest().setAttribute("vipInfo", vipInfo);
+ WebUtil.getRequest().setAttribute("payMethods", payMethods);
+ WebUtil.getRequest().setAttribute("achieveList", achieveList);
return "admin/hive/beautySalon/orderXq-form";
}
@@ -472,7 +498,7 @@
temp.add(item.getOrderNo());
temp.add(item.getVipName());
temp.add(item.getVipPhone());
- temp.add(DateUtils.dateToString(item.getOrderTime(), DateUtils.DATE_FORMAT_MM));
+ temp.add(DateUtil.dateToString(item.getOrderTime(), DateUtil.DATE_FORMAT_MM));
temp.add(item.getTotal());
temp.add(item.getZkTotal());
temp.add(item.getCashPay());
--
Gitblit v1.9.1