Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-05-08 e53fcbe9fe844b7788b29c5106c1ac24d17c5535

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

@@ -63,7 +63,7 @@
      f.receive_address receiveAddress
      FROM
      activity_sign_writeoff a
      left join biz_user b on a.user_id= b.user_id
      left join sys_vip_info b on a.user_id= b.id
      left join shop_activities c on a.act_id= c.id
      left join activity_sign_award_set d on a.award_id= d.id
      left join activity_sign_receive_record e on a.receive_id= e.id
@@ -89,7 +89,7 @@
             b.nick_name zjr
      FROM
      activity_sign_receive_record a
      left join biz_user b on a.user_id= b.user_id
      left join sys_vip_info b on a.user_id= b.id
      where a.user_id = #{userId} and a.award_id = #{receiveId}
   </select>

@@ -101,4 +101,13 @@
      where a.id = #{logisticsId}
   </select>

   <select id="selectActivitySignWriteoffByUserIDAndReceiveId" resultType="com.matrix.system.activity.entity.ActivitySignWriteoff">
      SELECT
         *
      FROM
         activity_sign_writeoff a
      where a.receive_id = #{receiveId}
         and a.user_id = #{userId}
   </select>

</mapper>