From 3d188c6959d6c877f36007c324c75f2ae306dbc5 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Fri, 18 Jun 2021 08:12:05 +0800
Subject: [PATCH] 业绩规则6
---
zq-erp/src/main/java/com/matrix/system/hive/statistics/AchieveAction.java | 14 ++++++++------
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html | 17 +++++++++++++++++
2 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/statistics/AchieveAction.java b/zq-erp/src/main/java/com/matrix/system/hive/statistics/AchieveAction.java
index ba436dc..680990c 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/statistics/AchieveAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/statistics/AchieveAction.java
@@ -169,10 +169,10 @@
//这里是从数据库里查数据并组装成我们想要的数据结构的过程
List<ExcelSheetPO> res = new ArrayList<>();
ExcelSheetPO orderSheet = new ExcelSheetPO();
- String title = "每日单据明细";
+ String title = "员工业绩报表";
orderSheet.setSheetName(title);
orderSheet.setTitle(title);
- String[] header = {"年", "月", "日", "订单编号", "订单类型", "会员姓名", "项目名称", "订单金额", "订单业绩", "收款方式", "业绩类型", "员工", "本金消耗", "赠消", "提成", "人头", "项目个数", "项目时间", "顾问", "门店"};
+ String[] header = {"订单时间", "订单编号", "订单类型", "会员姓名", "产品", "业绩规则", "产品分类", "订单金额", "现金","划扣", "员工", "业绩类型", "员工", "本金消耗", "赠消", "提成", "人头", "项目个数", "项目时间", "顾问", "门店"};
orderSheet.setHeaders(header);
SysUsers sysUsers = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
if(!AppConstance.ZONGDIAN.equals(sysUsers.getShopName())){
@@ -185,17 +185,19 @@
if (dataList.size() > 0) {
for (AchieveNew item : dataList) {
List<Object> temp = new ArrayList<>();
- temp.add(item.getYear());
- temp.add(item.getMonth());
- temp.add(item.getDay());
+ temp.add(DateUtil.dateFormatStr(item.getDatatime(), DateUtil.DATE_FORMAT_MM));
temp.add(item.getOrderNo());
temp.add(item.getOrderType());
temp.add(item.getVipName());
temp.add(item.getProName());
+ temp.add(item.getAchieveRuleName());
+ temp.add(item.getCateName());
temp.add(item.getZkTotal());
temp.add(item.getGoodsCash());
- temp.add(item.getPayMethod());
+ temp.add(item.getCardCash());
temp.add(item.getMeiliao());
+ //todo 动态导出列----
+
temp.add(item.getHisConsume());
temp.add(item.getFreeConsume());
temp.add(item.getProjPercentage());
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html
index ee2103f..f195403 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html
@@ -999,9 +999,14 @@
if (this.checkSubmitOrder()) {
let _this = this;
+ //是否全部为储值卡支付
+ let isCardPay=true;
if(submitType == 1) {
//校验支付方式
+
+
+
if (_this.payMoneys.length > 0) {
let flows = []
var total = 0;
@@ -1019,6 +1024,8 @@
if (item.type == '储值卡'){
flow.isGift = item.isGift;
flow.cardId = item.id;
+ }else{
+ isCardPay=false;
}
total += parseFloat(item.money);
flows.push(flow)
@@ -1028,6 +1035,10 @@
return false;
}
_this.order.flows = flows;
+
+
+
+
} else {
this.$message.warning("请选择支付方式");
return false;
@@ -1042,6 +1053,12 @@
item.achieveList = [];
}
if (item.uuid == achieve.orderItem.uuid) {
+
+ if(isCardPay){
+ //如果是储值卡支付，则业绩自动切换到划扣金额
+ achieve.payMethod="划扣";
+ }
+
let achieveNew = {
uuid:item.uuid,
beaultId: achieve.saleId,
--
Gitblit v1.9.1