From 756e16e090b15c7fd8648f55f5451367face6abc Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 19 Jun 2021 14:44:58 +0800
Subject: [PATCH] 修复业绩bug

---
 zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml
index 651ca07..8d89990 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml
@@ -52,6 +52,7 @@
 		<result property="goodsName" column="goodsName" />
 
 		<result property="cateName" column="cateName" />
+		<result property="achieveRuleName" column="achieveRuleName" />
 
 	</resultMap>
 
@@ -68,6 +69,7 @@
 		e.name as pro_name,
 		b.ZK_TOTAL as zk_total,
 		a.his_consume,
+		er.name as achieveRuleName,
 		a.free_consume,
 		f.su_name meiliao,
 		g.su_name guwen,
@@ -88,6 +90,7 @@
 		left join sys_vip_info c on a.vip_id=c.id
 		left join sys_vip_level d on c.LEVEL_ID=d.id
 		left join shopping_goods e on a.shopping_goods_id=e.id
+		left join achieve_rule er on e.achieve_rule_id=er.id
 		LEFT JOIN sys_users f on a.beault_id=f.su_id
 		LEFT JOIN sys_users g on a.sale_id = g.su_id
 		LEFT JOIN sys_shop_info h ON a.SHOP_ID = h.ID
@@ -1044,7 +1047,7 @@
 			b.code goodsNo,
 			b.name goodsName,
 			c.su_name meiliao,
-			d.count*d.zk_price zk_total
+			TRUNCATE(d.count*d.zk_price,2) zk_total
 		from achieve_new a
 		left join shopping_goods b on a.shopping_goods_id=b.id
 		left join sys_users c on a.beault_id=c.su_id

--
Gitblit v1.9.1