Merge branch 'api' into hive2.0

935090232@qq.com

2021-01-26 d622f4d59d6b9e03271b3f4774bffedb3b8a3078

Merge branch 'api' into hive2.0

 zq-erp/src/main/java/com/matrix/system/app/dto/ShoppingGoodsListDto.java

@@ -32,6 +32,17 @@
    @ApiModelProperty(hidden = true)
    private Long shopId;

    @ApiModelProperty(hidden = true)
    private Long companyId;

    public Long getCompanyId() {
        return companyId;
    }

    public void setCompanyId(Long companyId) {
        this.companyId = companyId;
    }

    public String getGoodType() {
        return goodType;
    }

 zq-erp/src/main/java/com/matrix/system/hive/dao/SysVipInfoDao.java

@@ -134,7 +134,7 @@
     * @param keyWord
     * @return
     */
    public List<SysVipInfo> selectUserByKey(@Param("keyWord") String keyWord);
    public List<SysVipInfo> selectUserByKey(@Param("keyWord") String keyWord,@Param("companyId") Long companyId);
    
    /**
     * 会员活跃状态自动修改

 zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java

@@ -293,7 +293,8 @@

    @Override
    public List<SysVipInfo> findUserByKey(String keyWord) {
        return sysVipInfoDao.selectUserByKey(keyWord);
        SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
        return sysVipInfoDao.selectUserByKey(keyWord,user.getCompanyId());
    }
    


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

@@ -642,11 +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
        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>