修复bug

jyy

2021-07-14 d13ae240c54c59b04c0571bfc0136ed0c8ba32a3

 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
@@ -72,6 +72,9 @@
         a.company_id = #{record.companyId}
         <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">
@@ -86,8 +89,25 @@
             b.nick_name zjr
      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}
      left join sys_vip_info b on a.user_id= b.id
      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>

   <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>