Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-07-29 35cea8fd3552a048ed49d0596b647c983e148644

Merge branch 'score_shop' into api_score_meger

 zq-erp/src/main/java/com/matrix/system/app/action/ApiVipInfoAction.java

@@ -2,8 +2,6 @@

import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.pojo.PaginationVO;
import com.matrix.core.tools.EncrypUtil;
import com.matrix.core.tools.StringUtils;
import com.matrix.core.tools.WebUtil;
import com.matrix.system.app.dto.AddVipDto;
@@ -17,11 +15,9 @@
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.common.dao.CustomerDataDictionaryDao;
import com.matrix.system.common.tools.DataAuthUtil;
import com.matrix.system.common.tools.PasswordUtil;
import com.matrix.system.hive.action.BaseController;
import com.matrix.system.hive.action.util.QueryUtil;
import com.matrix.system.hive.bean.*;
import com.matrix.system.hive.dao.MoneyCardUseDao;
import com.matrix.system.hive.dao.VipAnswerDao;
import com.matrix.system.hive.plugin.util.CollectionUtils;
import com.matrix.system.hive.service.MoneyCardUseService;
@@ -36,8 +32,6 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import java.io.UnsupportedEncodingException;
import java.security.NoSuchAlgorithmException;
import java.util.List;

/**
@@ -81,10 +75,15 @@
            vipInfoListDto.setOrder("asc");
        }


        int offset = (vipInfoListDto.getPageNum() - 1) * vipInfoListDto.getPageSize();
        int limit = vipInfoListDto.getPageSize();
        vipInfoListDto.setOffset(offset);
        vipInfoListDto.setLimit(limit);




        return AjaxResult.buildSuccessInstance(sysVipInfoService.findVipAddressBook(vipInfoListDto));
    }


 zq-erp/src/main/java/com/matrix/system/app/authority/AppAuthorityManager.java

@@ -22,6 +22,7 @@

import java.util.*;
import java.util.Map.Entry;
import java.util.stream.Collectors;

/**
 * DefaultAuthorityManager 实现了权限控制接口
@@ -163,11 +164,17 @@
            // 普通员工账号只拥有自己所拥有的权限
            List<SysFunction> userFunctionList = sysFunctionService.findFunctionByRoleIds(sysUser.getRoleIds());
            for (SysFunction sysFunction : userFunctionList) {

                sysFunction.setSysFnBtnRel(
                        sysFunction.getSysFnBtnRel().stream().filter(item->StringUtils.isContentSet(item.getBtnValue(),sysFunction.getRpfBns())).collect(Collectors.toList())
                );

                // TODO注册访问路径
                registerUrlMapping(userUrlMapping, sysFunction,false);
                if (userFunctionMap.containsKey(sysFunction.getFnCode())) {
                    // 如果功能已经被添加到集合中则追加权限按钮
                    SysFunction oneFunctionInMap = userFunctionMap.get(sysFunction.getFnCode());

                    // 为了方便判断所以用字符串记录一下
                    if (StringUtils.isBlank(oneFunctionInMap.getRpfBns())) {
                        oneFunctionInMap.setRpfBns(sysFunction.getRpfBns());

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

@@ -21,7 +21,7 @@
    @ApiModelProperty(value = "会员ID")
    private Long vipId;

    @NotNull(message = "请选择美疗师")
//    @NotNull(message = "请选择美疗师")
    @ApiModelProperty(value = "美疗师ID")
    private Long beautyId;


 zq-erp/src/main/java/com/matrix/system/app/vo/VipInfoListVo.java

@@ -14,6 +14,9 @@
    @ApiModelProperty(value = "会员姓名")
    private String vipName;

    @ApiModelProperty(value = "会员编号")
    private String vipNo;

    @ApiModelProperty(value = "会员手机号")
    private String phone;

@@ -87,4 +90,12 @@
    public void setVipLevel(String vipLevel) {
        this.vipLevel = vipLevel;
    }

    public String getVipNo() {
        return vipNo;
    }

    public void setVipNo(String vipNo) {
        this.vipNo = vipNo;
    }
}

 zq-erp/src/main/java/com/matrix/system/common/bean/SysRole.java

@@ -59,6 +59,11 @@
    private String plates;

    /**
     * 所有客户权限
     */
    private String coustomer;

    /**
     * 功能集合
     */
    @Extend
@@ -76,6 +81,14 @@
    @Extend
    private String menuKeys;

    public String getCoustomer() {
        return coustomer;
    }

    public void setCoustomer(String coustomer) {
        this.coustomer = coustomer;
    }

    public Integer getIsDefault() {
        return isDefault;
    }

 zq-erp/src/main/java/com/matrix/system/common/bean/SysUsers.java

@@ -244,6 +244,7 @@
    private String shopName;


    private String allCustomer;

    private String roleName;

@@ -272,6 +273,7 @@
    private String departName;



    /**
     * 入职时间区域查询
     **/
@@ -286,6 +288,14 @@
    @Extend
    private SysCompany company;

    public String getAllCustomer() {
        return allCustomer;
    }

    public void setAllCustomer(String allCustomer) {
        this.allCustomer = allCustomer;
    }

    public Long getSuId() {
        return suId;
    }

 zq-erp/src/main/java/com/matrix/system/common/tag/ButtonRoleJsTagProcessor.java

File was deleted

 zq-erp/src/main/java/com/matrix/system/common/tag/MatrixProcessorDialect.java

@@ -47,7 +47,6 @@
    public Set<IProcessor> getProcessors(final String dialectPrefix) {
        final Set<IProcessor> processors = new HashSet<IProcessor>();
        processors.add(new ButtonRoleAttributeTagProcessor(dialectPrefix));
        processors.add(new ButtonRoleJsTagProcessor(dialectPrefix));
        processors.add(new ButtonRoleFnTagProcessor(dialectPrefix));
        // This will remove the xmlns:matrix attributes we might add for IDE validation
        processors.add(new StandardXmlNsTagProcessor(TemplateMode.HTML, dialectPrefix));

 zq-erp/src/main/java/com/matrix/system/common/tools/DataAuthUtil.java

@@ -25,4 +25,13 @@
    }


    /**
     * 可以查询所有会员
     * @return
     */
    public static boolean hasAllCustomerAuth() {
        SysUsers user = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
        return user.getShopRole().equals(Dictionary.FLAG_YES_Y) || user.getSuUserType().equals(AppConstance.USER_TYPE_ADMIN);

    }
}

 zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java

@@ -18,6 +18,7 @@
import com.matrix.system.common.dao.CustomerDataDictionaryDao;
import com.matrix.system.common.service.SysUsersService;
import com.matrix.system.common.service.SystemDictionaryService;
import com.matrix.system.common.tools.DataAuthUtil;
import com.matrix.system.common.tools.ResponseHeadUtil;
import com.matrix.system.constance.Dictionary;
import com.matrix.system.hive.action.util.QueryUtil;
@@ -31,7 +32,6 @@
import com.matrix.system.score.dao.ScoreVipDetailDao;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

@@ -41,7 +41,6 @@
import java.io.File;
import java.io.IOException;
import java.io.OutputStream;
import java.net.URLDecoder;
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.Arrays;
@@ -548,25 +547,17 @@
    }

    @RequestMapping(value = "/exportExcel")
    public void report(ModelMap model, HttpServletRequest request, HttpServletResponse response,
    public void report( HttpServletResponse response,
                       SysVipInfo vipInfo) throws IOException {

        if (vipInfo.getVipType() != null && !(vipInfo.getVipType().equals(""))) {
            vipInfo.setVipType(URLDecoder.decode(vipInfo.getVipType(), "UTF-8"));
        }
        if (vipInfo.getVipName() != null && !"".equals(vipInfo.getVipName())) {
            vipInfo.setVipName(URLDecoder.decode(vipInfo.getVipName(), "UTF-8"));
        }
        if (vipInfo.getArrivalWay() != null && !"".equals(vipInfo.getArrivalWay())) {
            vipInfo.setArrivalWay(URLDecoder.decode(vipInfo.getArrivalWay(), "UTF-8"));
        }
        if (vipInfo.getVipState() != null && !"".equals(vipInfo.getVipState())) {
            vipInfo.setVipState(URLDecoder.decode(vipInfo.getVipState(), "UTF-8"));
        SysUsers sysUsers = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
        if(!DataAuthUtil.hasAllShopAuth()){
            vipInfo.setShopId(sysUsers.getShopId());
        }

        List<ExcelSheetPO> res = new ArrayList<>();
        ExcelSheetPO orderSheet = new ExcelSheetPO();
        String title = "每日单据明细";
        String title = "会员资料";
        orderSheet.setSheetName(title);
        orderSheet.setTitle(title);
        String[] header = {"会员编号", "姓名", "性别", "手机号码", "会员类型", "会员活跃度", "到店途径", "健康顾问", "所属门店"};

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

@@ -1241,7 +1241,8 @@
            if(zsConsumeAchieve){
                if(sysOrderItem.getPrice()>0){

                    //大于0 不修改金额

                    

                }else{
                    //等于0取原价

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

@@ -17,6 +17,7 @@
import com.matrix.system.common.bean.BusParameterSettings;
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.common.dao.BusParameterSettingsDao;
import com.matrix.system.common.tools.DataAuthUtil;
import com.matrix.system.common.tools.ServiceUtil;
import com.matrix.system.constance.Dictionary;
import com.matrix.system.constance.TableMapping;
@@ -429,10 +430,10 @@
    @Override
    public List<VipInfoListVo> findVipAddressBook(VipInfoListDto vipInfoListDto) {
        //todo 会员查询单独做控制
//        SysUsers sysUsers = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
//        if (!DataAuthUtil.hasAllShopAuth()) {
//            vipInfoListDto.setShopId(sysUsers.getShopId());
//        }
        SysUsers sysUsers = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
        if (!DataAuthUtil.hasAllCustomerAuth()) {
            vipInfoListDto.setShopId(sysUsers.getShopId());
        }
        QueryUtil.setQueryLimitCom(vipInfoListDto);
        return sysVipInfoDao.selectVipAddressBookByList(vipInfoListDto);
    }

 zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpVipInfoController.java

@@ -33,7 +33,6 @@
import com.matrix.system.hive.service.SysVipLevelService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -44,7 +43,6 @@
import java.io.IOException;
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.net.URLEncoder;
import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
@@ -401,26 +399,16 @@
    }

    @RequestMapping(value = "/exportExcel")
    public void report(ModelMap model, HttpServletRequest request, HttpServletResponse response,
    public void report(HttpServletResponse response,
                       SysVipInfo vipInfo)
            throws IOException {

        QueryUtil.setQueryLimitCom(vipInfo );
        if (vipInfo.getVipType() != null && !(vipInfo.getVipType().equals(""))) {
            vipInfo.setVipType(URLDecoder.decode(vipInfo.getVipType(), "UTF-8"));
        }
        if (vipInfo.getVipName() != null && !"".equals(vipInfo.getVipName())) {
            vipInfo.setVipName(URLDecoder.decode(vipInfo.getVipName(), "UTF-8"));
        }
        if (vipInfo.getArrivalWay() != null && !"".equals(vipInfo.getArrivalWay())) {
            vipInfo.setArrivalWay(URLDecoder.decode(vipInfo.getArrivalWay(), "UTF-8"));
        }
        if (vipInfo.getVipState() != null && !"".equals(vipInfo.getVipState())) {
            vipInfo.setVipState(URLDecoder.decode(vipInfo.getVipState(), "UTF-8"));
        }


        List<ExcelSheetPO> res = new ArrayList<>();
        ExcelSheetPO orderSheet = new ExcelSheetPO();
        String title = "每日单据明细";
        String title = "会员资料";
        orderSheet.setSheetName(title);
        orderSheet.setTitle(title);
        String[] header = {"会员编号", "姓名", "性别", "手机号码", "会员类型", "会员活跃度", "到店途径", "健康顾问", "所属门店"};

 zq-erp/src/main/resources/config/mdprd/system.properties

@@ -25,7 +25,7 @@
#\u5982\u679C\u6709\u5BC6\u7801
redis.password=xcong123
#\u5BA2\u6237\u7AEF\u8D85\u65F6\u65F6\u95F4\u5355\u4F4D\u662F\u6BEB\u79D2 \u9ED8\u8BA4\u662F2000
redis.timeout=10000  
redis.timeout=10000
redis.database=1
redis_time_out=1800000


 zq-erp/src/main/resources/mybatis/mapper/common/SysRoleDao.xml

@@ -12,6 +12,7 @@
        <result property="companyId" column="company_id" />
        <result property="plates" column="plates" />
        <result property="shopAble" column="shop_able" />
        <result property="coustomer" column="coustomer" />
    </resultMap>


@@ -31,6 +32,7 @@
        company_id,
        plates,
        is_default,
        coustomer,
        shop_able
        )
        VALUES (
@@ -44,6 +46,7 @@
        #{companyId},
        #{plates},
        #{isDefault},
        #{coustomer},
        #{shopAble}
        )
    </insert>
@@ -63,6 +66,7 @@
        company_id,
        plates,
        is_default,
        coustomer,
        shop_able
        )
        VALUES
@@ -78,6 +82,7 @@
            #{item.companyId},
            #{item.plates},
            #{item.isDefault},
            #{item.coustomer},
            #{item.shopAble}
            )
        </foreach>
@@ -110,6 +115,9 @@
            <if test="_parameter.containsKey('shopAble')">
                shop_able = #{shopAble},
            </if>
            <if test="_parameter.containsKey('coustomer')">
                coustomer = #{coustomer},
            </if>
        </set>
        WHERE role_id=#{roleId}
    </update>
@@ -141,6 +149,9 @@
            </if>
            <if test="(shopAble!=null and shopAble!='') or (shopAble!='' and shopAble==0)">
                shop_able = #{shopAble},
            </if>
            <if test="(coustomer!=null and coustomer!='') or (coustomer!='' and coustomer==0)">
                coustomer = #{coustomer},
            </if>
        </set>
        WHERE role_id=#{roleId}
@@ -206,6 +217,7 @@
        company_id,
        plates,
        is_default,
        coustomer,
        shop_able
        from sys_role
        <where>
@@ -291,6 +303,7 @@
        company_id,
        plates,
        is_default,
        coustomer,
        shop_able
        from sys_role
        where role_id=#{roleId}
@@ -323,6 +336,7 @@
        company_id,
        plates,
        is_default,
        coustomer,
        shop_able
        from sys_role
        <where>

 zq-erp/src/main/resources/mybatis/mapper/common/SysUsersDao.xml

@@ -56,6 +56,7 @@
        <result property="signOrder" column="SIGN_ORDER"/>
        <result property="signDate" column="SIGN_DATE"/>
        <result property="salarGrad" column="salarGrad"/>
        <result property="allCustomer" column="allCustomer"/>

        <!-- 扩展属性 -->
        <result property="shopName" column="SHOP_NAME"/>
@@ -655,6 +656,8 @@
        select *,
        (SELECT IF(COUNT(1)>0,'Y','N') FROM sys_role a WHERE FIND_IN_SET(a.role_id,role_ids) AND role_remark ='是')
        shopRole,
        (SELECT IF(COUNT(1)>0,'Y','N') FROM sys_role a WHERE FIND_IN_SET(a.role_id,role_ids) AND customer ='是')
        allCustomer,
        (select GROUP_CONCAT(role_name separator ',') from sys_role where find_in_set(role_id,role_ids) ) roleName,
        (select com_name from sys_company where com_id=company_id) as company_name,
        (select shop_name from sys_shop_info where shop_id=id) as SHOP_NAME
@@ -937,6 +940,8 @@
    <select id="selectById" resultMap="SysUsersMap">
        select *,
        (SELECT IF(COUNT(1)>0,'Y','N') FROM sys_role a WHERE FIND_IN_SET(a.role_id,role_ids) AND role_remark ='是') shopRole,
               (SELECT IF(COUNT(1)>0,'Y','N') FROM sys_role a WHERE FIND_IN_SET(a.role_id,role_ids) AND customer ='是')
                   allCustomer,
        (select GROUP_CONCAT(role_name separator ',') from sys_role where find_in_set(role_id,role_ids) ) roleName,
        role_ids
        from sys_users
@@ -949,6 +954,8 @@
        select *,
        (SELECT IF(COUNT(1)>0,'Y','N') FROM sys_role a WHERE FIND_IN_SET(a.role_id,role_ids) AND role_remark ='是')
        shopRole,
        (SELECT IF(COUNT(1)>0,'Y','N') FROM sys_role a WHERE FIND_IN_SET(a.role_id,role_ids) AND customer ='是')
        allCustomer,
        (select GROUP_CONCAT(role_name separator ',') from sys_role where find_in_set(role_id,role_ids) ) roleName,
        role_ids
        from sys_users

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

@@ -1361,6 +1361,7 @@
        select
               a.ID id,
               a.VIP_NAME vipName,
               a.VIP_NO vipNo,
               a.PHONE phone,
               a.photo photo,
               b.arriveCnt arriveCnt,

 zq-erp/src/main/resources/templates/views/admin/hive-erp/vip/vipInfo-list.html

@@ -110,12 +110,12 @@

            <!-- 功能按钮部分 -->
            <div id="option-bar" >
                <button matrix:fn="mdhyzl-edit" onclick="openEdit()"  type="button" class="btn btn-success btn-sm "><i
                <button matrix:btn="mdhyzl-edit" onclick="openEdit()"  type="button" class="btn btn-success btn-sm "><i
                        class="fa fa-edit"></i>编辑
                </button>
                    <button matrix:fn="mdhyzl-gjjl"  onclick="openFollow()" type="button" class="btn btn-info btn-sm"><i class="fa fa-edit" ></i> 跟进记录</button>
                    <button matrix:fn="mdhyzl-khda"  onclick="openArchieves()" type="button" class="btn btn-info btn-sm"><i class="fa fa-edit" ></i> 客户档案</button>
                    <button matrix:btn="mdhyzl-excelOut"  onclick="exportExcel()" type="button" class="btn btn-info btn-sm"><i class="fa fa-download" ></i> 导出</button>
                    <button matrix:btn="mdhyzl-gjjl"  onclick="openFollow()" type="button" class="btn btn-info btn-sm"><i class="fa fa-edit" ></i> 跟进记录</button>
                    <button matrix:btn="mdhyzl-khda"  onclick="openArchieves()" type="button" class="btn btn-info btn-sm"><i class="fa fa-edit" ></i> 客户档案</button>
                    <button matrix:btn="mdhyzl-exportExcel"  onclick="exportExcel()" type="button" class="btn btn-info btn-sm"><i class="fa fa-download" ></i> 导出</button>
            </div>

        <!-- 数据表格部分 -->
@@ -203,19 +203,8 @@

    //导出
        function exportExcel() {
            var name = $("#search-text").attr("name");
            var value = $("#search-text").val();
            var vipType = $("#vipType").val();
            var arrivalWay = $("#arrivalWay").val();
            var vipState = $("#vipState").val();
            var staffId = $("#staffId").val();
            var shopId = $("#shopId").val();
            window.location.href = basePath+"/admin/vipInfo/exportExcel?vipType="
                + encodeURI(encodeURI(vipType)) + "&arrivalWay="
                + encodeURI(encodeURI(arrivalWay)) + "&"+name+"="
                + encodeURI(encodeURI(value)) + "&vipState="
                + encodeURI(encodeURI(vipState)) + "&shopId=" + shopId
                + "&staffId=" + staffId;
            var param=MForm.toUrlParam("#serchform");
            window.location.href=basePath+"/hiveErp/vipInfo/exportExcel?"+param;
        }

    //打开编辑界面

 zq-erp/src/main/resources/templates/views/admin/hive/vip/vipInfo-list.html

@@ -121,7 +121,7 @@
                    <button matrix:fn="orderClub"  onclick="openOrder()" type="button" class="btn btn-info btn-sm"><i class="fa fa-history"></i> 消费订单</button>
                    <button matrix:fn="serviceClub"  onclick="openServiceOrder()" type="button" class="btn btn-info btn-sm"><i class="fa fa-history"></i> 服务单</button>
                    <button matrix:btn="vipInfo-add"  onclick="openAdd()" type="button" class="btn btn-info btn-sm"><i class="fa fa-plus" ></i>  新增</button>
                    <button matrix:btn="vipInfo-excelOut"  onclick="exportExcel()" type="button" class="btn btn-info btn-sm"><i class="fa fa-download" ></i> 导出</button>
                    <button matrix:btn="vipInfo-exportExcel"  onclick="exportExcel()" type="button" class="btn btn-info btn-sm"><i class="fa fa-download" ></i> 导出</button>
                    <button matrix:btn="vipInfo-allot"  onclick="updateVipInfos()" type="button" class="btn btn-info btn-sm"><i class="" ></i>批量设置健康顾问</button>
                    <button onclick="skinCheck()" type="button" class="btn btn-info btn-sm"><i class="" ></i>皮肤检测管理</button>
                    <button onclick="importVipInfo()" type="button" class="btn btn-info btn-sm"><i class="" ></i>导入会员</button>
@@ -402,20 +402,10 @@
    }

    //导出
        function exportExcel() {
            var name = $("#search-text").attr("name");
            var value = $("#search-text").val();
            var vipType = $("#vipType").val();
            var arrivalWay = $("#arrivalWay").val();
            var vipState = $("#vipState").val();
            var staffId = $("#staffId").val();
            window.location.href = basePath+"/admin/vipInfo/exportExcel?vipType="
                + encodeURI(encodeURI(vipType)) + "&arrivalWay="
                + encodeURI(encodeURI(arrivalWay)) + "&"+name+"="
                + encodeURI(encodeURI(value)) + "&vipState="
                + encodeURI(encodeURI(vipState)) 
                + "&staffId=" + staffId;
        }
    function exportExcel() {
        var param=MForm.toUrlParam("#serchform");
        window.location.href=basePath+"/admin/vipInfo/exportExcel?"+param;
    }

</script>


 zq-erp/src/main/resources/templates/views/admin/sys/sysRole-form.html

@@ -60,7 +60,13 @@
            </div>
        </div>
        <div class="form-group">

            <label class="col-sm-2 control-label">可查询所有门店客户</label>
            <div class="col-sm-4">
                <select class="form-control" name="coustomer">
                    <option th:selected="${obj?.coustomer == '是'}" >是</option>
                    <option th:selected="${obj?.coustomer == '否'}" >否</option>
                </select>
            </div>
            <label class="col-sm-2 control-label">是否允许门店分配本角色</label>
            <div class="col-sm-4">
                <select class="form-control" name="shopAble">