From 840d78d6ff875d36e6a602772ea9b49b0732ae63 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 19 Apr 2021 16:57:08 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 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 77eaf77..0e379c1 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml
@@ -50,6 +50,7 @@
<result property="goodsNo" column="goodsNo" />
<result property="goodsName" column="goodsName" />
<result property="payMethod" column="pay_method" />
+ <result property="cateName" column="cateName" />
</resultMap>
@@ -64,7 +65,7 @@
d.level_name,
c.vip_name,
e.name as pro_name,
- (IFNULL(a.goods_cash,0)) as zk_total,
+ b.ZK_TOTAL as zk_total,
a.goods_cash,
a.his_consume,
a.free_consume,
@@ -74,9 +75,11 @@
a.number_of_people,
a.proj_num,
a.proj_time,
- i.name as module_subName,
- h.SHOP_NAME shop_name,
- a.order_type
+ i.name as cateName,
+ h.shop_short_name shop_name,
+ a.order_type,
+ a.achieveType,
+ j.pay_method
from
achieve_new a
left join sys_order b on a.order_id=b.id
@@ -88,6 +91,7 @@
LEFT JOIN sys_shop_info h ON a.SHOP_ID = h.ID
LEFT JOIN shopping_goods_category i ON e.cate_id = i.id
left join sys_proj_services l on a.service_order_id=l.id
+ left join sys_order_item j on a.order_item_id=j.ID
<where>
<if test="record!=null">
<if
@@ -1062,4 +1066,12 @@
group by a.shop_id
order by amount desc, a.shop_id
</select>
+
+ <select id="selectAchieveByServiceOrderId" resultMap="AchieveNewMap">
+ select * from achieve_new where service_order_id=#{serviceOrderId}
+ </select>
+
+ <select id="selectAchieveForOrder" resultMap="AchieveNewMap">
+ select * from achieve_new where order_type='订单'
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1