From 81c0938a74845d38ac9efce7f2561d396ac716c7 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 17 Mar 2021 09:45:17 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 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 fc36595..bc32f12 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
@@ -4,6 +4,7 @@
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.StringUtils;
import com.matrix.core.tools.WebUtil;
import com.matrix.system.app.dto.OrderListDto;
@@ -19,7 +20,6 @@
import com.matrix.system.hive.bean.*;
import com.matrix.system.hive.dao.*;
import com.matrix.system.hive.plugin.util.CollectionUtils;
-import com.matrix.core.tools.DateUtil;
import com.matrix.system.hive.plugin.util.MoneyUtil;
import com.matrix.system.hive.pojo.CzXkVo;
import com.matrix.system.hive.pojo.ShoppingCarItem;
@@ -33,10 +33,11 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import javax.annotation.Resource;
import javax.servlet.http.HttpSession;
import javax.validation.constraints.NotEmpty;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
/**
* @date 2016-07-03 20:53
@@ -219,7 +220,7 @@
sysOrder.setStaffId(source != null ? source.getStaffId() : user.getSuId());
sysOrder.setCompanyId(source != null ? source.getCompanyId() : user.getCompanyId());
- sysOrder.setPayTime(new Date());
+
if (sysOrder.getId() == null) {
//新增订单
sysOrder.setOrderNo(codeService.getOrderCode());
@@ -364,6 +365,10 @@
AchieveNew achieveNew = new AchieveNew();
achieveNew.setOrderId(id);
achieveNewService.removeByModel(achieveNew);
+
+ // 删除收款记录
+ sysOrderFlowDao.deleteByOrderId(id);
+
// 取消订单
order.setStatu(Dictionary.ORDER_STATU_YQX);
@@ -581,6 +586,7 @@
orderStatus = Dictionary.ORDER_STATU_TK;
}
// 更新收款状态
+ sourceOrder.setPayTime(new Date());
sourceOrder.setStatu(orderStatus);
sourceOrder.setCardPay(cardPayTotal);
sourceOrder.setCashPay(cashPayTotal);
@@ -695,6 +701,14 @@
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());
@@ -926,6 +940,7 @@
ShoppingGoods sysGoods = shoppingGoodsDao.selectById(outStoreItem.getSkuId());
if (sysGoods != null) {
throw new GlobleException("出库失败：【" + sysGoods.getName() + "库存不足】");
+
} else {
throw new GlobleException("出库失败没有找到出库产品");
}
@@ -1126,7 +1141,7 @@
puse.setVipId(order.getVipId());
puse.setStatus(Dictionary.TAOCAN_STATUS_YX);
puse.setType(Dictionary.SHOPPING_GOODS_TYPE_XM);
- puse.setBalance(MoneyUtil.add(sysOrderItem.getCardPay(), sysOrderItem.getCashPay()));
+ puse.setBalance(sysOrderItem.getZkPrice());
puse.setPrice(sysOrderItem.getZkPrice());
puse.setProjName(sysOrderItem.getShoppingGoods().getName());
// 赠送和打折后金额为0的都视为赠送项目
--
Gitblit v1.9.1