Merge branch 'developer' into hive2.0

Helius

2022-05-27 4351e71d782741143a98f86f6648acd16689165f

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

@@ -22,6 +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"/>



@@ -46,6 +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 -->
@@ -66,7 +76,14 @@
         purchase_price,
         seal_count,
         stock_code,
         shop_id
         shop_id,
self_price,
seales_price,
invitation_price,
        score_price,
score_count


   </sql>

    <!-- 属性sql -->
@@ -87,7 +104,13 @@
         #{item.purchasePrice},
         #{item.sealCount},
         #{item.stockCode},
         #{item.shopId}
         #{item.shopId},
         #{item.selfPrice},
         #{item.sealesPrice},
         #{item.invitationPrice},
         #{item.scorePrice},
         #{item.scoreCount}


   </sql>

@@ -128,6 +151,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>
@@ -188,6 +223,26 @@
            <if test="_parameter.containsKey('stockCode')">
                stock_code = #{stockCode},
            </if>
            <if test="_parameter.containsKey('invitationPrice')">
                invitation_price = #{invitationPrice},
            </if>
            <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>

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


        </set>
        WHERE id=#{id}
    </update>
@@ -231,6 +286,24 @@
            <if test="record.stockCode != null ">
                stock_code = #{record.stockCode},
            </if>
            <if test="record.sealesPrice != null ">
                seales_price = #{record.sealesPrice},
            </if>
            <if test="record.invitationPrice != null ">
                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>

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


        </set>