From 81eaf1aea588f309b35a51b836643a5b97f83e3d Mon Sep 17 00:00:00 2001 From: jyy <935090232@qq.com> Date: Fri, 09 Apr 2021 17:48:21 +0800 Subject: [PATCH] 修复bug2 --- zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml | 6 ++++-- 1 files changed, 4 insertions(+), 2 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 c59e2d5..9fd47fb 100644 --- a/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml +++ b/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml @@ -18,6 +18,7 @@ <result property="freeConsume" column="free_consume" /> <result property="hisConsume" column="his_consume" /> <result property="goodsCash" column="goods_cash" /> + <result property="cardCash" column="card_cash" /> <result property="projNum" column="proj_num" /> <result property="numberOfPeople" column="number_of_people" /> <result property="shopName" column="shop_name" /> @@ -66,7 +67,6 @@ c.vip_name, e.name as pro_name, b.ZK_TOTAL as zk_total, - a.goods_cash, a.his_consume, a.free_consume, f.su_name meiliao, @@ -79,6 +79,8 @@ h.shop_short_name shop_name, a.order_type, a.achieveType, + case when a.pay_method = '现金' then goods_cash end goods_cash, + case when a.pay_method = '划扣' then goods_cash end card_cash, j.pay_method from achieve_new a @@ -977,7 +979,7 @@ select b.su_name name, b.su_id id, - b.SHOP_IMAG photo, + b.su_photo photo, sum(IFNULL(a.free_consume,0) + IFNULL(a.his_consume, 0) ) amount, c.shop_short_name shopName from achieve_new a -- Gitblit v1.9.1