From 08ff3d86f32498d1041d82746a3554563e051301 Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Fri, 12 Mar 2021 13:53:16 +0800 Subject: [PATCH] 分销员后台8 --- zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml | 12 ++++++++---- 1 files changed, 8 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..c99b814 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 -- Gitblit v1.9.1