From e892ea04b56194b6208b5a902f1622f40d4c56a7 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 10 Jul 2021 09:10:08 +0800
Subject: [PATCH] 新增美度正式环境配置
---
zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml
index e49dc44..1277ab1 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml
@@ -85,6 +85,8 @@
<result property="goodsSortName" column="goodsSortName" />
+ <result property="achieveRuleName" column="achieveRuleName" />
+
<result property="payMethods" column="pay_methods" />
<result property="invalidTime" column="invalid_time" />
@@ -167,6 +169,8 @@
<!-- 扩展属性 -->
<result property="cateName" column="cate_name" />
<result property="goodsSortName" column="goodsSortName" />
+ <result property="achieveRuleName" column="achieveRuleName" />
+
</resultMap>
@@ -586,8 +590,9 @@
<select id="selectInPage" resultMap="ShoppingGoodsMap">
select
a.*,
- (select TYPE_NAME from sys_goods_type b where b.id=a.goods_sort_id) goodsSortName,
- (select NAME from shopping_goods_category t where t.id=a.cate_id) cate_name,
+ (select name from achieve_rule f where f.id=a.achieve_rule_id) as achieveRuleName,
+ (select TYPE_NAME from sys_goods_type b where b.id=a.goods_sort_id) as goodsSortName,
+ (select NAME from shopping_goods_category t where t.id=a.cate_id) as cate_name,
(select shop_name from sys_shop_info h where a.SHOP_ID=h.ID ) as shop_name
from shopping_goods a
where 1=1
@@ -662,6 +667,11 @@
</if>
+ <if test="record.achieveRuleId != null and record.achieveRuleId !='' ">
+ and achieve_rule_id = #{record.achieveRuleId}
+ </if>
+
+
<if test="record.headquarters != null and record.headquarters !='' ">
and headquarters = #{record.headquarters}
@@ -728,7 +738,9 @@
<if test="record.isVipCar != null and record.isVipCar !='' ">
and is_vip_car = #{record.isVipCar}
</if>
-
+ <if test="record.achieveRuleId != null and record.achieveRuleId !='' ">
+ and achieve_rule_id = #{record.achieveRuleId}
+ </if>
<if test="record.isCourse != null and record.isCourse !=''">
and is_course = #{record.isCourse}
@@ -773,6 +785,7 @@
<select id="selectAll" resultMap="ShoppingGoodsSimpleMap">
select
*,
+ (select name from achieve_rule f where f.id=a.achieve_rule_id) as achieveRuleName,
(select TYPE_NAME from sys_goods_type b where b.id=a.goods_sort_id) goodsSortName,
(select NAME from
shopping_goods_category t where t.id=cate_id)
@@ -878,6 +891,7 @@
<select id="findByCode" resultMap="ShoppingGoodsMap">
select
*,
+ (select name from achieve_rule f where f.id=a.achieve_rule_id) as achieveRuleName,
(select TYPE_NAME from sys_goods_type b where b.id=a.goods_sort_id) goodsSortName,
(select NAME from shopping_goods_category t where
t.id=cate_id)
@@ -890,6 +904,7 @@
<select id="selectSimpleMapById" resultMap="ShoppingGoodsSimpleMap">
select
*,
+ (select name from achieve_rule f where f.id=a.achieve_rule_id) as achieveRuleName,
(select TYPE_NAME from sys_goods_type b where b.id=a.goods_sort_id) goodsSortName,
(select NAME from
shopping_goods_category t where t.id=cate_id)
@@ -909,6 +924,7 @@
<select id="selectByModel" resultMap="ShoppingGoodsMap">
select
*,
+ (select name from achieve_rule f where f.id=a.achieve_rule_id) as achieveRuleName,
(select TYPE_NAME from sys_goods_type b where b.id=a.goods_sort_id) goodsSortName,
(select NAME from
shopping_goods_category t where t.id=cate_id)
@@ -988,6 +1004,7 @@
<select id="selectByModel1" resultMap="ShoppingGoodsMap">
select
*,
+ (select name from achieve_rule f where f.id=a.achieve_rule_id) as achieveRuleName,
(select TYPE_NAME from sys_goods_type b where b.id=a.goods_sort_id) goodsSortName,
(select NAME from
shopping_goods_category t where t.id=cate_id)
@@ -1066,6 +1083,7 @@
<select id="selectInPageNoTaocan" resultMap="ShoppingGoodsMap">
select
*,
+ (select name from achieve_rule f where f.id=a.achieve_rule_id) as achieveRuleName,
(select TYPE_NAME from sys_goods_type b where b.id=a.goods_sort_id) goodsSortName,
(select NAME from
shopping_goods_category t where t.id=cate_id)
@@ -1237,6 +1255,10 @@
</foreach>
</update>
+ <update id="updateInvalidProduct">
+ update shopping_goods set staus = '下架'
+ where date_format(now(), '%Y-%m-%d') > date_format(sale_off_time, '%Y-%m-%d') and staus='上架'
+ </update>
<!-- 根据code查询 -->
--
Gitblit v1.9.1