fix meidu some req

Helius

2021-12-29 1975ada3e42a06d4e3ff1cc36b3613020208ce1b

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

@@ -42,9 +42,10 @@
        <result property="couponId" column="couponId"></result>
        <result property="serviceTime" column="service_time"></result>
        <result property="companyId" column="company_id"/>
        <result property="mallType" column="mall_type"/>
        <result property="ableScorePay" column="able_score_pay"/>
        <result property="ableSales" column="able_sales"/>
        <result property="scoreCategoryId" column="score_category_id"/>
        <result property="isUnrealProduct" column="is_unreal_product"/>

        <association property="shopCoupon" select="com.matrix.system.shopXcx.dao.ShopCouponDao.selectById"
                     column="{id=couponId}"></association>
@@ -84,7 +85,7 @@
        <result property="couponId" column="couponId"></result>
        <result property="serviceTime" column="service_time"></result>
        <result property="companyId" column="company_id"/>
        <result property="mallType" column="mall_type"/>
        <result property="ableScorePay" column="able_score_pay"/>
        <result property="ableSales" column="able_sales"/>
        <result property="scoreCategoryId" column="score_category_id"/>
    </resultMap>
@@ -121,8 +122,9 @@
         service_time,
         shop_ids,
         company_id,
        mall_type,
        able_score_pay,
        able_sales,
        is_unreal_product,
        score_category_id

   </sql>
@@ -160,8 +162,9 @@
         #{item.serviceTime},
         #{item.shopIds},
         #{item.companyId},
         #{item.mallType},
         #{item.ableSales},
         #{item.ableScorePay},
            #{item.ableSales},
            #{item.isUnrealProduct},
         #{item.scoreCategoryId}

   </sql>
@@ -252,8 +255,8 @@
                and a.company_id = #{record.companyId}
            </if>

            <if test="record.mallType != null and record.mallType !='' ">
                and a.mall_type = #{record.mallType}
            <if test="record.ableScorePay != null and record.ableScorePay !='' ">
                and a.able_score_pay = #{record.ableScorePay}
            </if>
            <if test="record.ableSales != null and record.ableSales !='' ">
                and a.able_sales = #{record.ableSales}
@@ -336,8 +339,8 @@
                and b.attr_full_path like concat('%/',#{record.attrs},'/%')
            </if>

            <if test="record.mallType != null and record.mallType !='' ">
                and a.mall_type = #{record.mallType}
            <if test="record.ableScorePay != null and record.ableScorePay !='' ">
                and a.able_score_pay = #{record.ableScorePay}
            </if>
            <if test="record.ableSales != null and record.ableSales !='' ">
                and a.able_sales = #{record.ableSales}
@@ -459,8 +462,8 @@
            <if test="_parameter.containsKey('ableSales')">
                able_sales = #{ableSales},
            </if>
            <if test="_parameter.containsKey('mallType')">
                mall_type = #{mallType},
            <if test="_parameter.containsKey('ableScorePay')">
                able_score_pay = #{ableScorePay},
            </if>


@@ -545,14 +548,17 @@
                shop_ids = #{record.shopIds},
            </if>

            <if test="record.mallType != null and record.mallType !='' ">
                mall_type = #{record.mallType},
            <if test="record.ableScorePay != null and record.ableScorePay !='' ">
                able_score_pay = #{record.ableScorePay},
            </if>
            <if test="record.ableSales != null and record.ableSales !='' ">
                able_sales = #{record.ableSales},
            </if>
            <if test="record.scoreCategoryId != null and record.scoreCategoryId ">
               score_category_id = #{record.scoreCategoryId},
                score_category_id = #{record.scoreCategoryId},
            </if>
            <if test="record.isUnrealProduct != null and record.isUnrealProduct">
                is_unreal_product = #{record.isUnrealProduct},
            </if>

        </set>
@@ -642,7 +648,7 @@
      a.marked_price,
      b.attr_full_path,
      a.couponId,
      a.mall_type,
      a.able_score_pay,
      a.able_sales,
      a.score_category_id,
      (SELECT ROUND(SUM(ss.stock),2) from shop_sku  ss where ss.p_id = a.id) as stockNum,
@@ -685,7 +691,7 @@
      a.marked_price,
      a.service_time,
      a.couponId,
        a.mall_type,
        a.able_score_pay,
        a.able_sales,
        a.score_category_id,
      (SELECT ROUND(SUM(ss.stock),2) from shop_sku  ss where ss.p_id = a.id) as stockNum
@@ -725,7 +731,7 @@
        a.marked_price,
        b.attr_full_path,
        a.couponId,
        a.mall_type,
        a.able_score_pay,
        a.able_sales,
        a.score_category_id,
        a.service_time,
@@ -793,7 +799,7 @@
        b.attr_full_path,
        a.service_time,
        a.couponId,
        a.mall_type,
        a.able_score_pay,
        a.able_sales,
        a.score_category_id,
        (SELECT ROUND(SUM(s.stock),2) from shop_sku s where s.p_id = a.id) as stockNum,
@@ -838,8 +844,8 @@
                and find_in_set(#{record.shopIds}, a.shop_ids)
            </if>

            <if test="record.mallType != null and record.mallType !='' ">
                and a.mall_type = #{record.mallType}
            <if test="record.ableScorePay != null and record.ableScorePay !='' ">
                and a.able_score_pay = #{record.ableScorePay}
            </if>
            <if test="record.ableSales != null and record.ableSales !='' ">
                and a.able_sales = #{record.ableSales}
@@ -906,9 +912,10 @@
         is_special_price,
         marked_price,
         couponId,
            a.mall_type,
            a.able_score_pay,
            a.able_sales,
            a.score_category_id,
          a.is_unreal_product,
         (SELECT SUM(s.stock) from shop_sku  s where s.p_id = a.id) as stockNum,
         (SELECT ROUND(SUM(s.stock),2) from shop_sku  s where s.p_id = a.id) as stockNum,
         shop_ids