abu/wzj-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

员工报餐：修改补贴订单收款，退款接口

Browse Source
This commit is contained in:
ryoeiken 2021-01-08 17:06:22 +08:00
parent 63d7660df3
commit f8e634e7fc
1 changed files with 39 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/ClientController.java
View File

@ -1,5 +1,7 @@
package com.ruoyi.system.fantang.controller; package com.ruoyi.system.fantang.controller;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
@ -413,16 +415,33 @@ public class ClientController extends BaseController {
@PostMapping("/orderCollection") @PostMapping("/orderCollection")
public AjaxResult orderCollection(@RequestBody JSONObject params) { public AjaxResult orderCollection(@RequestBody JSONObject params) {
// 订单 id // 员工 id
Integer orderId = params.getInteger("staffId"); Long staffId = params.getLong("staffId");
// 订餐类型 // 订餐类型
Integer type = params.getInteger("type"); Integer type = params.getInteger("type");
// 实收 // 总价
BigDecimal receipts = params.getBigDecimal("receipts"); BigDecimal totalPrice = params.getBigDecimal("receipts");
// 当前订单信息 // 生成新订单
FtOrderDao orderDao = orderDaoService.getById(orderId); FtOrderDao orderDao = new FtOrderDao();
orderDao.setOrderType(type);
orderDao.setStaffId(staffId);
orderDao.setTotalPrice(totalPrice);
Date today = new Date();
orderDao.setCreateAt(today);
orderDao.setOrderSrc("在线订单");
// 余额支付
orderDao.setPayType(3);
// 已支付
orderDao.setPayFlag(1);
// 未过期
orderDao.setExpiredFlag(0);
// 未核销
orderDao.setWriteOffFlag(0);
DateTime tomorrow = DateUtil.offsetDay(today, 1);
orderDao.setOrderDate(tomorrow);
// 当前订单员工信息 // 当前订单员工信息
FtStaffInfoDao staffInfoDao = staffInfoDaoService.getById(orderDao.getStaffId()); FtStaffInfoDao staffInfoDao = staffInfoDaoService.getById(orderDao.getStaffId());
@ -431,34 +450,30 @@ public class ClientController extends BaseController {
BigDecimal balance = staffInfoDao.getBalance(); BigDecimal balance = staffInfoDao.getBalance();
// 余额是否大于实收 // 余额是否大于实收
if (balance.compareTo(receipts) < 0) { if (balance.compareTo(totalPrice) < 0) {
return AjaxResult.error("补贴余额不足"); return AjaxResult.error("补贴余额不足");
} else { } else {
// 更新员工账户补贴余额 // 更新员工账户补贴余额
BigDecimal nowBalance = balance.subtract(receipts); BigDecimal nowBalance = balance.subtract(totalPrice);
staffInfoDao.setBalance(nowBalance); staffInfoDao.setBalance(nowBalance);
// 更新订单信息
orderDao.setReceipts(receipts);
orderDao.setPayFlag(1);
orderDao.setPayType(3);
orderDaoService.save(orderDao); orderDaoService.save(orderDao);
// 添加补贴流水记录 // 添加补贴流水记录
FtStaffSubsidyDao staffSubsidyDao = new FtStaffSubsidyDao(); FtStaffSubsidyDao staffSubsidyDao = new FtStaffSubsidyDao();
staffSubsidyDao.setStaffId(orderDao.getStaffId()); staffSubsidyDao.setStaffId(orderDao.getStaffId());
staffSubsidyDao.setIncomeType(2); staffSubsidyDao.setIncomeType(2);
staffSubsidyDao.setPrice(receipts); staffSubsidyDao.setPrice(totalPrice);
staffSubsidyDao.setConsumAt(new Date()); staffSubsidyDao.setConsumAt(today);
staffSubsidyDao.setOrderId(orderDao.getOrderId()); staffSubsidyDao.setOrderId(orderDao.getOrderId());
staffSubsidyDaoService.save(staffSubsidyDao); staffSubsidyDaoService.save(staffSubsidyDao);
} }
return AjaxResult.success("已收款"); return AjaxResult.success(orderDao);
} }
/** /**
@ -471,11 +486,14 @@ public class ClientController extends BaseController {
// 订单 id // 订单 id
Integer orderId = params.getInteger("orderId"); Integer orderId = params.getInteger("orderId");
// 实收
BigDecimal receipts = params.getBigDecimal("receipts");
// 当前订单信息 // 当前订单信息
FtOrderDao orderDao = orderDaoService.getById(orderId); FtOrderDao orderDao = orderDaoService.getById(orderId);
// 更新订单信息
orderDao.setPayFlag(2);
orderDaoService.save(orderDao);
// 总价
BigDecimal totalPrice = orderDao.getTotalPrice();
// 当前订单员工信息 // 当前订单员工信息
FtStaffInfoDao staffInfoDao = staffInfoDaoService.getById(orderDao.getStaffId()); FtStaffInfoDao staffInfoDao = staffInfoDaoService.getById(orderDao.getStaffId());
@ -484,15 +502,15 @@ public class ClientController extends BaseController {
BigDecimal balance = staffInfoDao.getBalance(); BigDecimal balance = staffInfoDao.getBalance();
// 更新员工账户补贴余额 // 更新员工账户补贴余额
staffInfoDao.setBalance(balance.add(receipts)); staffInfoDao.setBalance(balance.add(totalPrice));
staffInfoDaoService.updateById(staffInfoDao); staffInfoDaoService.updateById(staffInfoDao);
// 添加补贴流水记录 // 添加补贴流水记录
FtStaffSubsidyDao staffSubsidyDao = new FtStaffSubsidyDao(); FtStaffSubsidyDao staffSubsidyDao = new FtStaffSubsidyDao();
staffSubsidyDao.setStaffId(orderDao.getStaffId()); staffSubsidyDao.setStaffId(orderDao.getStaffId());
// 收支类型 // 退款
staffSubsidyDao.setIncomeType(4); staffSubsidyDao.setIncomeType(4);
staffSubsidyDao.setPrice(receipts); staffSubsidyDao.setPrice(totalPrice);
staffSubsidyDao.setConsumAt(new Date()); staffSubsidyDao.setConsumAt(new Date());
staffSubsidyDao.setOrderId(orderDao.getOrderId()); staffSubsidyDao.setOrderId(orderDao.getOrderId());
staffSubsidyDaoService.save(staffSubsidyDao); staffSubsidyDaoService.save(staffSubsidyDao);