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

jyy

2021-04-09 4140a631bbcfa379b0b8206aa41d1b2453ffdb04

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

@@ -10,12 +10,14 @@
      a.id id,
      b.nick_name nickName,
      a.receive_time reciveTime,
      a.state,
      c.cumulative_day cumulativeDay,
      c.award_type awardType,
      c.award_name awardName
      c.award_name awardName,
      c.award_rule awardRule
      FROM
      activity_sign_receive_record a
      LEFT JOIN biz_user b ON a.open_id = b.open_id
      LEFT JOIN biz_user b ON a.user_id = b.user_id
      LEFT JOIN activity_sign_award_set c ON a.award_id = c.id
      <where>
         a.company_id = #{record.companyId}
@@ -76,4 +78,18 @@
      </if>
   </select>

   <select id="getSignAwardReceiveCount" resultType="int">
      SELECT
         count(a.id)
      FROM
         activity_sign_receive_record a
      LEFT JOIN activity_sign_award_set b ON a.award_id = b.id
      where
            b.award_type = 1
           and a.state = 1
           and a.company_id = #{companyId}
         and a.user_id = #{userId}

   </select>

</mapper>