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/ShopProductCommentDao.xml | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopProductCommentDao.xml b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopProductCommentDao.xml index fe87fd2..3c85b34 100644 --- a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopProductCommentDao.xml +++ b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopProductCommentDao.xml @@ -318,7 +318,7 @@ shop_product_comment c LEFT JOIN shop_product p ON c.product_id = p.id LEFT JOIN shop_order o ON c.order_id = o.id - LEFT JOIN sys_vip_info b ON c.user_id = b.id + LEFT JOIN sys_vip_info b ON c.user_id = b.openid <where> <include refid="where_sql"></include> </where> @@ -425,7 +425,7 @@ shop_product_comment c LEFT JOIN shop_product p ON c.product_id = p.id LEFT JOIN shop_order o ON c.order_id = o.id - LEFT JOIN sys_vip_info b ON c.user_id = b.id + LEFT JOIN sys_vip_info b ON c.user_id = b.openid <where> and c.product_id = #{record.productId} AND p.del_flag = 2 @@ -448,7 +448,7 @@ shop_product_comment c LEFT JOIN shop_product p ON c.product_id = p.id LEFT JOIN shop_order o ON c.order_id = o.id - LEFT JOIN sys_vip_info b ON c.user_id = b.id + LEFT JOIN sys_vip_info b ON c.user_id = b.openid <where> <if test="record!=null"> <if test="(record.productId!=null and record.productId!='') or (record.productId!='' and record.productId==0) "> -- Gitblit v1.9.1