From b0c5d432ec041221dcbe81ca5ae3aa20fe3bddc6 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 22 Mar 2021 20:17:58 +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/ShopSkuDao.xml | 45 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 43 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopSkuDao.xml b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopSkuDao.xml
index 1c85265..7d6030d 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopSkuDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopSkuDao.xml
@@ -24,6 +24,8 @@
<result property="shopId" column="shop_id"/>
<result property="sealesPrice" column="seales_price"/>
<result property="invitationPrice" column="invitation_price"/>
+ <result property="scorePrice" column="score_price"/>
+ <result property="scoreCount" column="score_count"/>
@@ -50,6 +52,8 @@
<result property="shopId" column="shop_id"/>
<result property="sealesPrice" column="seales_price"/>
<result property="invitationPrice" column="invitation_price"/>
+ <result property="scorePrice" column="score_price"/>
+ <result property="scoreCount" column="score_count"/>
</resultMap>
<!-- 字段sql -->
@@ -72,7 +76,11 @@
stock_code,
shop_id,
seales_price,
-invitation_price
+invitation_price,
+ score_price,
+score_count
+
+
</sql>
<!-- 属性sql -->
@@ -95,7 +103,10 @@
#{item.stockCode},
#{item.shopId},
#{item.sealesPrice},
- #{item.invitationPrice}
+ #{item.invitationPrice},
+ #{item.scorePrice},
+ #{item.scoreCount}
+
</sql>
@@ -136,6 +147,18 @@
<if test="(record.shopId!=null and record.shopId!='') or (record.shopId!='' and record.shopId==0) ">
and shop_id = #{record.shopId}
</if>
+
+ <if test="(record.scorePrice!=null and record.scorePrice!='') or (record.scorePrice!='' and record.scorePrice==0) ">
+ and score_price = #{record.scorePrice}
+ </if>
+
+
+ <if test="(record.scoreCount!=null and record.scoreCount!='') or (record.scoreCount!='' and record.scoreCount==0) ">
+ and score_count = #{record.scoreCount}
+ </if>
+
+
+
</if>
</sql>
@@ -202,6 +225,16 @@
<if test="_parameter.containsKey('sealesPrice')">
seales_price = #{sealesPrice},
</if>
+
+ <if test="_parameter.containsKey('scorePrice')">
+ score_price = #{scorePrice},
+ </if>
+
+ <if test="_parameter.containsKey('scoreCount')">
+ score_count = #{scoreCount},
+ </if>
+
+
</set>
WHERE id=#{id}
</update>
@@ -252,6 +285,14 @@
invitation_price = #{record.invitationPrice},
</if>
+ <if test="record.scorePrice != null ">
+ score_price = #{record.scorePrice},
+ </if>
+
+ <if test="record.scoreCount != null ">
+ score_count = #{record.scoreCount},
+ </if>
+
</set>
WHERE id=#{record.id}
--
Gitblit v1.9.1