From 3d00fa32affba29c7862dca8fc60b32ba1ee74c4 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 10 Mar 2021 14:42:01 +0800
Subject: [PATCH] 20210226 分销设置页
---
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 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 e64412a..20c6415 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
@@ -220,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());
@@ -365,6 +365,10 @@
AchieveNew achieveNew = new AchieveNew();
achieveNew.setOrderId(id);
achieveNewService.removeByModel(achieveNew);
+
+ // 删除收款记录
+ sysOrderFlowDao.deleteByOrderId(id);
+
// 取消订单
order.setStatu(Dictionary.ORDER_STATU_YQX);
@@ -582,6 +586,7 @@
orderStatus = Dictionary.ORDER_STATU_TK;
}
// 更新收款状态
+ sourceOrder.setPayTime(new Date());
sourceOrder.setStatu(orderStatus);
sourceOrder.setCardPay(cardPayTotal);
sourceOrder.setCashPay(cashPayTotal);
@@ -1128,7 +1133,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