From ad31648c6f7a8bff1f7ccdf84b76006b9ffb78f8 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 17 Jul 2021 15:59:10 +0800
Subject: [PATCH] 1. 新增套餐中有效和无效的操作 2. 会员修改门店功能 3. 套餐新增编辑次数功能 4. 计算是否为赠送的条件为，全部为赠送金额购买且支付金额大于0 5. 打印小票功能调整间距，和收银人 6. PC端服务单新增划扣金额展示
---
zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanGradeDao.xml | 35 +++++++++++++++++++++++++++++++++--
1 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanGradeDao.xml b/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanGradeDao.xml
index 9cf76e9..3b3a30a 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanGradeDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanGradeDao.xml
@@ -13,7 +13,7 @@
<result property="name" column="name" />
<result property="sealesCommission" column="seales_commission" />
<result property="invitationCommission" column="invitation_commission" />
- <result property="condition" column="condition" />
+ <result property="gradeCondition" column="grade_condition" />
<result property="isDefault" column="is_default" />
<result property="companyId" column="company_id" />
</resultMap>
@@ -29,9 +29,40 @@
<result property="name" column="name" />
<result property="sealesCommission" column="seales_commission" />
<result property="invitationCommission" column="invitation_commission" />
- <result property="condition" column="condition" />
+ <result property="gradeCondition" column="grade_condition" />
<result property="isDefault" column="is_default" />
<result property="companyId" column="company_id" />
</resultMap>
+
+ <select id="getShopSalesmanGradeVo" resultType="com.matrix.system.fenxiao.vo.ShopSalesmanGradeVo">
+ SELECT
+ a.id,
+ a.name
+ FROM
+ shop_salesman_grade a
+ where
+ a.company_id = #{companyId}
+ </select>
+
+ <select id="findFyfaManageList" resultType="com.matrix.system.fenxiao.vo.FyfaManageVo">
+ SELECT
+ a.id id,
+ a.name name,
+ a.self_commission selfCommission,
+ a.seales_commission sealesCommission,
+ a.invitation_commission invitationCommission,
+ a.grade_condition gradeCondition,
+ a.is_default isDefault
+ FROM
+ shop_salesman_grade a
+ <where>
+ a.company_id = #{record.companyId}
+ </where>
+ <if test="record.sort !=null">
+ order by
+ a.${record.sort} ${record.order}
+ </if>
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1