From a27c45a501d059bca456bac7b561786232d3ecf3 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 31 Jul 2021 17:30:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml | 10 +++++++---
1 files changed, 7 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 d0ff42f..30fa7f3 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml
@@ -429,7 +429,7 @@
<if test="isPresent != null and isPresent !='' ">
is_present = #{isPresent},
</if>
- <if test="isOnce != null and isOnce !='' ">
+ <if test="isOnce != null ">
is_once = #{isOnce},
</if>
<if test="salePlatform != null and salePlatform !='' ">
@@ -447,13 +447,13 @@
</if>
<if
- test="(carMaxSaleCount != null and carMaxSaleCount !='') or carMaxSaleCount==0">
+ test="carMaxSaleCount != null">
car_max_sale_count = #{carMaxSaleCount},
</if>
<if test="carIsAll != null and carIsAll !='' ">
car_is_all = #{carIsAll},
</if>
- <if test="(carUseCount != null and carUseCount !='') or carUseCount==0 ">
+ <if test="carUseCount != null ">
car_use_count = #{carUseCount},
</if>
<if test="isVipCar != null and isVipCar !='' ">
@@ -1255,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