Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-05-08 e53fcbe9fe844b7788b29c5106c1ac24d17c5535

 zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopSkuDao.xml

@@ -22,9 +22,11 @@
        <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"/>
        <result property="scoreCount" column="score_count"/>



@@ -49,9 +51,11 @@
        <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"/>
        <result property="scoreCount" column="score_count"/>
    </resultMap>

    <!-- 字段sql -->
@@ -73,9 +77,12 @@
         seal_count,
         stock_code,
         shop_id,
self_price,
seales_price,
invitation_price,
        score_price
        score_price,
score_count


   </sql>

@@ -98,9 +105,11 @@
         #{item.sealCount},
         #{item.stockCode},
         #{item.shopId},
         #{item.selfPrice},
         #{item.sealesPrice},
         #{item.invitationPrice},
         #{item.scorePrice}
         #{item.scorePrice},
         #{item.scoreCount}


   </sql>
@@ -145,6 +154,11 @@

            <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>


@@ -220,6 +234,14 @@
                score_price = #{scorePrice},
            </if>

            <if test="_parameter.containsKey('scoreCount')">
                score_count = #{scoreCount},
            </if>

            <if test="_parameter.containsKey('selfPrice')">
                self_price = #{selfPrice},
            </if>


        </set>
        WHERE id=#{id}
@@ -275,6 +297,14 @@
                score_price = #{record.scorePrice},
            </if>

            <if test="record.scoreCount != null ">
                score_count = #{record.scoreCount},
            </if>

            <if test="record.selfPrice != null ">
                self_price = #{record.selfPrice},
            </if>


        </set>
        WHERE id=#{record.id}