From 512a2f0fb09b663b8de19b5313c8bd5899f4f74b Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 06 Apr 2021 09:44:06 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
---
zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopOrderSearchDao.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopOrderSearchDao.xml b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopOrderSearchDao.xml
index 6404029..9c86499 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopOrderSearchDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopOrderSearchDao.xml
@@ -95,13 +95,13 @@
select
so.order_no,so.order_status,sp.title pro_name,spa.attr_name pro_type,sp.attrs_values pro_attrs,sku.`NAME` pro_specification,sod.count 'count',sod.price*sod.count order_money,bu.nick_name nick_name,so.order_time
from
- shop_order_details sod,shop_product sp,shop_product_attribute spa,shop_order so,biz_user bu,shop_sku sku
+ shop_order_details sod,shop_product sp,shop_product_attribute spa,shop_order so,sys_vip_info bu,shop_sku sku
where
so.del_flag = 2
and sod.p_id = sp.id
and sp.category_id = spa.attr_id
and sod.order_id = so.id
- and bu.open_id = so.user_id
+ and bu.id = so.user_id
and sku.p_id = sod.p_id
and so.company_id=#{record.companyId}
<if test="record != null">
@@ -152,13 +152,13 @@
<select id="selectTotalRecordByQuery" resultType="java.lang.Integer">
select count(*)
from
- shop_order_details sod,shop_product sp,shop_product_attribute spa,shop_order so,biz_user bu,shop_sku sku
+ shop_order_details sod,shop_product sp,shop_product_attribute spa,shop_order so,sys_vip_info bu,shop_sku sku
where
so.del_flag = 2
and sod.p_id = sp.id
and sp.category_id = spa.attr_id
and sod.order_id = so.id
- and bu.open_id = so.user_id
+ and bu.id = so.user_id
and sku.p_id = sod.p_id
and so.company_id=#{record.companyId}
<if test="record != null">
--
Gitblit v1.9.1