Merge branch 'score_shop'

wzy

2022-10-09 99091a8cbb8e098575c75a7c640b568addbcc29d

 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;
@@ -143,7 +141,12 @@
            } catch (UnsupportedEncodingException | NoSuchAlgorithmException e) {
                e.printStackTrace();
            }
            return modify(vipInfoService, vipInfo, "会员信息");
            int i = vipInfoService.modify(vipInfo);
            if (i > 0) {
                return new AjaxResult(AjaxResult.STATUS_SUCCESS, "会员信息修改成功");
            } else {
                return new AjaxResult(AjaxResult.STATUS_FAIL, "会员信息修改失败");
            }
        } else {

            try {
@@ -154,7 +157,12 @@
            } catch (UnsupportedEncodingException | NoSuchAlgorithmException e) {
                e.printStackTrace();
            }
            return add(vipInfoService, vipInfo, "会员信息");
            int i = vipInfoService.add(vipInfo);
            if (i > 0) {
                return new AjaxResult(AjaxResult.STATUS_SUCCESS,  "会员信息添加成功");
            } else {
                return new AjaxResult(AjaxResult.STATUS_FAIL, "会员信息添加失败");
            }
        }
    }

@@ -181,15 +189,6 @@
    }


    /**
     * 删除会员信息
     */
    @RequestMapping(value = "/del")
    public @ResponseBody
    AjaxResult del(String keys) {

        return remove(vipInfoService, keys);
    }

    /**
     * 弹出框，会员信息
@@ -326,7 +325,13 @@
    @RequestMapping(value = "/modifyVip")
    public @ResponseBody
    AjaxResult modifyVip(SysVipInfo vipInfo) {
        return modify(vipInfoService, vipInfo, "会员");

        int i = vipInfoService.modify(vipInfo);
        if (i > 0) {
            return new AjaxResult(AjaxResult.STATUS_SUCCESS, "会员修改成功");
        } else {
            return new AjaxResult(AjaxResult.STATUS_FAIL, "会员修改失败");
        }
    }


@@ -401,26 +406,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 = {"会员编号", "姓名", "性别", "手机号码", "会员类型", "会员活跃度", "到店途径", "健康顾问", "所属门店"};