1、查询产品bug 2、储值卡使用完成不设置为失效

jyy

2021-01-27 af6a6f03d3da1303b6fec2cff5dbd0fd10e8ad5c

 zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml

@@ -538,6 +538,8 @@
        where a.ID=#{id}
    </select>



    <!-- 根据手机和密码查询 -->
    <select id="selectVipByPhonePassWord" resultMap="SysVipInfoMap">
        <include refid="select"></include>
@@ -640,14 +642,11 @@
      COMMISSION_ALL,IN_DATE,STAFF_ID,SHOP_ID,IS_DELETE,REMARK,PASSWORD,
      EMAIL,CREATE_TIME,UUID,BALANCE,blood,sfCard,link,marry,vocation 
        from sys_vip_info 
        where
        SHOP_ID=#{shopId}
       and  (
       instr(PHONE,#{keyWord})
        where company_id=#{companyId}
      and (instr(PHONE,#{keyWord})
         or instr(VIP_NAME ,#{keyWord})
         or instr(zjm ,#{keyWord})
           or instr(VIP_NO ,#{keyWord})
       )
           or instr(VIP_NO ,#{keyWord}))
         limit 0,15
   </select>

@@ -672,7 +671,7 @@
        and
        (a.VIP_NO =#{key} or
        a.VIP_NAME =#{key} or
        a.PHONE =#{key}) and a.shop_id=#{shopId}
        a.PHONE =#{key})
    </select>

    <select id="getLevelIdByMoney" resultMap="SysVipInfoMap">
@@ -1262,7 +1261,8 @@
               a.PHONE phone,
               a.photo photo,
               b.arriveCnt arriveCnt,
               g.shop_short_name shopName
               g.shop_short_name shopName,
               z.level_name vipLevel
        from sys_vip_info a
        left join (
            select x.vip_id, count(1) arriveCnt from (
@@ -1280,6 +1280,7 @@
                                                 group by date_format(datatime, '%Y-%m-%d'), vip_id
                                             ) x group by x.vip_id
            ) b on a.ID=b.vip_id
        left join sys_vip_level z on a.level_id=z.id
        <!-- 本月消费 -->
        <if test="record.sort == 'used'">
            left join (
@@ -1316,6 +1317,9 @@
        <if test="record.shopId != null">
            and a.shop_id=#{record.shopId}
        </if>
        <if test="record.companyId != null">
            and a.company_id=#{record.companyId}
        </if>
        <if test='record.birthType=="1"'>
            and a.BIRTHDAY1 between curdate() and DATE_ADD(CURDATE(), INTERVAL 3 DAY)
        </if>
@@ -1338,6 +1342,9 @@
        <if test="record.sort != 'monthArrived' and record.sort != 'yearArrived'">
            order by ${record.sort} ${record.order}
        </if>
        <if test="record.offset >=0  and record.limit >0">
            limit #{record.offset},#{record.limit}
        </if>
    </select>

    <select id="selectVipInfoById" resultType="com.matrix.system.app.vo.VipInfoVo">