From 766798f98c602893882bad4587b18875b1a8e069 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 14 Jan 2021 17:10:35 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderFlowDao.xml | 8 ++++++--
zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrderFlow.java | 20 ++++++++++++++++++++
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java | 2 ++
3 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrderFlow.java b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrderFlow.java
index 8e92d05..37d6221 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrderFlow.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrderFlow.java
@@ -54,6 +54,10 @@
private String orderNo;
+ private Long shopId;
+
+ private Long companyId;
+
public String getOrderNo() {
return orderNo;
}
@@ -173,4 +177,20 @@
public void setVipId(Long vipId) {
this.vipId = vipId;
}
+
+ public Long getShopId() {
+ return shopId;
+ }
+
+ public void setShopId(Long shopId) {
+ this.shopId = shopId;
+ }
+
+ public Long getCompanyId() {
+ return companyId;
+ }
+
+ public void setCompanyId(Long companyId) {
+ this.companyId = companyId;
+ }
}
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 21ebbfe..7137616 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
@@ -527,6 +527,8 @@
if (!SysOrderFlow.PAY_METHOD_ARREARS.equals(flow.getPayMethod()) && !SysOrderFlow.PAY_METHOD_CARD.equals(flow.getPayMethod())) {
cashPayTotal += flow.getAmount().doubleValue();
}
+ flow.setShopId(sourceOrder.getShopId());
+ flow.setCompanyId(sourceOrder.getCompanyId());
sysOrderFlowDao.insert(flow);
i++;
}
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderFlowDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderFlowDao.xml
index f7ad6da..84fa609 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderFlowDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderFlowDao.xml
@@ -37,7 +37,9 @@
vip_id,
pay_method,
card_id,
- is_gift
+ is_gift,
+ shop_id,
+ company_id
)
VALUES (
#{id},
@@ -53,7 +55,9 @@
#{vipId},
#{payMethod},
#{cardId},
- #{isGift}
+ #{isGift},
+ #{shopId},
+ #{companyId}
)
</insert>
--
Gitblit v1.9.1