From fd563c2a20613325efcc37cbc8aa754eeeba5e45 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 29 Mar 2021 14:19:03 +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 | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 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 7d6030d..13a8e2e 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopSkuDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopSkuDao.xml
@@ -22,6 +22,7 @@
<result property="sealCount" column="seal_count"/>
<result property="stockCode" column="stock_code"/>
<result property="shopId" column="shop_id"/>
+ <result property="selfPrice" column="self_price"/>
<result property="sealesPrice" column="seales_price"/>
<result property="invitationPrice" column="invitation_price"/>
<result property="scorePrice" column="score_price"/>
@@ -50,6 +51,7 @@
<result property="sealCount" column="seal_count"/>
<result property="stockCode" column="stock_code"/>
<result property="shopId" column="shop_id"/>
+ <result property="selfPrice" column="self_price"/>
<result property="sealesPrice" column="seales_price"/>
<result property="invitationPrice" column="invitation_price"/>
<result property="scorePrice" column="score_price"/>
@@ -75,6 +77,7 @@
seal_count,
stock_code,
shop_id,
+self_price,
seales_price,
invitation_price,
score_price,
@@ -102,6 +105,7 @@
#{item.sealCount},
#{item.stockCode},
#{item.shopId},
+ #{item.selfPrice},
#{item.sealesPrice},
#{item.invitationPrice},
#{item.scorePrice},
@@ -234,6 +238,10 @@
score_count = #{scoreCount},
</if>
+ <if test="_parameter.containsKey('selfPrice')">
+ self_price = #{selfPrice},
+ </if>
+
</set>
WHERE id=#{id}
@@ -293,6 +301,10 @@
score_count = #{record.scoreCount},
</if>
+ <if test="record.selfPrice != null ">
+ self_price = #{record.selfPrice},
+ </if>
+
</set>
WHERE id=#{record.id}
--
Gitblit v1.9.1