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/xcxShop/ShopActivitiesSalonRecordDao.xml | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesSalonRecordDao.xml b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesSalonRecordDao.xml index da0bb54..a759d6f 100644 --- a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesSalonRecordDao.xml +++ b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesSalonRecordDao.xml @@ -16,7 +16,7 @@ <result property="status" column="status" /> <result property="nickName" column="nick_name" /> <result property="shopName" column="shop_short_name" /> - <result property="phone" column="phone_number" /> + <result property="phone" column="phone" /> <collection property="salonAttr" ofType="com.matrix.system.shopXcx.bean.ShopActivitiesSalonAttrRecord"> <id property="id" column="asd_id" /> <result property="attrName" column="attr_name" /> @@ -184,10 +184,10 @@ <!-- 分页查询 --> <select id="selectInPage" resultMap="ShopActivitiesSalonRecordMap"> - select t1.*, t3.nick_name, t3.phone_number, t4.shop_short_name, t2.id asd_id, t2.attr_name, t2.attr_value, t2.asr_id + select t1.*, t3.nick_name, t3.phone, t4.shop_short_name, t2.id asd_id, t2.attr_name, t2.attr_value, t2.asr_id from shop_activities_salon_record t1 inner join shop_activities_salon_attr_record t2 on t1.id=t2.asr_id - left join biz_user t3 on t1.user_id=open_id + left join sys_vip_info t3 on t1.user_id=id left join sys_shop_info t4 on t1.shop_id=t4.id <where> <include refid="where_sql"></include> -- Gitblit v1.9.1