From 1eedb8a57c2eb5c9953dcf058184ebdc6987fbf5 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 24 May 2022 15:14:21 +0800
Subject: [PATCH] Merge branch 'feature/订单服务单代码改造' into alpha
---
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java | 707 +++++++++++++++-------------------------------------------
1 files changed, 189 insertions(+), 518 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java
index 72f57c1..efe99c6 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java
@@ -1,18 +1,17 @@
package com.matrix.system.hive.service.imp;
import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.CollectionUtil;
+import com.alibaba.fastjson.JSON;
import com.google.common.collect.Lists;
import com.matrix.component.asyncmessage.AsyncMessageManager;
import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.exception.GlobleException;
import com.matrix.core.pojo.PaginationVO;
-import com.matrix.core.tools.DateUtil;
import com.matrix.core.tools.LogUtil;
-import com.matrix.core.tools.StringUtils;
import com.matrix.core.tools.WebUtil;
import com.matrix.system.app.dto.OrderListDto;
-import com.matrix.system.app.mapper.SysProjUseMapper;
import com.matrix.system.app.vo.OrderDetailAchieveItemVo;
import com.matrix.system.app.vo.OrderDetailItemVo;
import com.matrix.system.app.vo.OrderDetailVo;
@@ -30,13 +29,14 @@
import com.matrix.system.hive.bean.*;
import com.matrix.system.hive.dao.*;
import com.matrix.system.hive.dto.GoodsSealLimitDto;
+import com.matrix.system.hive.dto.MoneyCardOperationDto;
+import com.matrix.system.hive.dto.ProjUseOperationDto;
import com.matrix.system.hive.dto.SysOrderItemDto;
import com.matrix.system.hive.plugin.util.CollectionUtils;
-import com.matrix.system.hive.plugin.util.MoneyUtil;
import com.matrix.system.hive.pojo.CzXkVo;
-import com.matrix.system.hive.pojo.ShoppingCarItem;
-import com.matrix.system.hive.pojo.ShoppingCarItemsVo;
import com.matrix.system.hive.service.*;
+import com.matrix.system.padApi.dto.PadOrderListDto;
+import com.matrix.system.padApi.vo.PadOrderDetailVo;
import com.matrix.system.score.service.ScoreVipDetailService;
import com.matrix.system.shopXcx.mqTask.AsyncMessageRouting;
import com.matrix.system.wechart.templateMsg.UniformMsgParam;
@@ -44,8 +44,6 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import javax.servlet.http.HttpSession;
-import javax.validation.constraints.NotEmpty;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
@@ -60,17 +58,12 @@
@Autowired
private SysOrderItemDao orderItemDao;
@Autowired
- private SysProjUseDao sysProjUseDao;
+ private SysProjUseService sysProjUseService;
-
- @Autowired
- private SysStoreInfoDao storeInfoDao;
- @Autowired
- private CodeService codeService;
@Autowired
SysVipInfoDao sysVipInfoDao;
@Autowired
- SysOutStoreDao sysOutStoreDao;
+ SysOutStoreService sysOutStoreService;
@Autowired
SysOutStoreItemDao sysOutStoreItemDao;
@Autowired
@@ -106,26 +99,12 @@
@Autowired
private AchieveNewDao achieveNewDao;
- @Autowired
- private WarehouseDao warehouseDao;
@Autowired
private ShoppingGoodsService shoppingGoodsService;
@Autowired
private SysOrderFlowDao sysOrderFlowDao;
-
- @Autowired
- private SysSupplierInfoDao sysSupplierInfoDao;
-
- @Autowired
- private SysInstoreInfoDao sysInstoreInfoDao;
-
- @Autowired
- private SysInstoreDetailDao sysInstoreDetailDao;
-
- @Autowired
- private SysInstoreInfoService sysInstoreInfoService;
@Autowired
BusParameterSettingsDao parameterSettingsDao;
@@ -175,217 +154,104 @@
public void cancelOrder(Long id) {
SysOrder order = sysOrderDao.selectById(id);
- SysUsers sysUsers = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
+
if (order.getStatu().equals(Dictionary.ORDER_STATU_DFK)) {
-
- order.setStatu(Dictionary.ORDER_STATU_YQX);
- order.setArrears(0D);
-
- //发送微信公众号提醒
- UniformMsgParam uniformMsgParam = new UniformMsgParam(order.getCompanyId(), UniformMsgParam.GZH_DDQX);
- uniformMsgParam.put("orderId", order.getId());
- asyncMessageManager.sendMsg(AsyncMessageRouting.SEND_UNIFORM_TEMPLATE_MSG, uniformMsgParam);
-
- sysOrderDao.update(order);
- //保存单据日志
- operationLogService.saveOperation(order.getCompanyId(), order.getShopId(), sysUsers.getSuId(),
- OperationFunctionEnum.ORDER,
- OperationButtonEnum.CANCEL,
- order.getId(),
- order.getOrderNo(),
- order.getVipId(),
- "未付款取消订单");
+ //待付款订单取消
+ cancelDFKOrder(order);
} else {
+ //已付款订单取消
+ cancelYFKOrder(order);
+ }
+ }
- //一个订单只能被取消一次
- if (Dictionary.ORDER_STATU_YQX.equals(order.getStatu())) {
- throw new GlobleException("订单已取消");
- }
-
- List<SysOrderFlow> flows = sysOrderFlowDao.selectByOrderId(id);
- // 非现金收款退回扣卡余额
- for (SysOrderFlow flow : flows) {
- if (SysOrderFlow.PAY_METHOD_CARD.equals(flow.getPayMethod())) {
-
- MoneyCardUse moneyCardUse = moneyCardUseDao.selectById(flow.getCardId());
- MoneyCardUseFlow moneyCardUseFlow = new MoneyCardUseFlow();
-
- if (moneyCardUse != null) {
- // 根据订单明细判断是赠送金额购买还是本金购买
- moneyCardUseFlow.setTotal(flow.getAmount().doubleValue());
- if (SysOrderFlow.IS_GIFT_Y.equals(flow.getIsGift())) {
- moneyCardUse.setGiftMoney(MoneyUtil.add(moneyCardUse.getGiftMoney(), flow.getAmount().doubleValue()));
- } else {
- moneyCardUse.setRealMoney(MoneyUtil.add(moneyCardUse.getRealMoney(), flow.getAmount().doubleValue()));
- }
-
- if (!moneyCardUse.getIsVipCar().equals(Dictionary.FLAG_YES_Y)) {
- if (moneyCardUse.getLastCount() != null) {
- moneyCardUse.setLastCount(moneyCardUse.getLastCount() + 1);
- moneyCardUseFlow.setTimes(1);
- }
- }
- moneyCardUseDao.update(moneyCardUse);
- //插入充值卡变动流水
- SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
- moneyCardUseFlow.setOrderNo(order.getOrderNo());
- moneyCardUseFlow.setCarUseId(moneyCardUse.getId());
- moneyCardUseFlow.setVipId(order.getVipId());
- moneyCardUseFlow.setType(MoneyCardUseFlow.USE_TYPE_ORDRE_CANCEL);
- moneyCardUseFlow.setCreateTime(new Date());
- moneyCardUseFlow.setOperationId(user.getSuId());
- moneyCardUseFlow.setContent(moneyCardUse.getChangeRemark());
- moneyCardUseFlow.setBalance(moneyCardUse.getGiftMoney() + moneyCardUse.getRealMoney());
- moneyCardUseFlowDao.insert(moneyCardUseFlow);
- }
- }
- }
-
- List<SysOrderItem> sysOrderItems = orderItemDao.selectByOrderId(id);
- for (SysOrderItem orderItem : sysOrderItems) {
- // 充值卡类型退款
- if (Dictionary.SHOPPING_GOODS_TYPE_CZK.equals(orderItem.getType())) {
- ShoppingGoods shoppingGoods = shoppingGoodsDao.selectById(orderItem.getGoodsId());
- //删除购买的充值卡
- moneyCardUseDao.deleteByOrderItemId(orderItem.getId());
- } else if (Dictionary.SHOPPING_GOODS_TYPE_XM.equals(orderItem.getType())
- || Dictionary.SHOPPING_GOODS_TYPE_TC.equals(orderItem.getType())) {
- // 项目套餐退款
- // 删除套餐项目使用情况
- sysProjUseDao.deleteByOrderItemId(orderItem.getId());
- } else if (Dictionary.SHOPPING_GOODS_TYPE_ZHK.equals(orderItem.getType())) {
- // 综合卡
- // 删除套餐项目使用情况
- sysProjUseDao.deleteByOrderItemId(orderItem.getId());
- // 删除充值卡
- moneyCardUseDao.deleteByOrderItemId(orderItem.getId());
- }
- }
-
- //删除出库单,恢复库存
- SysOutStore sysOutStore = new SysOutStore();
- sysOutStore.setOrderId(order.getId());
- List<SysOutStore> sysOutStores = sysOutStoreDao.selectByModel(sysOutStore);
- if (sysOutStores.size() == 1) {
- sysOutStore = sysOutStores.get(0);
- List<SysOutStoreItem> outStoreItemList = sysOutStoreItemDao.selectByOrderId(sysOutStore.getId());
- for (SysOutStoreItem item : outStoreItemList) {
- SysStoreInfo sysStoreInfo = storeInfoDao.selectById(item.getStoreId());
- sysStoreInfo.setStoreTotal(sysStoreInfo.getStoreTotal() + item.getAmount());
- //更新库存
- storeInfoDao.update(sysStoreInfo);
- }
- sysOutStoreDao.deleteById(sysOutStore.getId());
- sysOutStoreItemDao.deleteByOrderId(sysOutStore.getId());
- }
- // 删除业绩
- AchieveNew achieveNew = new AchieveNew();
- achieveNew.setOrderId(id);
- achieveNewService.removeByModel(achieveNew);
-
- // 删除收款记录
- sysOrderFlowDao.deleteByOrderId(id);
-
- //删除积分
- scoreVipDetailService.removeByBusinessId(order.getVipId(), order.getId());
-
- // 取消订单
- order.setStatu(Dictionary.ORDER_STATU_YQX);
- sysOrderDao.update(order);
- //保存单据日志
- operationLogService.saveOperation(order.getCompanyId(), order.getShopId(), sysUsers.getSuId(),
- OperationFunctionEnum.ORDER,
- OperationButtonEnum.CANCEL,
- order.getId(),
- order.getOrderNo(),
- order.getVipId(),
- "已付款取消订单");
+ /**
+ * 已付款订单取消
+ *
+ * @param order
+ */
+ private void cancelYFKOrder(SysOrder order) {
+ SysUsers sysUsers = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
+ //一个订单只能被取消一次
+ if (Dictionary.ORDER_STATU_YQX.equals(order.getStatu())) {
+ throw new GlobleException("订单已取消");
}
+ //储值卡退款
+ sysOrderServiceHelper.returnMoneyCardPay(order);
+
+ //套餐项目取消
+ List<SysOrderItem> sysOrderItems = orderItemDao.selectByOrderId(order.getId());
+ for (SysOrderItem orderItem : sysOrderItems) {
+ // 充值卡类型退款
+ if (Dictionary.SHOPPING_GOODS_TYPE_CZK.equals(orderItem.getType())) {
+ //删除购买的充值卡
+ moneyCardUseService.deleteByOrderItemId(orderItem.getId());
+ } else if (Dictionary.SHOPPING_GOODS_TYPE_XM.equals(orderItem.getType())
+ || Dictionary.SHOPPING_GOODS_TYPE_TC.equals(orderItem.getType())) {
+ // 项目套餐退款
+ // 删除套餐项目使用情况
+ sysProjUseService.deleteByOrderItemId(orderItem.getId());
+ }
+ }
+
+ //删除出库单,恢复库存
+ SysOutStore sysOutStore = new SysOutStore();
+ sysOutStore.setOrderId(order.getId());
+ List<SysOutStore> sysOutStores = sysOutStoreService.findByModel(sysOutStore);
+ if (sysOutStores.size() == 1) {
+ sysOutStore = sysOutStores.get(0);
+ sysOutStoreService.cancelOutStore(sysOutStore.getId());
+ }
+
+ // 删除业绩
+ achieveNewService.removeByOrderId(order.getId());
+
+ // 删除收款记录
+ sysOrderFlowDao.deleteByOrderId(order.getId());
+
+ //删除积分
+ scoreVipDetailService.removeByBusinessId(order.getVipId(), order.getId());
+
+ // 取消订单
+ order.setStatu(Dictionary.ORDER_STATU_YQX);
+ sysOrderDao.update(order);
+
+ //保存单据日志
+ operationLogService.saveOperation(order.getCompanyId(), order.getShopId(), sysUsers.getSuId(),
+ OperationFunctionEnum.ORDER,
+ OperationButtonEnum.CANCEL,
+ order.getId(),
+ order.getOrderNo(),
+ order.getVipId(),
+ "已付款取消订单");
}
-
/**
- * 创建订单 lk
+ * 待付款订单取消
+ *
+ * @param order
*/
- @Override
- @Transactional(rollbackFor = Exception.class)
- public int createOrder(HttpSession session, ShoppingCarItemsVo car) {
+ private void cancelDFKOrder(SysOrder order) {
- if (car.getCarItems().size() < 1) {
- throw new GlobleException("没用选择购买产品");
- }
- // 获取会员信息,判断等级 获取相应家居折扣
- SysVipInfo info = sysVipInfoDao.selectById(car.getVipId());
+ SysUsers sysUsers = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
+ order.setStatu(Dictionary.ORDER_STATU_YQX);
+ order.setArrears(0D);
- //获取折扣-----
- Double zk = zk = 1.0;
+ //发送微信公众号提醒
+ UniformMsgParam uniformMsgParam = new UniformMsgParam(order.getCompanyId(), UniformMsgParam.GZH_DDQX);
+ uniformMsgParam.put("orderId", order.getId());
+ asyncMessageManager.sendMsg(AsyncMessageRouting.SEND_UNIFORM_TEMPLATE_MSG, uniformMsgParam);
- SysOrder order = new SysOrder();
- SysUsers user = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
- order.setShopId(user.getShopId());
- order.setOrderNo(codeService.getOrderCode());
- order.setVipId(info.getId());
- order.setOrderTime(new Date());
- order.setRemark(car.getRemark());
- order.setStaffId(user.getSuId());
- order.setIsCross(2 + "");
- order.setChangeId(car.getChangeId());
- order.setStatu(Dictionary.ORDER_STATU_DFK);
- order.setCardPay(0.00);
- order.setCashPay(0.00);
- order.setCompanyId(user.getCompanyId());
- order.setBeatuyId(car.getBeatuyId() + "");
- // 根据美疗师id查询美疗师姓名
- if (car.getBeatuyId() != null) {
- String beatuyName = shopStaffInfoDao.selectById(car.getBeatuyId()).getSuName();
- System.out.println("美疗师：" + beatuyName);
- order.setBeatuyName(beatuyName);
- }
- int i = sysOrderDao.insert(order);
- // 创建订单明细,并计算总价与折扣总价
- // 总价
- double total = 0;
- double zkTotal = 0;
- int count = 0;
- // 设置订单条目
- for (ShoppingCarItem carItem : car.getCarItems()) {
-
- SysOrderItem orderItem = new SysOrderItem();
- orderItem.setOrderId(order.getId());
- orderItem.setCount(carItem.getCount());
- orderItem.setIsFree(carItem.getIsFree());
- orderItem.setType(carItem.getType());
- orderItem.setStatus(Dictionary.ORDER_STATU_DFK);
- // 新增明细
- // 设置商品id
- orderItem.setGoodsId(carItem.getGoodsId());
- // 设置assembleId
- orderItem.setAssembleId(carItem.getAssembleId());
- // 如果是家居产品的话，要取出组合sku中的价格
- double p = carItem.getShoppingGoods().getSealPice();
- orderItem.setPrice(p);
- if (carItem.getIsFree().equals(Dictionary.FLAG_NO)) {
- orderItem.setZkPrice(MoneyUtil.mul(p, zk));
- } else {
- // 如果是免费,则设置为0.0
- orderItem.setZkPrice(0.0);
- }
-
-
- orderItemDao.insert(orderItem);
- total = MoneyUtil.add(total,
- MoneyUtil.mul(orderItem.getPrice(), Double.parseDouble(carItem.getCount() + "")));
- zkTotal = MoneyUtil.add(zkTotal,
- MoneyUtil.mul(orderItem.getZkPrice(), Double.parseDouble(carItem.getCount() + "")));
- }
-
- // 设置订单总价与折后价
- order.setTotal(total);
- order.setZkTotal(zkTotal);
sysOrderDao.update(order);
- return i;
+ //保存单据日志
+ operationLogService.saveOperation(order.getCompanyId(), order.getShopId(), sysUsers.getSuId(),
+ OperationFunctionEnum.ORDER,
+ OperationButtonEnum.CANCEL,
+ order.getId(),
+ order.getOrderNo(),
+ order.getVipId(),
+ "未付款取消订单");
}
@@ -394,16 +260,13 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public void updateReceiptMoney(SysOrder pageOrder) throws GlobleException {
+ public void payOrder(SysOrder pageOrder) throws GlobleException {
//校验订单是否满足收款条件
- checkOrder(pageOrder);
+ checkOrderAblePay(pageOrder);
// 更新订单主表信息
- updateOrderInfo(pageOrder);
-
- // 设置用户为成交客户
- sysVipInfoService.updateDealStatus(pageOrder.getVipId(), BooleanEnum.TRUE.getValue());
+ payEndUpdateOrderInfo(pageOrder);
//添加支付流水
sysOrderServiceHelper.addOrderFlow(pageOrder, false);
@@ -413,7 +276,6 @@
// 设置会员充值卡使用情况
sysOrderServiceHelper.addMoneyCardUse(pageOrder);
-
// 改变客户项目套餐使用情况
sysOrderServiceHelper.addTaocanProj(pageOrder);
@@ -453,7 +315,7 @@
*
* @param pageOrder
*/
- private void updateOrderInfo(SysOrder pageOrder) {
+ private void payEndUpdateOrderInfo(SysOrder pageOrder) {
LogUtil.info("付款更新订单信息 id={}", pageOrder.getId());
SysUsers user = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
pageOrder.setCashierId(user.getSuId());
@@ -490,11 +352,16 @@
sysOrderDao.update(pageOrder);
-
-
+ // 设置用户为成交客户
+ sysVipInfoService.updateDealStatus(pageOrder.getVipId(), BooleanEnum.TRUE.getValue());
}
- private void checkOrder(SysOrder pageOrder) {
+ /**
+ * 检查订单是否满足支付条件
+ *
+ * @param pageOrder
+ */
+ private void checkOrderAblePay(SysOrder pageOrder) {
SysOrder checkOrder = sysOrderDao.selectById(pageOrder.getId());
@@ -602,91 +469,36 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public SysOrder updateAddCardMoney(CzXkVo czVo) {
- SysUsers user = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
-
-// SysVipInfo vip = (SysVipInfo) WebUtil.getSession().getAttribute(SystemConstance.CURRENT_CUSTOMER);
-// czVo.setVipId(vip.getId());
-
- //更新会员会员卡金额
- MoneyCardUse cardUser = moneyCardUseDao.selectVipCard(czVo.getVipId());
- cardUser.setRealMoney(MoneyUtil.add(cardUser.getRealMoney(), czVo.getBjmoney()));
- cardUser.setGiftMoney(MoneyUtil.add(cardUser.getGiftMoney(), czVo.getGiftMoney()));
- moneyCardUseDao.update(cardUser);
-
-
- // 为会员新增积分
- SysVipInfo vipInfo = sysVipInfoDao.selectById(cardUser.getVipId());
- vipInfo.setPointAll(vipInfo.getPointAll() == null ? 0 : vipInfo.getPointAll() + czVo.getJf());
- sysVipInfoDao.update(vipInfo);
-
+ public SysOrder moneyCardCz(CzXkVo czVo) {
// 新增一个充值订单
- SysOrder order = new SysOrder();
- order.setArrears(0D);
- order.setTotal(czVo.getBjmoney());
- order.setZkTotal(czVo.getBjmoney());
- order.setCashPay(czVo.getBjmoney());
- order.setShopId(user.getShopId());
- order.setOrderNo(codeService.getOrderCode());
- order.setVipId(czVo.getVipId());
- Date orderTime = new Date();
- if (StringUtils.isNotBlank(czVo.getDateTime())) {
- orderTime = DateUtil.stringToDateNew(czVo.getDateTime(), DateUtil.DATE_FORMAT_DD);
- }
- order.setOrderTime(orderTime);
- order.setPayTime(orderTime);
- order.setRemark(cardUser.getCardName());
- order.setStaffId(user.getSuId());
- order.setIsCross(2 + "");
- order.setOrderType(SysOrder.ORDER_TYPE_SEAL);
- order.setStatu(Dictionary.ORDER_STATU_YFK);
- order.setCompanyId(user.getCompanyId());
- sysOrderDao.insert(order);
+ SysOrder order = sysOrderServiceHelper.createCzOrder(czVo);
- SysOrderItem orderItem = new SysOrderItem();
- orderItem.setOrderId(order.getId());
- orderItem.setOrderNo(order.getOrderNo());
- orderItem.setArrears(0D);
- ShoppingGoods shoppingGoods = shoppingGoodsDao.selectVipCzGoods();
- orderItem.setGoodsId(shoppingGoods.getId());
- orderItem.setPayMethod(Dictionary.PAY_TYPE_MOENY);
- orderItem.setCashPay(czVo.getBjmoney());
- orderItem.setZkPrice(czVo.getBjmoney());
- orderItem.setCardPay(0D);
- orderItem.setType(Dictionary.SHOPPING_GOODS_TYPE_CZK);
- orderItem.setCount(1);
- orderItem.setIsFree(Dictionary.FLAG_NO);
- orderItem.setPrice(czVo.getBjmoney());
- orderItem.setStatus(Dictionary.ORDER_STATU_YFK);
- orderItem.setAchieveList(czVo.getAchaeveList());
- orderItem.setShoppingGoods(shoppingGoods);
- orderItemDao.insert(orderItem);
- List<SysOrderItem> items = new ArrayList<>();
- items.add(orderItem);
- order.setItems(items);
+ //新增会员卡金额
+ MoneyCardUse cardUser = moneyCardUseDao.selectVipCard(czVo.getVipId());
+ MoneyCardOperationDto moneyCardOperationDto = new MoneyCardOperationDto();
+ moneyCardOperationDto.setRealMoney(czVo.getBjmoney());
+ moneyCardOperationDto.setGiftMoney(czVo.getGiftMoney());
+ moneyCardOperationDto.setCarUseId(cardUser.getId());
+ moneyCardOperationDto.setOrderId(order.getId());
+ moneyCardOperationDto.setOrderNo(order.getOrderNo());
+ moneyCardOperationDto.setType(MoneyCardUseFlow.USE_TYPE_CZ);
+ SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
+ moneyCardOperationDto.setUpdateUser(user.getSuId());
+ moneyCardUseService.changeMoneyCard(Arrays.asList(moneyCardOperationDto));
- //设置卡项使用流水
- MoneyCardUseFlow moneyCardUseFlow = new MoneyCardUseFlow();
- moneyCardUseFlow.setTotal(czVo.getBjmoney());
- moneyCardUseFlow.setGiftMoney(czVo.getGiftMoney());
- moneyCardUseFlow.setCarUseId(czVo.getCardId());
- moneyCardUseFlow.setVipId(czVo.getVipId());
- moneyCardUseFlow.setType(MoneyCardUseFlow.USE_TYPE_CZ);
- moneyCardUseFlow.setOrderNo(order.getOrderNo());
- moneyCardUseFlow.setCreateTime(new Date());
- moneyCardUseFlow.setOperationId(user.getSuId());
- moneyCardUseFlow.setBalance(cardUser.getGiftMoney() + cardUser.getRealMoney());
- moneyCardUseFlow.setCarUseId(cardUser.getId());
- moneyCardUseFlowDao.insert(moneyCardUseFlow);
+ // 更新订单主表信息
+ payEndUpdateOrderInfo(order);
- order.setFlows(czVo.getFlows());
-
+ //添加支付流水
sysOrderServiceHelper.addOrderFlow(order, false);
- // 添加员工业绩
+ // 设置业绩
achieveNewService.addAchaeveByOrder(order);
+
+ //设置会员积分
+ sysOrderServiceHelper.addVipScore(order);
return order;
@@ -704,8 +516,25 @@
}
@Override
+ public List<PadOrderDetailVo> findPadApiOrderListInPage(PadOrderListDto orderListDto, PaginationVO pageVo) {
+ List<PadOrderDetailVo> padOrderDetailVos = sysOrderDao.selectPadApiOrderListInPage(orderListDto, pageVo);
+ if(CollUtil.isNotEmpty(padOrderDetailVos)){
+ for(PadOrderDetailVo padOrderDetailVo : padOrderDetailVos){
+ padOrderDetailVo.setItems(orderItemDao.selectApiOrderDetailItemsByOrderId(Long.parseLong(padOrderDetailVo.getOrderId())));
+ }
+ }
+
+ return padOrderDetailVos;
+ }
+
+ @Override
public int findApiOrderListTotal(OrderListDto orderListDto) {
return sysOrderDao.selectApiOrderListTotal(orderListDto);
+ }
+
+ @Override
+ public int findPadApiOrderListTotal(PadOrderListDto orderListDto) {
+ return sysOrderDao.selectPadApiOrderListTotal(orderListDto);
}
@Override
@@ -733,59 +562,25 @@
return sysOrderDao.selectShopAchieveRanking(sysOrder);
}
+
@Transactional(rollbackFor = Exception.class)
@Override
- public void refundOrderMoney(SysOrder sysOrder) {
- SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
+ public void orderTk(SysOrder sysOrder) {
- //原订单设置为退款状态
- SysOrder sourceOrder = new SysOrder();
- sourceOrder.setId(sysOrder.getOldOrderId());
- sourceOrder.setIsHasRefund(SysOrder.IS_HAS_REFUND_Y);
-// sourceOrder.setStatu(Dictionary.ORDER_STATU_TK);
- sysOrderDao.update(sourceOrder);
- SysOrder oldOrder = sysOrderDao.selectById(sysOrder.getOldOrderId());
-
- sysOrder.setId(null);
- sysOrder.setStaffId(user.getSuId());
- sysOrder.setCompanyId(user.getCompanyId());
- sysOrder.setShopId(user.getShopId());
- sysOrder.setOrderType(SysOrder.ORDER_TYPE_REFUND);
- sysOrder.setStatu(Dictionary.ORDER_STATU_YFK);
- Date now = new Date();
- sysOrder.setOrderTime(now);
- sysOrder.setPayTime(now);
- sysOrder.setOrderNo(codeService.getRefundOrderNo());
- sysOrder.setZkTotal(-sysOrder.getZkTotal());
- //新增订单
- sysOrderDao.insert(sysOrder);
- //插入明细
- for (SysOrderItem item : sysOrder.getItems()) {
-
- //更新原订单明细的可退数量
- SysOrderItem oldItem = new SysOrderItem();
- oldItem.setId(item.getId());
- oldItem.setRefundCount(item.getCount());
- orderItemDao.update(oldItem);
-
- //插入新的订单明细
- item.setId(null);
- item.setCount(-item.getCount());
- item.setOrderId(sysOrder.getId());
- orderItemDao.insert(item);
- }
-
-
+ //创建并保存退款订单
+ sysOrder = sysOrderServiceHelper.createTkOrder(sysOrder);
// 添加订单收款流水
sysOrderServiceHelper.addOrderFlow(sysOrder, false);
//退款退套餐退项目
refundProjUse(sysOrder);
//删除积分
+ SysOrder oldOrder = sysOrderDao.selectById(sysOrder.getOldOrderId());
scoreVipDetailService.removeByBusinessId(oldOrder.getVipId(), oldOrder.getId());
// 设置业绩
achieveNewService.addAchaeveByOrder(sysOrder);
+ SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
//保存单据日志
operationLogService.saveOperation(sysOrder.getCompanyId(), sysOrder.getShopId(), user.getSuId(),
OperationFunctionEnum.ORDER,
@@ -796,199 +591,75 @@
}
-
- private void refundCard(MoneyCardUse moneyCardUse, SysOrder sourceOrder, SysOrderFlow flow) {
- SysUsers user = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
-
- MoneyCardUseFlow moneyCardUseFlow = new MoneyCardUseFlow();
- if (SysOrderFlow.IS_GIFT_Y.equals(flow.getIsGift())) {
- if (moneyCardUse.getGiftMoney() >= flow.getAmount().doubleValue()) {
- double surplus = MoneyUtil.sub(moneyCardUse.getGiftMoney(), flow.getAmount().doubleValue());
- moneyCardUse.setGiftMoney(surplus);
- moneyCardUseFlow.setGiftMoney(0D - flow.getAmount().doubleValue());
- } else {
- throw new GlobleException(moneyCardUse.getCardName() + "余额不足");
- }
- } else {
- if (moneyCardUse.getRealMoney() >= flow.getAmount().doubleValue()) {
- double surplus = MoneyUtil.sub(moneyCardUse.getRealMoney(), flow.getAmount().doubleValue());
- moneyCardUse.setRealMoney(surplus);
- moneyCardUseFlow.setTotal(0 - flow.getAmount().doubleValue());
- } else {
- throw new GlobleException(moneyCardUse.getCardName() + "余额不足");
- }
- }
-
- if (moneyCardUse.getIsVipCar().equals(Dictionary.FLAG_NO_N)) {
- //余额为0时充值卡变为无效
- if (moneyCardUse.getRealMoney().equals(0D) && moneyCardUse.getGiftMoney().equals(0D)) {
- moneyCardUse.setIsOver(Dictionary.FLAG_YES_Y);
- moneyCardUse.setStatus(Dictionary.MONEYCARD_STATUS_WX);
- }
- }
-
- ShoppingGoods shoppingGoods = shoppingGoodsService.findById(moneyCardUse.getGoodsId());
- if (shoppingGoods != null) {
- Date invalidTime = shoppingGoodsService.calInvalidTime(shoppingGoods, 2, moneyCardUse.getFailTime());
- moneyCardUse.setFailTime(invalidTime);
- }
- // 更新充值卡信息
- moneyCardUseDao.update(moneyCardUse);
- //设置卡项使用流水
- moneyCardUseFlow.setCarUseId(moneyCardUse.getId());
- moneyCardUseFlow.setOrderNo(sourceOrder.getOrderNo());
- moneyCardUseFlow.setVipId(sourceOrder.getVipId());
- moneyCardUseFlow.setTimes(-1);
- moneyCardUseFlow.setType(MoneyCardUseFlow.USE_TYPE_CONSUMER);
- moneyCardUseFlow.setCreateTime(new Date());
- moneyCardUseFlow.setOperationId(user.getSuId());
- moneyCardUseFlow.setBalance(moneyCardUse.getGiftMoney() + moneyCardUse.getRealMoney());
- moneyCardUseFlowDao.insert(moneyCardUseFlow);
- }
-
/**
* 退款退项目，套餐，卡项
*
* @param sysOrder
*/
private void refundProjUse(SysOrder sysOrder) {
+
SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
//记录需要退库存的产品
List<SysOrderItem> returnGoodsList = new ArrayList<>();
+ //需要退的套餐和项目
+ List<ProjUseOperationDto> projUseDtoList = Lists.newArrayList();
+ //需要退的储值卡
+ List<MoneyCardOperationDto> moneyCardOperationDtos = Lists.newArrayList();
for (SysOrderItem item : sysOrder.getItems()) {
- SysProjUse queryProjUse = new SysProjUse();
- queryProjUse.setOrderItemId(item.getOldItemId());
- // 修改项目信息
- if (Dictionary.SHOPPING_GOODS_TYPE_XM.equals(item.getType()) || Dictionary.SHOPPING_GOODS_TYPE_JJCP.equals(item.getType())) {
+ if (Dictionary.SHOPPING_GOODS_TYPE_JJCP.equals(item.getType()) && Dictionary.FLAG_YES_Y.equals(item.getIsReturnStore())) {
- if (Dictionary.SHOPPING_GOODS_TYPE_JJCP.equals(item.getType())) {
- if (Dictionary.FLAG_YES_Y.equals(item.getIsReturnStore())) {
- returnGoodsList.add(item);
- }
- } else {
- SysProjUse sysProjUse = sysProjUseDao.selectByModel(queryProjUse).get(0);
+ returnGoodsList.add(item);
- int sub = sysProjUse.getSurplusCount() - item.getCount();
- if (sub < 0) {
- throw new GlobleException("项目余次不足");
- } else if (sub == 0) {
- sysProjUse.setIsOver(Dictionary.FLAG_YES_Y);
- sysProjUse.setStatus(Dictionary.TAOCAN_STATUS_WX);
- }
- sysProjUse.setSurplusCount(sub);
- sysProjUseDao.update(sysProjUse);
- SysProjUseFlow sysProjUseFlow = SysProjUseMapper.INSTANCE.projUseToFlow(sysProjUse);
- sysProjUseFlow.setOptionType("退款修改");
- sysProjUseFlow.setId(null);
- sysProjUseFlow.setUpdateBy(user.getSuName());
- sysProjUseFlow.setCreateBy(user.getSuName());
- sysProjUseDao.insertFlow(sysProjUseFlow);
- }
+ } else if (Dictionary.SHOPPING_GOODS_TYPE_TC.equals(item.getType())
+ || Dictionary.SHOPPING_GOODS_TYPE_XM.equals(item.getType())) {
+ ProjUseOperationDto dto = new ProjUseOperationDto();
+ dto.setGoodsId(item.getGoodsId());
+ dto.setCount(item.getRefundCount());
+ dto.setOrderItemId(item.getOldItemId());
+ dto.setUpdateUserId(user.getSuId());
+ projUseDtoList.add(dto);
+
+ }else if (Dictionary.SHOPPING_GOODS_TYPE_CZK.equals(item.getType())) {
+ MoneyCardOperationDto moneyCardOperationDto = new MoneyCardOperationDto();
+ moneyCardOperationDto.setOrderId(sysOrder.getId());
+ moneyCardOperationDto.setOrderNo(sysOrder.getOrderNo());
+ moneyCardOperationDto.setOrderItemId(item.getOldItemId());
+ moneyCardOperationDto.setType(MoneyCardUseFlow.USE_TYPE_ORDRE_TK);
+ moneyCardOperationDto.setUpdateUser(user.getSuId());
+ moneyCardOperationDto.setOrderNo(sysOrder.getOrderNo());
+ moneyCardOperationDto.setRealMoney(item.getZkPrice());
+ moneyCardOperationDtos.add(moneyCardOperationDto);
}
-
- if (Dictionary.SHOPPING_GOODS_TYPE_TC.equals(item.getType())) {
- queryProjUse.setTaocanId(-1L);
- List<SysProjUse> sysProjUses = sysProjUseDao.selectByModel(queryProjUse);
-
-
- for (int i = 0; i < sysProjUses.size(); i++) {
-
- SysProjUse sysProjUse = sysProjUses.get(i);
- sysProjUse.setIsOver(Dictionary.FLAG_YES_Y);
- sysProjUse.setStatus(Dictionary.TAOCAN_STATUS_WX);
- sysProjUseDao.update(sysProjUse);
- SysProjUseFlow sysProjUseFlow = SysProjUseMapper.INSTANCE.projUseToFlow(sysProjUse);
- sysProjUseFlow.setOptionType("退款修改");
- sysProjUseFlow.setId(null);
- sysProjUseFlow.setUpdateBy(user.getSuName());
- sysProjUseFlow.setCreateBy(user.getSuName());
- sysProjUseDao.insertFlow(sysProjUseFlow);
- }
- }
-
- if (Dictionary.SHOPPING_GOODS_TYPE_CZK.equals(item.getType())) {
- MoneyCardUse queryCardUse = new MoneyCardUse();
- queryCardUse.setStatus(Dictionary.TAOCAN_STATUS_YX);
- queryCardUse.setOrderItemId(item.getOldItemId());
-
- List<MoneyCardUse> moneyCardUses = moneyCardUseDao.selectByModel(queryCardUse);
- for (int i = 0; i < item.getCount(); i++) {
- MoneyCardUse moneyCardUse = moneyCardUses.get(i);
- moneyCardUse.setIsOver(Dictionary.FLAG_YES_Y);
- moneyCardUse.setStatus(Dictionary.MONEYCARD_STATUS_WX);
- moneyCardUseDao.update(moneyCardUse);
- }
- }
-
- // TODO 综合卡退款
- if (Dictionary.SHOPPING_GOODS_TYPE_ZHK.equals(item.getType())) {
-
- }
-
-
- ShoppingGoods goods = shoppingGoodsDao.selectById(item.getGoodsId());
- goods.setRealSealCount(goods.getRealSealCount() - item.getCount());
- shoppingGoodsDao.update(goods);
}
BusParameterSettings manageStockSetting = busParameterSettingsDao.selectCompanyParamByCode(AppConstance.WAREHOUSE_MANAGE_STOCK, sysOrder.getCompanyId());
- if (AppConstance.IS_Y.equals(manageStockSetting.getParamValue())) {
+// if (AppConstance.IS_Y.equals(manageStockSetting.getParamValue())) {
+ if (BooleanEnum.TRUE.getValue() == manageStockSetting.getIntParamValue()) {
// 家居产品退库存
if (CollectionUtils.isNotEmpty(returnGoodsList)) {
- refundInstore(returnGoodsList);
+ LogUtil.info("订单退款：退产品库存：{}", JSON.toJSONString(returnGoodsList));
+ sysOrderServiceHelper.refundInstore(returnGoodsList);
}
}
- }
-
- /**
- * 退款入库
- */
- private void refundInstore(@NotEmpty List<SysOrderItem> items) {
- SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
- SysSupplierInfo supplierInfo = new SysSupplierInfo();
- supplierInfo.setShopId(user.getShopId());
- supplierInfo = sysSupplierInfoDao.selectByModel(supplierInfo).get(0);
-
- Warehouse warehouse = warehouseDao.findShopWarehouse(user.getShopId()).get(0);
- SysInstoreInfo instoreInfo = new SysInstoreInfo();
- instoreInfo.setInstoreType(SysInstoreInfo.INSTORE_TYPE_RETURN);
- instoreInfo.setInstoreDate(new Date());
- instoreInfo.setSupplierId(supplierInfo.getId().toString());
- instoreInfo.setStoreId(warehouse.getId());
- instoreInfo.setCheckStatus(Dictionary.CHECK_STATUS_DSH);
- // 设置入库单编号
- instoreInfo.setInstoreId(DateUtil.getTimeMark());
- instoreInfo.setShopId(user.getShopId());
- instoreInfo.setCompanyId(user.getCompanyId());
- sysInstoreInfoDao.insert(instoreInfo);
-
- Double total = 0.0;
- List<SysInstoreDetail> instoreDetails = new ArrayList<>();
- for (SysOrderItem item : items) {
- ShoppingGoods goods = shoppingGoodsDao.selectById(item.getGoodsId());
- SysInstoreDetail sysInstoreDetail = new SysInstoreDetail();
- sysInstoreDetail.setAmount(item.getCount().doubleValue());
- sysInstoreDetail.setPrice(item.getZkPrice());
- sysInstoreDetail.setSkuId(goods.getId());
-
- total = MoneyUtil.add(MoneyUtil.mul(Double.parseDouble(sysInstoreDetail.getAmount() + ""), sysInstoreDetail.getPrice()), total);
- sysInstoreDetail.setInstoreId(instoreInfo.getId());
- // 设置小计
- sysInstoreDetail.setPriceTotal(MoneyUtil.mul(Double.parseDouble(sysInstoreDetail.getAmount() + ""), sysInstoreDetail.getPrice()));
- instoreDetails.add(sysInstoreDetail);
-
+ if(CollUtil.isNotEmpty(projUseDtoList)){
+ LogUtil.info("订单退款：退套餐项目：{}", JSON.toJSONString(projUseDtoList));
+ sysProjUseService.projectTk(projUseDtoList);
}
- instoreInfo.setSumall(total);
- sysInstoreInfoDao.update(instoreInfo);
- sysInstoreDetailDao.batchInsert(instoreDetails);
- sysInstoreInfoService.check(instoreInfo);
+ if(CollUtil.isNotEmpty(moneyCardOperationDtos)){
+ LogUtil.info("订单退款：储值卡：{}", JSON.toJSONString(moneyCardOperationDtos));
+ moneyCardUseService.moneyCardTk(moneyCardOperationDtos);
+ }
}
+
+
+
+
@Override
public BigDecimal findVipArrearsByVipId(Long vipId) {
return sysOrderDao.selectArrearsByVipId(vipId);
--
Gitblit v1.9.1