Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-04-14 95f9ea7eb339c36cade6c67d0385c49ec2d81477

 zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignWriteoffDao.xml

@@ -73,6 +73,9 @@
         <if test="record.zjzxm != null and record.zjzxm != ''">
            and b.nick_name like concat('%',#{record.zjzxm},'%')
         </if>
         <if test="record.hdmcbm != null and record.hdmcbm != ''">
            and (c.act_name like concat('%',#{record.hdmcbm},'%') or c.act_code like concat('%',#{record.hdmcbm},'%'))
         </if>
      </where>
      <if test="record.sort !=null">
         order by
@@ -87,7 +90,15 @@
      FROM
      activity_sign_receive_record a
      left join biz_user b on a.user_id= b.user_id
      where a.user_id = #{userId} and a.id = #{receiveId}
      where a.user_id = #{userId} and a.award_id = #{receiveId}
   </select>

   <select id="selectShopDeliveryInfoByLogisticsId" resultType="com.matrix.system.shopXcx.bean.ShopDeliveryInfo">
      SELECT
         *
      FROM
         shop_delivery_info a
      where a.id = #{logisticsId}
   </select>

</mapper>