Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger

935090232@qq.com

2021-10-30 cc59bd70ca7a57330801617b910c029a07fa2b4f

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

@@ -417,4 +417,26 @@
         a.${record.sort} ${record.order}
      </if>
   </select>

   <select id="selectOneByCompanyIdAndActTypeAndActStatus" resultType="com.matrix.system.shopXcx.bean.ShopActivities">
      SELECT
      *
      FROM
      shop_activities a
      where
         a.company_id=#{companyId}
         and a.act_type=#{activitiesTypeSign}
         and a.act_status=#{actstatusStatusIng}
   </select>

   <select id="selectOneByCompanyIdAndActType" resultType="com.matrix.system.shopXcx.bean.ShopActivities">
      SELECT
         *
      FROM
         shop_activities a
      where
         a.company_id=#{companyId}
        and a.act_type=#{activitiesTypeSign}
        and a.act_status != 5
   </select>
</mapper>