From baa1c7ecdc47c5da14790b422007ce21e0547ffa Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Fri, 18 Mar 2022 00:50:23 +0800
Subject: [PATCH] 重构：订单创建和修改方法
---
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java | 1291 +++++++++++----------------------------------------------
1 files changed, 263 insertions(+), 1,028 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 0e85cd7..72f57c1 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,6 +1,9 @@
package com.matrix.system.hive.service.imp;
-import com.matrix.component.rabbitmq.RabiitMqTemplate;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
+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;
@@ -19,32 +22,33 @@
import com.matrix.system.common.constance.AppConstance;
import com.matrix.system.common.dao.BusParameterSettingsDao;
import com.matrix.system.common.dao.SysUsersDao;
+import com.matrix.system.common.service.OperationLogService;
import com.matrix.system.constance.Dictionary;
+import com.matrix.system.enums.BooleanEnum;
+import com.matrix.system.enums.OperationButtonEnum;
+import com.matrix.system.enums.OperationFunctionEnum;
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.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.score.constant.ScoreSettingConstant;
-import com.matrix.system.score.entity.ScoreVipDetail;
import com.matrix.system.score.service.ScoreVipDetailService;
-import com.matrix.system.shopXcx.mqTask.MQTaskRouting;
+import com.matrix.system.shopXcx.mqTask.AsyncMessageRouting;
import com.matrix.system.wechart.templateMsg.UniformMsgParam;
-import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
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.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* @date 2016-07-03 20:53
@@ -57,6 +61,8 @@
private SysOrderItemDao orderItemDao;
@Autowired
private SysProjUseDao sysProjUseDao;
+
+
@Autowired
private SysStoreInfoDao storeInfoDao;
@Autowired
@@ -124,154 +130,52 @@
@Autowired
BusParameterSettingsDao parameterSettingsDao;
- @Value("${evn}")
- private String evn;
+ @Autowired
+ private AsyncMessageManager asyncMessageManager;
@Autowired
- private RabiitMqTemplate rabiitMqTemplate;
+ private OperationLogService operationLogService;
+ @Autowired
+ private SysVipInfoService sysVipInfoService;
+
+ @Autowired
+ private SysOrderServiceHelper sysOrderServiceHelper;
+
+
+ @Autowired
+ MoneyCardUseService moneyCardUseService;
+
+
+ //↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓业务代码区↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓
@Override
- public int add(SysOrder sysOrder) {
- return sysOrderDao.insert(sysOrder);
- }
-
- @Override
- public int modify(SysOrder sysOrder) {
-
- return sysOrderDao.update(sysOrder);
-
- }
-
- @Override
- public int remove(List<Long> list) {
-
- return sysOrderDao.deleteByIds(list);
-
- }
-
- @Override
- @Transactional
- public int removeById(Long id) {
- orderItemDao.deleteByOrderId(id);
- return sysOrderDao.deleteById(id);
- }
-
- @Override
- public List<SysOrder> findInPage(SysOrder sysOrder, PaginationVO pageVo) {
- if (pageVo != null) {
- pageVo.setSort("desc");
- pageVo.setSort("orderTime");
- }
- return sysOrderDao.selectInPage(sysOrder, pageVo);
- }
-
-
- @Override
- public List<SysOrder> findByModel(SysOrder sysOrder) {
- return sysOrderDao.selectByModel(sysOrder);
- }
-
-
- @Override
- public int findTotal(SysOrder sysOrder) {
-
- return sysOrderDao.selectInPageCount(sysOrder);
-
- }
-
- @Override
- public SysOrder findById(Long id) {
- return sysOrderDao.selectById(id);
-
- }
-
-
- @Override
+ @Transactional(rollbackFor = Exception.class)
public SysOrder checkAndSaveOrder(SysOrder sysOrder) {
- // 计算订单折扣金额,收款情况下 计算订单总额
- double zkTotal = 0.0;
-
- // 判断是否为退款
- String orderStatus = Dictionary.ORDER_STATU_DFK;
- if (Dictionary.ORDER_STATU_TK.equals(sysOrder.getStatu())) {
- orderStatus = Dictionary.ORDER_STATU_TK;
- }
-
- // 页面的pageOrder 参数只包含支付金额信息，不带有购买商品
- for (SysOrderItem item : sysOrder.getItems()) {
- // 若为退款，则先更新原有数量
- if (orderStatus.equals(Dictionary.ORDER_STATU_TK)) {
- SysOrderItem sysOrderItem = new SysOrderItem();
- sysOrderItem.setId(item.getId());
- sysOrderItem.setCount(item.getPreCount() - item.getCount());
- orderItemDao.update(sysOrderItem);
- }
- item.setId(null);
-
- ShoppingGoods shoppingGoods = shoppingGoodsDao.selectById(item.getGoodsId());
- item.setType(shoppingGoods.getGoodType());
- if (item.getZkPrice() == 0) {
- item.setIsFree(Dictionary.FLAG_YES);
- }
-
- // 订单欠款减去支付金额 设置实际欠款
- Double itemZkTotal = MoneyUtil.mul(item.getZkPrice(), Double.valueOf(item.getCount()));
- zkTotal = MoneyUtil.add(zkTotal, itemZkTotal);
- item.setStatus(orderStatus);
- }
-
- SysUsers user = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
- sysOrder.setZkTotal(zkTotal);
- sysOrder.setStatu(orderStatus);
- SysOrder source = null;
- if (sysOrder.getId() != null) {
- source = sysOrderDao.selectById(sysOrder.getId());
- }
- sysOrder.setStaffId(source != null ? source.getStaffId() : user.getSuId());
- sysOrder.setCompanyId(source != null ? source.getCompanyId() : user.getCompanyId());
-
-
- if (sysOrder.getId() == null) {
- //新增订单
- sysOrder.setOrderNo(codeService.getOrderCode());
- sysOrderDao.insert(sysOrder);
-
+ if (Objects.isNull(sysOrder.getId())) {
+ LogUtil.info("新增正向订单");
+ return sysOrderServiceHelper.saveOrder(sysOrder);
} else {
- //更新订单
- sysOrderDao.update(sysOrder);
- //删除原有订单明细
- orderItemDao.deleteByOrderId(sysOrder.getId());
+ LogUtil.info("修改订单");
+ return sysOrderServiceHelper.modifyOrder(sysOrder);
}
- sysOrder.getItems().forEach(sysOrderItem -> {
- sysOrderItem.setOrderId(sysOrder.getId());
- if (sysOrder.getStatu().equals(Dictionary.ORDER_STATU_TK)) {
- // 取负数
- sysOrderItem.setCount(-sysOrderItem.getCount());
- orderItemDao.insert(sysOrderItem);
- // 调整回来
- sysOrderItem.setCount(-sysOrderItem.getCount());
- } else {
- orderItemDao.insert(sysOrderItem);
- }
- });
-
- return sysOrder;
}
/**
* 取消订单
+ *
* @param id
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public int cancelOrder(Long id) {
+ 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);
@@ -280,10 +184,17 @@
//发送微信公众号提醒
UniformMsgParam uniformMsgParam = new UniformMsgParam(order.getCompanyId(), UniformMsgParam.GZH_DDQX);
uniformMsgParam.put("orderId", order.getId());
- rabiitMqTemplate.sendMsg(MQTaskRouting.SEND_UNIFORM_TEMPLATE_MSG + evn, uniformMsgParam.toJSONString());
+ asyncMessageManager.sendMsg(AsyncMessageRouting.SEND_UNIFORM_TEMPLATE_MSG, uniformMsgParam);
- return sysOrderDao.update(order);
-
+ sysOrderDao.update(order);
+ //保存单据日志
+ operationLogService.saveOperation(order.getCompanyId(), order.getShopId(), sysUsers.getSuId(),
+ OperationFunctionEnum.ORDER,
+ OperationButtonEnum.CANCEL,
+ order.getId(),
+ order.getOrderNo(),
+ order.getVipId(),
+ "未付款取消订单");
} else {
//一个订单只能被取消一次
@@ -380,8 +291,17 @@
// 取消订单
order.setStatu(Dictionary.ORDER_STATU_YQX);
- return sysOrderDao.update(order);
+ sysOrderDao.update(order);
+ //保存单据日志
+ operationLogService.saveOperation(order.getCompanyId(), order.getShopId(), sysUsers.getSuId(),
+ OperationFunctionEnum.ORDER,
+ OperationButtonEnum.CANCEL,
+ order.getId(),
+ order.getOrderNo(),
+ order.getVipId(),
+ "已付款取消订单");
}
+
}
@@ -401,8 +321,6 @@
//获取折扣-----
Double zk = zk = 1.0;
- //验证商品是否只购买了一次
- checkBuyOnce(car, info.getId());
SysOrder order = new SysOrder();
SysUsers user = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
@@ -433,8 +351,7 @@
int count = 0;
// 设置订单条目
for (ShoppingCarItem carItem : car.getCarItems()) {
- // 检测最大销售数量
- checkIsArrivedMax(carItem);
+
SysOrderItem orderItem = new SysOrderItem();
orderItem.setOrderId(order.getId());
orderItem.setCount(carItem.getCount());
@@ -473,547 +390,171 @@
/**
- * 验证商品是否购买过一次
- *
- * @Title: checkBuyOnce @author:jyy @param car void 返回类型 @date
- * 2016年9月22日 上午10:05:33 @throws
- */
- private void checkBuyOnce(ShoppingCarItemsVo car, Long vipId) {
- for (ShoppingCarItem carItem : car.getCarItems()) {
- if (shoppingGoodsDao.selectBuyCount(carItem.getGoodsId(), vipId) > 0) {
- ShoppingGoods goods = shoppingGoodsDao.selectById(carItem.getGoodsId());
- throw new GlobleException(goods.getName() + "只能购买一次!");
- }
- }
- }
-
- /**
* jyy 收款
*/
@Override
@Transactional(rollbackFor = Exception.class)
public void updateReceiptMoney(SysOrder pageOrder) throws GlobleException {
- if (!Dictionary.ORDER_STATU_DFK.equals(pageOrder.getStatu())) {
- throw new GlobleException("该订单已经收过款,请刷新页面再试!");
- }
+ //校验订单是否满足收款条件
+ checkOrder(pageOrder);
- //检查交易限制调整
- checkSealLimit(pageOrder);
+ // 更新订单主表信息
+ updateOrderInfo(pageOrder);
- //交易业绩设置是否合理
- checkAchieveIsOk(pageOrder);
-
-
- // 更新收款时间
- pageOrder.setPayTime(new Date());
- pageOrder.setStatu(Dictionary.ORDER_STATU_YFK);
- sysOrderDao.update(pageOrder);
-
- // 获取用户信息
- SysVipInfo vipInfo = sysVipInfoDao.selectById(pageOrder.getVipId());
- if (SysVipInfo.UNDEAL_VIP == vipInfo.getIsDeal()) {
- //非成交客户下单更新客户为成交客户
- vipInfo.setIsDeal(SysVipInfo.DEAL_VIP);
- sysVipInfoDao.update(vipInfo);
- }
+ // 设置用户为成交客户
+ sysVipInfoService.updateDealStatus(pageOrder.getVipId(), BooleanEnum.TRUE.getValue());
//添加支付流水
- addOrderFlow(pageOrder);
+ sysOrderServiceHelper.addOrderFlow(pageOrder, false);
+
+ //扣除储值卡余额
+ sysOrderServiceHelper.cardPaySk(pageOrder);
// 设置会员充值卡使用情况
- addMoneyCardUse(pageOrder);
+ sysOrderServiceHelper.addMoneyCardUse(pageOrder);
// 改变客户项目套餐使用情况
- addTaocanProj(pageOrder);
+ sysOrderServiceHelper.addTaocanProj(pageOrder);
// 新增出库单
- addOutStore(pageOrder);
+ sysOrderServiceHelper.addOutStore(pageOrder);
// 设置业绩
achieveNewService.addAchaeveByOrder(pageOrder);
- setShopSelCount(pageOrder);
-
//设置会员积分
- addVipScore(pageOrder);
+ sysOrderServiceHelper.addVipScore(pageOrder);
+
+ //保存订单收款日志
+ saveOrderSkLog(pageOrder);
}
- /**
- * 检查产品销售次数
- */
- private void checkSealLimit(SysOrder pageOrder) {
- pageOrder.getItems().forEach(item->{
- ShoppingGoods shopGoods = shoppingGoodsDao.selectById(item.getGoodsId());
-
- //最大销售次数检测
- Integer maxNum = shopGoods.getCarMaxSaleCount();
- if (maxNum != null && maxNum != 0) {
- Integer buyNum = orderItemDao.selectByGoodsId(shopGoods.getId(),null);
- if ((buyNum + item.getCount()) > maxNum) {
- throw new GlobleException(shopGoods.getName() + "已超过最大销售数量");
- }
- if ((buyNum + item.getCount()) == maxNum) {
- if (!shopGoods.getStaus().equals(Dictionary.BUSINESS_STATE_DOWN)) {
- shopGoods.setStaus(Dictionary.BUSINESS_STATE_DOWN);
- shoppingGoodsDao.update(shopGoods);
- }
- }
- }
- //每人限购次数检测
- Integer onceCount = shopGoods.getIsOnce();
- if(onceCount!=null && onceCount!=0){
- Integer buyOnceCount = orderItemDao.selectByGoodsId(shopGoods.getId(),pageOrder.getVipId());
-
- if ((buyOnceCount + item.getCount()) > onceCount) {
- throw new GlobleException(shopGoods.getName() + "每人限购"+onceCount+"次");
- }
- }
-
- });
-
- }
/**
- * 交易业绩设置是否合理
- * @param pageOrder
- */
- private void checkAchieveIsOk(SysOrder pageOrder) {
- double huakouSum = pageOrder.getItems().stream()
- .mapToDouble(
- item ->
- item.getAchieveList().stream()
- .filter(achieveNew -> "划扣".equals(achieveNew.getPayMethod()))
- .mapToDouble(achieve -> achieve.getGoodsCash()).sum()
- ).sum();
-
- double czkPay= pageOrder.getFlows().stream()
- .filter(sysOrderFlow -> "储值卡".equals(sysOrderFlow.getPayMethod()))
- .mapToDouble(sysOrderFlow ->sysOrderFlow.getAmount().doubleValue()).sum();
-
- if(czkPay!=huakouSum){
- throw new GlobleException("划扣业绩不等于储值卡扣款金额，请修改业绩设置！");
- }
- }
-
- /**
- * 设置会员消费积分
- * @param pageOrder
- */
- private void addVipScore(SysOrder pageOrder) {
-
- SysVipInfo vipInfo=sysVipInfoDao.selectById(pageOrder.getVipId());
-
- List<SysOrderFlow> flows = pageOrder.getFlows();
- int [] cashScore={0,0,0};
- //现金支付金额
- BigDecimal cashPayAmount=flows.stream()
- .filter(item->(!item.getPayMethod().equals("储值卡"))&&(!item.getPayMethod().equals("欠款")))
- .map(SysOrderFlow::getAmount).reduce(BigDecimal.ZERO,BigDecimal::add);
- BusParameterSettings cashConsumption = busParameterSettingsDao.selectCompanyParamByCode(ScoreSettingConstant.CASH_CONSUMPTION, vipInfo.getCompanyId());
- if(cashPayAmount!=null
- &&cashPayAmount.compareTo(BigDecimal.ZERO)>0
- &&StringUtils.isNotBlank(cashConsumption.getParamValue())){
-
- BigDecimal scoreSetting0 = new BigDecimal(cashConsumption.getParamValue());
- if(scoreSetting0.compareTo(BigDecimal.ZERO)>0) {
- cashScore[0] = cashPayAmount.divide(scoreSetting0).intValue();
- }
-
- if(StringUtils.isNotBlank(cashConsumption.getParamValue1())){
- BigDecimal scoreSetting1 = new BigDecimal(cashConsumption.getParamValue1());
- if(scoreSetting1.compareTo(BigDecimal.ZERO)>0){
- cashScore[1]= cashPayAmount.divide(scoreSetting1).intValue();
- }
-
- }
-
- if(StringUtils.isNotBlank(cashConsumption.getParamValue2())){
- BigDecimal scoreSetting2 = new BigDecimal(cashConsumption.getParamValue2());
- if(scoreSetting2.compareTo(BigDecimal.ZERO)>0){
- cashScore[2]= cashPayAmount.divide(scoreSetting2).intValue();
- }
-
- }
- }
-
- int [] cardScore={0,0,0};
- //储值卡本金支付金额
- BigDecimal cardPayAmount=flows.stream()
- .filter(item->item.getPayMethod().equals("储值卡")&&item.getIsGift().equals("N"))
- .map(SysOrderFlow::getAmount).reduce(BigDecimal.ZERO,BigDecimal::add);
-
- BusParameterSettings principalBalanceConsumption = busParameterSettingsDao.selectCompanyParamByCode(ScoreSettingConstant.PRINCIPAL_BALANCE_CONSUMPTION, vipInfo.getCompanyId());
- if(cardPayAmount!=null
- &&cardPayAmount.compareTo(BigDecimal.ZERO)>0
- &&StringUtils.isNotBlank(principalBalanceConsumption.getParamValue())){
-
- BigDecimal scoreSetting0 = new BigDecimal(principalBalanceConsumption.getParamValue());
- if(scoreSetting0.compareTo(BigDecimal.ZERO)>0) {
- cardScore[0] = cardPayAmount.divide(scoreSetting0).intValue();
- }
-
- if(StringUtils.isNotBlank(principalBalanceConsumption.getParamValue1())){
- BigDecimal scoreSetting1 = new BigDecimal(principalBalanceConsumption.getParamValue1());
- if(scoreSetting1.compareTo(BigDecimal.ZERO)>0) {
- cardScore[1] = cardPayAmount.divide(scoreSetting1).intValue();
- }
- }
-
- if(StringUtils.isNotBlank(principalBalanceConsumption.getParamValue2())){
- BigDecimal scoreSetting2 = new BigDecimal(principalBalanceConsumption.getParamValue2());
- if(scoreSetting2.compareTo(BigDecimal.ZERO)>0) {
- cardScore[2] = cardPayAmount.divide(scoreSetting2).intValue();
- }
- }
- }
-
- int [] giftScore={0,0,0};
- //储值卡本赠送付金额
- BigDecimal giftPayAmount=flows.stream()
- .filter(item->item.getPayMethod().equals("储值卡")&&item.getIsGift().equals("Y"))
- .map(SysOrderFlow::getAmount).reduce(BigDecimal.ZERO,BigDecimal::add);
- BusParameterSettings bonusBalanceConsumption = busParameterSettingsDao.selectCompanyParamByCode(ScoreSettingConstant.BONUS_BALANCE_CONSUMPTION, vipInfo.getCompanyId());
- if(giftPayAmount!=null
- &&giftPayAmount.compareTo(BigDecimal.ZERO)>0
- &&StringUtils.isNotBlank(bonusBalanceConsumption.getParamValue())){
-
- BigDecimal scoreSetting0 = new BigDecimal(bonusBalanceConsumption.getParamValue());
- if(scoreSetting0.compareTo(BigDecimal.ZERO)>0) {
- giftScore[0] = giftPayAmount.divide(scoreSetting0).intValue();
- }
-
- if(StringUtils.isNotBlank(bonusBalanceConsumption.getParamValue1())){
- BigDecimal scoreSetting1 = new BigDecimal(bonusBalanceConsumption.getParamValue1());
- if(scoreSetting1.compareTo(BigDecimal.ZERO)>0) {
- giftScore[1] = giftPayAmount.divide(scoreSetting1).intValue();
- }
- }
-
- if(StringUtils.isNotBlank(bonusBalanceConsumption.getParamValue2())){
- BigDecimal scoreSetting2 = new BigDecimal(bonusBalanceConsumption.getParamValue2());
- if(scoreSetting2.compareTo(BigDecimal.ZERO)>0) {
- giftScore[2] = giftPayAmount.divide(scoreSetting2).intValue();
- }
- }
- }
-
- int selfScore=cashScore[0]+cardScore[0]+giftScore[0];
- int parentScore=cashScore[1]+cardScore[1]+giftScore[1];
- int topParentScore=cashScore[2]+cardScore[2]+giftScore[2];
-
-
- //添加自己的积分
- if(selfScore>0){
- scoreVipDetailService.addScore(
- vipInfo.getId(),
- pageOrder.getStaffId(),
- pageOrder.getShopId(),
- selfScore,
- pageOrder.getId(),
- ScoreVipDetail.SCORE_VIP_TYPE_CASH,
- "消费奖励"
- );
- }
-
- if(vipInfo.getRecommendId()!=null){
- //推荐注册老带新积分奖励
- SysVipInfo referrerVip = sysVipInfoDao.selectById(vipInfo.getRecommendId());
- if(parentScore>0){
- scoreVipDetailService.addScore(
- referrerVip.getId(),
- pageOrder.getStaffId(),
- pageOrder.getShopId(),
- parentScore,
- pageOrder.getId(),
- ScoreVipDetail.SCORE_VIP_TYPE_CASH,
- "推荐消费奖励"
- );
- }
- //推荐注册二级带新积分奖励
- if(referrerVip.getRecommendId()!=null){
- SysVipInfo topVipInfo = sysVipInfoDao.selectById(referrerVip.getRecommendId());
- if(topParentScore>0){
- scoreVipDetailService.addScore(
- topVipInfo.getId(),
- pageOrder.getStaffId(),
- pageOrder.getShopId(),
- topParentScore,
- pageOrder.getId(),
- ScoreVipDetail.SCORE_VIP_TYPE_CASH,
- "推荐消费奖励"
- );
- }
- }
- }
- }
-
- /**
- * 创建支付流水
+ * 保存订单收款日志
*
- * @author:姜友瑶
+ * @param pageOrder
*/
- private void addOrderFlow(SysOrder sourceOrder) {
+ private void saveOrderSkLog(SysOrder pageOrder) {
+ SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
+ operationLogService.saveOperation(pageOrder.getCompanyId(), pageOrder.getShopId(), user.getSuId(),
+ OperationFunctionEnum.ORDER,
+ OperationButtonEnum.ORDER_SK,
+ pageOrder.getId(),
+ pageOrder.getOrderNo(),
+ pageOrder.getVipId());
+ }
- //处理支付流水
- int flowCount = 1;
- for (SysOrderFlow flow : sourceOrder.getFlows()) {
- //支付内容摘要设置
- Long goodsId = sourceOrder.getItems().get(0).getGoodsId();
- ShoppingGoods goods = shoppingGoodsDao.selectById(goodsId);
- flow.setFlowContent(goods.getName() + "等" + sourceOrder.getItems().size() + "件产品");
- // 若是退款，则取负数
- if (SysOrder.ORDER_TYPE_REFUND== sourceOrder.getOrderType()) {
- flow.setFlowType(SysOrderFlow.FLOW_TYPE_REFUND);
- flow.setAmount(flow.getAmount().negate());
- flow.setOrderId(sourceOrder.getOldOrderId());
- } else {
- flow.setFlowType(SysOrderFlow.FLOW_TYPE_BUY);
- flow.setOrderId(sourceOrder.getId());
- }
+ /**
+ * 付款后更新订单信息
+ *
+ * @param pageOrder
+ */
+ private void updateOrderInfo(SysOrder pageOrder) {
+ LogUtil.info("付款更新订单信息 id={}", pageOrder.getId());
+ SysUsers user = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
+ pageOrder.setCashierId(user.getSuId());
+ pageOrder.setPayTime(new Date());
+
+ pageOrder.setStatu(Dictionary.ORDER_STATU_YFK);
+ List<SysOrderFlow> flows = pageOrder.getFlows();
+
+ BigDecimal cashPayAmount = flows.stream()
+ .filter(item -> (!item.getPayMethod().equals("储值卡")) && (!item.getPayMethod().equals("欠款")))
+ .map(SysOrderFlow::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+
+ BigDecimal cardPayAmount = flows.stream()
+ .filter(item -> item.getPayMethod().equals("储值卡"))
+ .map(SysOrderFlow::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+
+ pageOrder.setCardPay(cardPayAmount.doubleValue());
+ pageOrder.setCashPay(cashPayAmount.doubleValue());
+
+ for (SysOrderFlow flow : pageOrder.getFlows()) {
//欠款处理
if (SysOrderFlow.PAY_METHOD_ARREARS.equals(flow.getPayMethod())) {
- sourceOrder.setStatu(Dictionary.ORDER_STATU_QK);
- sourceOrder.setArrears(flow.getAmount().doubleValue());
- sysOrderDao.update(sourceOrder);
+ pageOrder.setStatu(Dictionary.ORDER_STATU_QK);
+ pageOrder.setArrears(flow.getAmount().doubleValue());
}
+ }
- //统计储值卡支付
- if (SysOrderFlow.PAY_METHOD_CARD.equals(flow.getPayMethod())) {
- if (flow.getCardId() != null) {
- MoneyCardUse moneyCardUse = moneyCardUseDao.selectById(flow.getCardId());
- //修改储值卡余额
- cardPaySk(moneyCardUse, sourceOrder, flow);
- }else{
- throw new GlobleException("无效的储值卡支付方式");
- }
- }
+ double sum = flows.stream().mapToDouble(item -> item.getAmount().doubleValue()).sum();
- flow.setFlowNo(codeService.getFlowCode() + "-" + flowCount);
- flow.setVipId(sourceOrder.getVipId());
- flow.setShopId(sourceOrder.getShopId());
- flow.setCompanyId(sourceOrder.getCompanyId());
- sysOrderFlowDao.insert(flow);
- flowCount++;
+ if (sum > 0 && cardPayAmount.doubleValue() == 0 && cashPayAmount.doubleValue() == 0) {
+ throw new GlobleException("订单更新失败，支付金额计算错误，请联系管理员");
}
+ sysOrderDao.update(pageOrder);
+
+
+ }
+
+ private void checkOrder(SysOrder pageOrder) {
+
+ SysOrder checkOrder = sysOrderDao.selectById(pageOrder.getId());
+
+ //状态校验
+ if (!Dictionary.ORDER_STATU_DFK.equals(checkOrder.getStatu())) {
+ throw new GlobleException("该订单已经收过款,请刷新页面再试!");
+ }
+
+ //检查交易限制调整
+ GoodsSealLimitDto goodsSealLimitDto = new GoodsSealLimitDto();
+ goodsSealLimitDto.setVipId(pageOrder.getVipId());
+ goodsSealLimitDto.setSysOrderItemDtoList(Lists.newArrayList());
+ pageOrder.getItems().forEach(e -> {
+ goodsSealLimitDto.getSysOrderItemDtoList().add(BeanUtil.copyProperties(e, SysOrderItemDto.class));
+ });
+ shoppingGoodsService.checkGoodsSealLimit(goodsSealLimitDto);
+
+ //检查业绩设置
+ checkOrderAchieve(pageOrder);
+
+ LogUtil.info("订单满足支付条件 id={}", pageOrder.getId());
}
/**
- * 验证商品是否达到最大发卡限制
+ * 检查业绩设置是否合理
+ * 1、每个订单明细都要有至少一个对应的业绩
+ * 2、每个订单明细的同类型业绩金额之和不能大于明细支付金额
*
- * @author jiangyouyao
+ * @param pageOrder
*/
- private void checkIsArrivedMax(ShoppingCarItem carItem) {
- // 获取该商品的最大购买数量
- ShoppingGoods shopGoods = shoppingGoodsDao.selectById(carItem.getGoodsId());
- Integer maxNum = shopGoods.getCarMaxSaleCount();
- // 最大发卡数量为0代表不做限制
- if (maxNum != null && maxNum != 0) {
- // 查询该商品已经被购买的次数
- Integer buyNum = orderItemDao.selectByGoodsId(shopGoods.getId(),null);
- buyNum = (buyNum == null ? 0 : buyNum);
- if ((buyNum + carItem.getCount()) > maxNum) {
- throw new GlobleException(shopGoods.getName() + "已超过最大销售数量");
+ private void checkOrderAchieve(SysOrder pageOrder) {
+
+ pageOrder.getItems().forEach(item -> {
+
+ if (CollectionUtil.isEmpty(item.getAchieveList())) {
+ ShoppingGoods shopGoods = shoppingGoodsDao.selectById(item.getGoodsId());
+ throw GlobleException.instance(shopGoods.getName() + "缺少设置业绩");
}
- if ((buyNum + carItem.getCount()) == maxNum) {
- if (!shopGoods.getStaus().equals(Dictionary.BUSINESS_STATE_DOWN)) {
- shopGoods.setStaus(Dictionary.BUSINESS_STATE_DOWN);
- shoppingGoodsDao.update(shopGoods);
+
+ //按业绩类型分组后比较支付金额与业绩金额是否相等
+ Map<String, List<AchieveNew>> achieveTypeMap = item.getAchieveList().stream().collect(Collectors.groupingBy(AchieveNew::getAchieveType));
+ Set<Map.Entry<String, List<AchieveNew>>> entries = achieveTypeMap.entrySet();
+ entries.forEach(entrie -> {
+ double sum = entrie.getValue().stream().mapToDouble(AchieveNew::getGoodsCash).sum();
+ //todo 目前使用js计算金额可能存在精度的误差展示用0.1屏蔽
+ if (Math.abs(sum - (item.getZkPrice() * item.getCount())) > 0.1) {
+ ShoppingGoods shopGoods = shoppingGoodsDao.selectById(item.getGoodsId());
+ throw GlobleException.instance(shopGoods.getName() + "," + entrie.getKey() + "业绩金额与收款金额不一致");
}
- }
-
- }
- }
-
-
- /**
- * 使用充值卡付款操作
- *
- * @param sourceOrder
- * @param moneyCardUse
- * @param flow
- */
- private void cardPaySk(MoneyCardUse moneyCardUse, SysOrder sourceOrder, SysOrderFlow flow) {
- // 判断商品是否在充值卡的限制购买,判断分类
- sourceOrder.getItems().forEach(item -> {
- if (!isInBangding(moneyCardUse, item.getGoodsId())) {
- throw new GlobleException(shoppingGoodsDao.selectById(item.getGoodsId()).getName() + "不在" + moneyCardUse.getCardName() + "优惠中");
- }
+ });
});
- 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 moneyCardUse
- * @param goodsId
- * @return 返回类型 boolean
- * 判断商品是否在充值卡的优惠中
- * @author:姜友瑶
- * @date 2016年9月19日
- */
- private boolean isInBangding(MoneyCardUse moneyCardUse, Long goodsId) {
- // 如果是一卡通则肯定在绑定范围内
-
- if (moneyCardUse.getIsVipCar().equals(Dictionary.FLAG_YES_Y)) {
- return true;
- } else {
- // 不是一卡通，
- // 判断卡是否可应用于所有产品
- ShoppingGoods cardGoods = shoppingGoodsDao.selectById(moneyCardUse.getGoodsId());
- if (cardGoods != null) {
- if (Dictionary.FLAG_YES.equals(cardGoods.getCarIsAll())) {
- return true;
- }
- }
-
- // 比较分类
- MoneyCardAssemble moneyCardAssemble = new MoneyCardAssemble();
- moneyCardAssemble.setCardId(moneyCardUse.getGoodsId());
- List<MoneyCardAssemble> cardAssembleList = moneyCardAssembleDao.selectByModel(moneyCardAssemble);
- ShoppingGoods yhGoods = shoppingGoodsDao.selectById(goodsId);
- boolean flag = false;
- for (MoneyCardAssemble cardAssemble : cardAssembleList) {
- // 比较类型
- if (cardAssemble.getType().equals(Dictionary.CZK_ASSEMBLE_FL)) {
- if (yhGoods.getCateId().equals(cardAssemble.getCateId())) {
- flag = true;
- break;
- }
- } else {
- // 比较绑定
- if (yhGoods.getId().equals(cardAssemble.getGoodsId())) {
- flag = true;
- break;
- }
- }
- }
- return flag;
- }
- }
/**
- * 设置销量
+ * 补交
*
- * @param sourceOrder
- */
- public void setShopSelCount(SysOrder sourceOrder) {
- for (SysOrderItem item : sourceOrder.getItems()) {
- // 正真实销量
- ShoppingGoods goods = shoppingGoodsDao.selectById(item.getGoodsId());
- if (goods.getRealSealCount() == null) {
- goods.setRealSealCount(item.getCount());
- } else {
- goods.setRealSealCount(goods.getRealSealCount() + item.getCount());
- }
- shoppingGoodsDao.update(goods);
- }
- }
-
- /**
- * @param sourceOrder 如果购买了充值卡设置会员的充值卡
- * @author:姜友瑶
- * @date 2016年9月19日
- */
- public void addMoneyCardUse(SysOrder sourceOrder) {
-
- List<SysOrderItem> orderItemList = sourceOrder.getItems();
- for (SysOrderItem sysOrderItem : orderItemList) {
- // 如果购买的是充值卡
- if (sysOrderItem.getType().equals(Dictionary.SHOPPING_GOODS_TYPE_CZK)) {
-
- for (int i = 0; i < sysOrderItem.getCount(); i++) {
- ShoppingGoods moneyCar = shoppingGoodsDao.selectById(sysOrderItem.getGoodsId());
- MoneyCardUse moneyCardUse = new MoneyCardUse();
- moneyCardUse.setVipId(sourceOrder.getVipId());
- moneyCardUse.setGiftMoney(moneyCar.getReferencePice());
- moneyCardUse.setRealMoney(moneyCar.getSealPice());
- moneyCardUse.setGoodsId(moneyCar.getId());
- moneyCardUse.setIsOver(Dictionary.FLAG_NO_N);
- moneyCardUse.setOrderItemId(sysOrderItem.getId());
- moneyCardUse.setSource(Dictionary.TAOCAN_SOURCE_GM);
- moneyCardUse.setStatus(Dictionary.MONEYCARD_STATUS_YX);
- moneyCardUse.setCardName(moneyCar.getName());
- moneyCardUse.setIsVipCar(Dictionary.FLAG_NO_N);
- moneyCardUse.setVipId(sourceOrder.getVipId());
-
- // 是否为赠送
- if (sysOrderItem.getIsFree().equals(Dictionary.FLAG_YES)) {
- moneyCardUse.setSource(Dictionary.TAOCAN_SOURCE_ZS);
- } else {
- moneyCardUse.setSource(Dictionary.TAOCAN_SOURCE_GM);
- }
- //余次处理
- if (moneyCar.getCarUseCount() == null || moneyCar.getCarUseCount() == 0) {
- moneyCardUse.setUseTotal(999999999);
- moneyCardUse.setLastCount(999999999);
- } else {
- moneyCardUse.setUseTotal(moneyCar.getCarUseCount());
- moneyCardUse.setLastCount(moneyCar.getCarUseCount());
- }
- //失效时间处理
- Date invalidTime = shoppingGoodsService.calInvalidTime(sysOrderItem.getShoppingGoods(), 1, null);
- moneyCardUse.setFailTime(invalidTime);
-
- moneyCardUseDao.insert(moneyCardUse);
- }
- }
- }
- }
-
- /**
* @author:姜友瑶
* @date 2016年9月19日
*/
@@ -1022,382 +563,35 @@
public void updateAfterMoney(SysOrder pageOrder) {
SysOrder sourceOrder = sysOrderDao.selectById(pageOrder.getId());
- int i = 1;
+ //添加支付流水
+ sysOrderServiceHelper.addOrderFlow(pageOrder, true);
+
+ //扣除储值卡余额
+ sysOrderServiceHelper.cardPaySk(pageOrder);
+
+
double refundTotal = 0D;
double cardPayTotal = 0D;
double cashPayTotal = 0D;
for (SysOrderFlow flow : pageOrder.getFlows()) {
- flow.setFlowNo(codeService.getFlowCode() + "-" + i);
- Long goodsId = pageOrder.getItems().get(0).getGoodsId();
- ShoppingGoods goods = shoppingGoodsDao.selectById(goodsId);
- flow.setFlowContent(goods.getName() + "等" + pageOrder.getItems().size() + "件产品");
-
- flow.setOrderId(pageOrder.getId());
- flow.setVipId(pageOrder.getVipId());
- flow.setFlowType(SysOrderFlow.FLOW_TYPE_REPAY);
// 若使用储值卡付款
if (SysOrderFlow.PAY_METHOD_CARD.equals(flow.getPayMethod())) {
- if (flow.getCardId() != null) {
- cardPayTotal += flow.getAmount().doubleValue();
- MoneyCardUse moneyCardUse = moneyCardUseDao.selectById(flow.getCardId());
- cardPaySk(moneyCardUse, pageOrder, flow);
- }
+ cardPayTotal += flow.getAmount().doubleValue();
} else {
cashPayTotal += flow.getAmount().doubleValue();
}
-
refundTotal += flow.getAmount().doubleValue();
- flow.setShopId(sourceOrder.getShopId());
- flow.setCompanyId(sourceOrder.getCompanyId());
- sysOrderFlowDao.insert(flow);
- i++;
}
-
- boolean haQk = false;
if (refundTotal == pageOrder.getArrears()) {
- haQk = true;
- }
-
- //更新收款状态
- if (haQk) {
sourceOrder.setStatu(Dictionary.ORDER_STATU_YFK);
} else {
sourceOrder.setStatu(Dictionary.ORDER_STATU_QK);
}
-
sourceOrder.setArrears(sourceOrder.getArrears() - refundTotal);
- sourceOrder.setCardPay(sourceOrder.getCardPay() + cardPayTotal);
- sourceOrder.setCashPay(sourceOrder.getCashPay() + cashPayTotal);
+ sourceOrder.setCardPay(sourceOrder.getCardPay() == null ? 0 : sourceOrder.getCardPay() + cardPayTotal);
+ sourceOrder.setCashPay(sourceOrder.getCashPay() == null ? 0 : sourceOrder.getCashPay() + cashPayTotal);
sysOrderDao.update(sourceOrder);
- }
-
-
-
- /**
- * @param order 新增出库单并更新本店库存
- * @author:姜友瑶
- * @date 2016年9月2日
- */
- @Override
- public void addOutStore(SysOrder order) {
-
- BusParameterSettings manageStockSetting = busParameterSettingsDao.selectCompanyParamByCode(AppConstance.WAREHOUSE_MANAGE_STOCK, order.getCompanyId());
- if(AppConstance.IS_Y.equals(manageStockSetting.getParamValue())){
-
- List<SysOutStoreItem> storeItemList = new ArrayList<>();
-
- for (SysOrderItem sysOrderItem : order.getItems()) {
-
- if (ShoppingGoods.SHOPPING_GOODS_TYPE_JJCP.equals(sysOrderItem.getType())) {
-
- SysOutStoreItem storeItem = new SysOutStoreItem();
- storeItem.setSkuId(sysOrderItem.getGoodsId());
- storeItem.setAmount(Double.valueOf(sysOrderItem.getCount()));
- storeItemList.add(storeItem);
-
- } else if (ShoppingGoods.SHOPPING_GOODS_TYPE_TC.equals(sysOrderItem.getType())
-
- || ShoppingGoods.SHOPPING_GOODS_TYPE_ZHK.equals(sysOrderItem.getType())) {
-
- List<ShoppingGoodsAssemble> goodsList = new ArrayList<>();
-
- goodsList.addAll(shoppingGoodsAssembleDao.selectGoodsByShoppingGoodsIdAndType(sysOrderItem.getGoodsId(), ShoppingGoods.SHOPPING_GOODS_TYPE_JJCP));
-
- if (ShoppingGoods.SHOPPING_GOODS_TYPE_ZHK.equals(sysOrderItem.getType())) {
- //综合卡处理,中的套餐，中的家居产品
- List<ShoppingGoodsAssemble> zhkAssemble = shoppingGoodsAssembleDao.selectGoodsByShoppingGoodsIdAndType(sysOrderItem.getGoodsId(), ShoppingGoods.SHOPPING_GOODS_TYPE_TC);
- zhkAssemble.forEach(item -> {
- goodsList.addAll(shoppingGoodsAssembleDao.selectGoodsByShoppingGoodsIdAndType(item.getAssembleGoodId(), ShoppingGoods.SHOPPING_GOODS_TYPE_JJCP));
- });
- }
-
- goodsList.forEach(item -> {
- SysOutStoreItem storeItem = new SysOutStoreItem();
- storeItem.setSkuId(item.getAssembleGoodId());
- storeItem.setAmount(Double.valueOf(item.getTotal()));
- storeItemList.add(storeItem);
- });
- }
- }
-
- if (CollectionUtils.isNotEmpty(storeItemList)) {
- Long warehouseId = warehouseDao.findShopWarehouse(order.getShopId()).get(0).getId();
- SysOutStore outStore = new SysOutStore();
- outStore.setOutStoreNo(codeService.getOutStoreCode());
- outStore.setOrderId(order.getId());
- outStore.setShopId(order.getShopId());
- outStore.setShopId(order.getShopId());
- outStore.setStaffId(order.getStaffId());
- outStore.setType(Dictionary.OUT_STORE_JJCPCK);
- outStore.setServiceNo(order.getOrderNo());
- outStore.setTime(new Date());
- outStore.setCheckStatus(Dictionary.CHECK_STATUS_DSH);
- outStore.setCompanyId(order.getCompanyId());
- sysOutStoreDao.insert(outStore);
-
- //出库明细，根据批次维度定义
- List<SysOutStoreItem> realOutStoreItemList = new ArrayList<>();
-
- storeItemList.forEach(outStoreItem -> {
-
- //设置出库主键
- outStoreItem.setOutStoreId(outStore.getId());
-
- //计算库存总数是否满足本次扣减的需求
- List<SysStoreInfo> stores = storeInfoDao.selectStoInfoBySku(outStoreItem.getSkuId(), warehouseId);
- double sum = stores.stream().mapToDouble(item -> item.getStoreTotal()).sum();
- if (sum < outStoreItem.getAmount()) {
- ShoppingGoods sysGoods = shoppingGoodsDao.selectById(outStoreItem.getSkuId());
- if (sysGoods != null) {
- throw new GlobleException("出库失败：【" + sysGoods.getName() + "库存不足】");
-
- } else {
- throw new GlobleException("出库失败没有找到出库产品");
- }
- }
-
- //循环获取所有批次产品，并扣减库存
- Double number = outStoreItem.getAmount();
- for (SysStoreInfo storeInfo : stores) {
- Double oldStoreTotal = storeInfo.getStoreTotal();
- Double surplus = storeInfo.getStoreTotal() - number;
- //更新库存
- storeInfo.setStoreTotal(surplus < 0 ? 0 : surplus);
-
- //每次扣减库存都创建一个出库记录
- SysOutStoreItem sysOutStoreItem = new SysOutStoreItem();
- BeanUtils.copyProperties(outStoreItem, sysOutStoreItem);
- sysOutStoreItem.setStoreId(storeInfo.getId());
- sysOutStoreItem.setAmount(oldStoreTotal - storeInfo.getStoreTotal());
- realOutStoreItemList.add(sysOutStoreItem);
-
- storeInfoDao.update(storeInfo);
- //扣除后剩余库存大于0则跳出扣除,否则剩余数量的负数的绝对值就是再次扣减的数量
- if (surplus > 0) {
- break;
- } else {
- number = Math.abs(surplus);
- }
- }
- });
- sysOutStoreItemDao.batchInsert(realOutStoreItemList);
- }
-
- }else{
- LogUtil.debug("不管理库存");
- }
-
-
- }
-
- /**
- * 新增项目和套餐的余次
- *
- * @author:姜友瑶
- * @date 2016年9月2日
- */
- public void addTaocanProj(SysOrder order) {
- List<SysOrderItem> itemList = order.getItems();
- for (SysOrderItem sysOrderItem : itemList) {
- // 折扣 项目的实际购买除以项目原价,来计算项目的消耗价格
- // 赠送 计算全额的消耗业绩
- if (sysOrderItem.getType().equals(Dictionary.SHOPPING_GOODS_TYPE_XM)) {
- createXmProjuse(order, sysOrderItem);
- } else if (sysOrderItem.getType().equals(Dictionary.SHOPPING_GOODS_TYPE_TC)) {
- //每个套餐独立生成一个明细
- int orderCount = sysOrderItem.getCount();
- while (orderCount > 0) {
- createTaocanProjUse(order, sysOrderItem, null);
- orderCount--;
- }
- } else if (sysOrderItem.getType().equals(Dictionary.SHOPPING_GOODS_TYPE_ZHK)) {
- addZongheCarUse(order, sysOrderItem);
- }
- }
-
- }
-
- public void addZongheCarUse(SysOrder order, SysOrderItem sysOrderItem) {
-
-
- //处理一个订单买多次
- int orderCount = sysOrderItem.getCount();
- while (orderCount < 0) {
- orderCount--;
- //综合卡中包含的项目
- List<ShoppingGoodsAssemble> assembleList = shoppingGoodsAssembleDao.selectGoodsByShoppingGoodsIdAndType(sysOrderItem.getGoodsId(), ShoppingGoods.SHOPPING_GOODS_TYPE_XM);
- assembleList.forEach(item -> {
- //TODO 补综合卡逻辑
- createProjuseByAssemble(order, sysOrderItem, item, null, null);
- });
-
- //处理综合卡中包含的套餐
- List<ShoppingGoodsAssemble> zhkAssemble = shoppingGoodsAssembleDao.selectGoodsByShoppingGoodsIdAndType(sysOrderItem.getGoodsId(), ShoppingGoods.SHOPPING_GOODS_TYPE_TC);
- zhkAssemble.forEach(taocan -> {
- int assembleCount = taocan.getTotal();
- while (assembleCount > 0) {
- assembleCount--;
- createTaocanProjUse(order, sysOrderItem, taocan);
- }
- });
- }
-
-
- }
-
- /**
- * 通过组合关系创建用户项目余次
- */
- private SysProjUse createProjuseByAssemble(SysOrder order, SysOrderItem sysOrderItem,
- ShoppingGoodsAssemble goodsAssemble, Long taocanId, Date failTime) {
- //计算折扣
- Double zk = sysOrderItem.getZkPrice() / sysOrderItem.getPrice();
-
- SysProjUse puse = new SysProjUse();
- puse.setIsOver(Dictionary.DELETED_N);
- puse.setOrderItemId(sysOrderItem.getId());
- puse.setProjId(goodsAssemble.getAssembleGoodId());
- puse.setSurplusCount(goodsAssemble.getTotal());
- puse.setDeductionNum(goodsAssemble.getDeductionNum());
- puse.setProjName(goodsAssemble.getShoppingGoods().getName());
- puse.setVipId(order.getVipId());
- puse.setStatus(Dictionary.TAOCAN_STATUS_YX);
- puse.setTaocanId(taocanId);
- puse.setType(Dictionary.SHOPPING_GOODS_TYPE_XM);
- if (taocanId == null) {
- puse.setPrice(goodsAssemble.getShoppingGoods().getPrice() * zk);
- } else {
- puse.setPrice(goodsAssemble.getPrice() * zk);
- }
-
- // 赠送和打折后金额为0的都视为赠送项目
- if (sysOrderItem.getIsFree().equals(Dictionary.FLAG_NO) && sysOrderItem.getZkPrice() > 0) {
- puse.setSource(Dictionary.TAOCAN_SOURCE_GM);
- } else {
-
- puse.setSource(Dictionary.TAOCAN_SOURCE_ZS);
- //赠送项目是否计算消耗业绩否则 赠送产品按原价计算消耗
- boolean zsConsumeAchieve = projServicesService.skipServiceOrderStep(Dictionary.ZS_CONSUME_ACHIEVE);
- if(zsConsumeAchieve){
- if (taocanId == null) {
- puse.setPrice(goodsAssemble.getShoppingGoods().getPrice() );
- } else {
- puse.setPrice(goodsAssemble.getPrice());
- }
- }else{
- puse.setPrice(0D);
- }
-
-
- }
- puse.setBalance(MoneyUtil.mul(puse.getPrice(), Double.valueOf(puse.getSurplusCount())));
- puse.setFailTime(failTime);
- sysProjUseDao.insert(puse);
- return puse;
- }
-
-
- private void createTaocanProjUse(SysOrder order, SysOrderItem sysOrderItem, ShoppingGoodsAssemble goodsAssemble) {
-
- //新建套餐
- SysProjUse taocanProjUse = new SysProjUse();
-
- ShoppingGoods taocanShoppingGoods = sysOrderItem.getShoppingGoods();
-
-
- Long projId = sysOrderItem.getGoodsId();
-
- if (goodsAssemble != null) {
- taocanShoppingGoods = shoppingGoodsDao.selectById(goodsAssemble.getAssembleGoodId());
- projId = goodsAssemble.getAssembleGoodId();
- }
-
- taocanProjUse.setProjId(projId);
- taocanProjUse.setIsOver(Dictionary.DELETED_N);
- taocanProjUse.setOrderItemId(sysOrderItem.getId());
-
- taocanProjUse.setProjName(taocanShoppingGoods.getName());
- taocanProjUse.setVipId(order.getVipId());
- taocanProjUse.setStatus(Dictionary.TAOCAN_STATUS_YX);
- taocanProjUse.setType(Dictionary.SHOPPING_GOODS_TYPE_TC);
- taocanProjUse.setIsCourse(taocanShoppingGoods.getIsCourse());
- taocanProjUse.setIsInfinite(taocanShoppingGoods.getIsInfinite());
- // 赠送和打折后金额为0的都视为赠送项目
- if (sysOrderItem.getIsFree().equals(Dictionary.FLAG_NO) && sysOrderItem.getZkPrice() > 0) {
- taocanProjUse.setSource(Dictionary.TAOCAN_SOURCE_GM);
- } else {
- taocanProjUse.setSource(Dictionary.TAOCAN_SOURCE_ZS);
- }
- // 失效时间
- Date invalidTime = shoppingGoodsService.calInvalidTime(taocanShoppingGoods, 1, null);
- taocanProjUse.setFailTime(invalidTime);
- sysProjUseDao.insert(taocanProjUse);
- //计划次数
- int surplusCount = 0;
- //总余额
- Double sumBanance = 0D;
- //创建套餐绑定的项目
- List<ShoppingGoodsAssemble> assembleList = shoppingGoodsAssembleDao.selectGoodsByShoppingGoodsIdAndType(projId, ShoppingGoods.SHOPPING_GOODS_TYPE_XM);
- for (ShoppingGoodsAssemble assemble : assembleList) {
- SysProjUse tempUse = createProjuseByAssemble(order, sysOrderItem, assemble, taocanProjUse.getId(),taocanProjUse.getFailTime());
- sumBanance += tempUse.getBalance();
- surplusCount += tempUse.getSurplusCount();
- }
- if (Dictionary.FLAG_NO_N.equals(taocanShoppingGoods.getIsCourse())) {
- //固定套餐，剩余次数等于绑定项目的次数
- taocanProjUse.setSurplusCount(surplusCount);
- } else {
- //任选套餐剩余次数等于最大使用次数
- taocanProjUse.setSurplusCount(taocanShoppingGoods.getCarUseCount());
- }
- //合计套餐余额
- taocanProjUse.setBalance(sumBanance);
- sysProjUseDao.update(taocanProjUse);
- }
-
- @Autowired
- private SysProjServicesService projServicesService;
-
- /**
- * 根据订单创建用户项目使用情况
- *
- * @param order
- * @param sysOrderItem
- */
- private void createXmProjuse(SysOrder order, SysOrderItem sysOrderItem) {
- SysProjUse puse = new SysProjUse();
- puse.setIsOver(Dictionary.DELETED_N);
- puse.setOrderItemId(sysOrderItem.getId());
- puse.setProjId(sysOrderItem.getGoodsId());
- puse.setSurplusCount(sysOrderItem.getCount());
- puse.setVipId(order.getVipId());
- puse.setStatus(Dictionary.TAOCAN_STATUS_YX);
- puse.setType(Dictionary.SHOPPING_GOODS_TYPE_XM);
-
-
- puse.setProjName(sysOrderItem.getShoppingGoods().getName());
- // 赠送和打折后金额为0的都视为赠送项目
- if (sysOrderItem.getIsFree().equals(Dictionary.FLAG_NO) && sysOrderItem.getZkPrice() > 0) {
- puse.setSource(Dictionary.TAOCAN_SOURCE_GM);
- puse.setPrice(sysOrderItem.getZkPrice());
- } else {
- puse.setSource(Dictionary.TAOCAN_SOURCE_ZS);
- //赠送项目是否计算消耗业绩否则 赠送产品按原价计算消耗
- boolean zsConsumeAchieve = projServicesService.skipServiceOrderStep(Dictionary.ZS_CONSUME_ACHIEVE);
- if(zsConsumeAchieve){
- puse.setPrice(sysOrderItem.getShoppingGoods().getSealPice());
- }else{
- puse.setPrice(0D);
- }
-
-
- }
- // 设置失效时间
- Date invalidTime = shoppingGoodsService.calInvalidTime(sysOrderItem.getShoppingGoods(), 1, null);
- puse.setFailTime(invalidTime);
- puse.setBalance(sysOrderItem.getShoppingGoods().getSealPice()*puse.getSurplusCount());
- sysProjUseDao.insert(puse);
}
@@ -1484,11 +678,12 @@
moneyCardUseFlow.setCreateTime(new Date());
moneyCardUseFlow.setOperationId(user.getSuId());
moneyCardUseFlow.setBalance(cardUser.getGiftMoney() + cardUser.getRealMoney());
+ moneyCardUseFlow.setCarUseId(cardUser.getId());
moneyCardUseFlowDao.insert(moneyCardUseFlow);
order.setFlows(czVo.getFlows());
- addOrderFlow(order);
+ sysOrderServiceHelper.addOrderFlow(order, false);
// 添加员工业绩
achieveNewService.addAchaeveByOrder(order);
@@ -1544,12 +739,12 @@
SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
//原订单设置为退款状态
- SysOrder sourceOrder=new 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 oldOrder = sysOrderDao.selectById(sysOrder.getOldOrderId());
sysOrder.setId(null);
sysOrder.setStaffId(user.getSuId());
@@ -1568,7 +763,7 @@
for (SysOrderItem item : sysOrder.getItems()) {
//更新原订单明细的可退数量
- SysOrderItem oldItem=new SysOrderItem();
+ SysOrderItem oldItem = new SysOrderItem();
oldItem.setId(item.getId());
oldItem.setRefundCount(item.getCount());
orderItemDao.update(oldItem);
@@ -1582,7 +777,7 @@
// 添加订单收款流水
- addOrderFlow(sysOrder);
+ sysOrderServiceHelper.addOrderFlow(sysOrder, false);
//退款退套餐退项目
refundProjUse(sysOrder);
//删除积分
@@ -1591,40 +786,16 @@
// 设置业绩
achieveNewService.addAchaeveByOrder(sysOrder);
+ //保存单据日志
+ operationLogService.saveOperation(sysOrder.getCompanyId(), sysOrder.getShopId(), user.getSuId(),
+ OperationFunctionEnum.ORDER,
+ OperationButtonEnum.ORDER_TK,
+ sysOrder.getId(),
+ sysOrder.getOrderNo(),
+ sysOrder.getVipId());
+
}
- private void addRefundOrderFlow(SysOrder sourceOrder) {
- //处理支付流水
- int flowCount = 1;
- for (SysOrderFlow flow : sourceOrder.getFlows()) {
- //支付内容摘要设置
- Long goodsId = sourceOrder.getItems().get(0).getGoodsId();
- ShoppingGoods goods = shoppingGoodsDao.selectById(goodsId);
- flow.setFlowContent(goods.getName() + "等" + sourceOrder.getItems().size() + "件产品");
- // 退款，则取负数
- flow.setFlowType(SysOrderFlow.FLOW_TYPE_REFUND);
- flow.setAmount(flow.getAmount().negate());
- flow.setOrderId(sourceOrder.getOldOrderId());
-
- //统计储值卡支付
- if (SysOrderFlow.PAY_METHOD_CARD.equals(flow.getPayMethod())) {
- if (flow.getCardId() != null) {
- MoneyCardUse moneyCardUse = moneyCardUseDao.selectById(flow.getCardId());
- //修改储值卡余额
- cardPaySk(moneyCardUse, sourceOrder, flow);
- }else{
- throw new GlobleException("无效的储值卡支付方式");
- }
- }
-
- flow.setFlowNo(codeService.getFlowCode() + "-" + flowCount);
- flow.setVipId(sourceOrder.getVipId());
- flow.setShopId(sourceOrder.getShopId());
- flow.setCompanyId(sourceOrder.getCompanyId());
- sysOrderFlowDao.insert(flow);
- flowCount++;
- }
- }
private void refundCard(MoneyCardUse moneyCardUse, SysOrder sourceOrder, SysOrderFlow flow) {
SysUsers user = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
@@ -1677,6 +848,7 @@
/**
* 退款退项目，套餐，卡项
+ *
* @param sysOrder
*/
private void refundProjUse(SysOrder sysOrder) {
@@ -1701,8 +873,8 @@
int sub = sysProjUse.getSurplusCount() - item.getCount();
if (sub < 0) {
- throw new GlobleException("项目余次不足");
- }else if(sub==0){
+ throw new GlobleException("项目余次不足");
+ } else if (sub == 0) {
sysProjUse.setIsOver(Dictionary.FLAG_YES_Y);
sysProjUse.setStatus(Dictionary.TAOCAN_STATUS_WX);
}
@@ -1722,7 +894,7 @@
List<SysProjUse> sysProjUses = sysProjUseDao.selectByModel(queryProjUse);
- for (int i = 0; i < item.getCount(); i++) {
+ for (int i = 0; i < sysProjUses.size(); i++) {
SysProjUse sysProjUse = sysProjUses.get(i);
sysProjUse.setIsOver(Dictionary.FLAG_YES_Y);
@@ -1739,7 +911,6 @@
if (Dictionary.SHOPPING_GOODS_TYPE_CZK.equals(item.getType())) {
MoneyCardUse queryCardUse = new MoneyCardUse();
- queryCardUse.setIsOver(Dictionary.FLAG_NO_N);
queryCardUse.setStatus(Dictionary.TAOCAN_STATUS_YX);
queryCardUse.setOrderItemId(item.getOldItemId());
@@ -1764,7 +935,7 @@
}
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 (CollectionUtils.isNotEmpty(returnGoodsList)) {
refundInstore(returnGoodsList);
@@ -1817,4 +988,68 @@
sysInstoreInfoService.check(instoreInfo);
}
+
+ @Override
+ public BigDecimal findVipArrearsByVipId(Long vipId) {
+ return sysOrderDao.selectArrearsByVipId(vipId);
+ }
+
+
+ //↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓===增删改查代码区↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓
+
+
+ @Override
+ public int add(SysOrder sysOrder) {
+ return sysOrderDao.insert(sysOrder);
+ }
+
+ @Override
+ public int modify(SysOrder sysOrder) {
+
+ return sysOrderDao.update(sysOrder);
+
+ }
+
+ @Override
+ public int remove(List<Long> list) {
+
+ return sysOrderDao.deleteByIds(list);
+
+ }
+
+ @Override
+ @Transactional
+ public int removeById(Long id) {
+ orderItemDao.deleteByOrderId(id);
+ return sysOrderDao.deleteById(id);
+ }
+
+ @Override
+ public List<SysOrder> findInPage(SysOrder sysOrder, PaginationVO pageVo) {
+ if (pageVo != null) {
+ pageVo.setSort("desc");
+ pageVo.setSort("orderTime");
+ }
+ return sysOrderDao.selectInPage(sysOrder, pageVo);
+ }
+
+
+ @Override
+ public List<SysOrder> findByModel(SysOrder sysOrder) {
+ return sysOrderDao.selectByModel(sysOrder);
+ }
+
+
+ @Override
+ public int findTotal(SysOrder sysOrder) {
+
+ return sysOrderDao.selectInPageCount(sysOrder);
+
+ }
+
+ @Override
+ public SysOrder findById(Long id) {
+ return sysOrderDao.selectById(id);
+
+ }
}
--
Gitblit v1.9.1