Merge branch 'score_shop'

wzy

2022-10-09 99091a8cbb8e098575c75a7c640b568addbcc29d

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

@@ -7,17 +7,16 @@
import com.matrix.core.pojo.PaginationVO;
import com.matrix.core.tools.DateUtil;
import com.matrix.core.tools.LogUtil;
import com.matrix.core.tools.PropertiesUtil;
import com.matrix.core.tools.WebUtil;
import com.matrix.core.tools.excl.ExcelSheetPO;
import com.matrix.core.tools.excl.ExcelUtil;
import com.matrix.core.tools.excl.ExcelVersion;
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.common.bean.SystemDictionary;
import com.matrix.system.common.constance.AppConstance;
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;
@@ -30,8 +29,8 @@
import com.matrix.system.hive.service.*;
import com.matrix.system.score.dao.ScoreVipDetailDao;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

@@ -41,7 +40,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;
@@ -57,6 +55,11 @@
@Controller
@RequestMapping(value = "admin/vipInfo")
public class VipInfoController extends BaseController {


    @Value("${file_storage_path}")
    private String fileStoragePath;

    @Resource
    private SysVipInfoService vipInfoService;

@@ -237,10 +240,11 @@
    public @ResponseBody
    AjaxResult showList(PaginationVO pageVo, SysVipInfo vipInfo) {

//        if (!getMe().getShopRole().equals(Dictionary.FLAG_YES_Y)) {
        vipInfo.setShopId(getMe().getShopId());
//        }
        return showList(vipInfoService, vipInfo, pageVo);

        QueryUtil.setQueryLimit(vipInfo);
        List<SysVipInfo> dataList = vipInfoService.findInPage(vipInfo, pageVo);
        AjaxResult result = new AjaxResult(AjaxResult.STATUS_SUCCESS,  dataList, vipInfoService.findTotal(vipInfo));
        return result;
    }

    /**
@@ -262,6 +266,7 @@
            vips.get(0).setLabels(sysVipLabelDao.selectByVipId(vips.get(0).getId()));
            vips.get(0).setAge(DateUtil.getAgeForBirthDay(vips.get(0).getBirthday1()));
            vips.get(0).setBalance(moneyCardUseDao.selectVipCardTotalMoney(vips.get(0).getId()));
            vips.get(0).setArrears(sysOrderService.findVipArrearsByVipId(vips.get(0).getId()));
            AjaxResult result = new AjaxResult(AjaxResult.STATUS_SUCCESS, vips, 0);
            return result;
        } else {
@@ -289,12 +294,25 @@
    public @ResponseBody
    AjaxResult addOrModify(SysVipInfo vipInfo) {
        if (vipInfo.getId() != null) {
            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 {
            vipInfo.setVipState(Dictionary.VIP_STATE_HY);
            SysUsers users = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
            vipInfo.setShopId(users.getShopId());
            return add(vipInfoService, vipInfo, "会员信息");
            if(vipInfo.getShopId()==null){
                vipInfo.setShopId(users.getShopId());
            }
            int i = vipInfoService.add(vipInfo);
            if (i > 0) {
                return new AjaxResult(AjaxResult.STATUS_SUCCESS,  "会员信息添加成功");
            } else {
                return new AjaxResult(AjaxResult.STATUS_FAIL,  "会员信息添加失败");
            }

        }
    }

@@ -321,15 +339,7 @@
    }


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

        return remove(vipInfoService, keys);
    }

    /**
     * 弹出框，会员信息
@@ -466,7 +476,12 @@
    @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, "会员修改失败");
        }
    }


@@ -546,25 +561,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 = {"会员编号", "姓名", "性别", "手机号码", "会员类型", "会员活跃度", "到店途径", "健康顾问", "所属门店"};
@@ -600,7 +607,9 @@
    @RequestMapping(value = "/findAllVipInfo")
    @ResponseBody
    public AjaxResult findAllVipInfo() {
        return showList(vipInfoService, null, null);
        List<SysVipInfo> dataList = vipInfoService.findInPage(null, null);
        AjaxResult result = new AjaxResult(AjaxResult.STATUS_SUCCESS,  dataList, vipInfoService.findTotal(null));
        return result;
    }

    @RequestMapping(value = "/findAllVipInfoWithShop")
@@ -608,15 +617,19 @@
    public AjaxResult findAllVipInfoWithShop() {
        SysVipInfo info = new SysVipInfo();
        info.setShopId(getMe().getShopId());
        return showList(vipInfoService, info, null);
        List<SysVipInfo> dataList = vipInfoService.findInPage(info, null);
        AjaxResult result = new AjaxResult(AjaxResult.STATUS_SUCCESS,  dataList, vipInfoService.findTotal(info));
        return result;
    }



    @RequestMapping(value = "/importVipInfo")
    @ResponseBody
    public AjaxResult importVipInfo(HttpServletResponse response, HttpServletRequest request, @RequestParam(value = "file", required = false) MultipartFile file) throws IOException {

        String fileName = file.getOriginalFilename();
        String dirPath = PropertiesUtil.getString(AppConstance.FILES_TORAGE_PATH);
        String dirPath = fileStoragePath;
//        String dirPath = "C:/Users/wzy19/Desktop/zq";
        File fileDir = new File(dirPath);
        LogUtil.info("#----->{}#", fileDir.exists());
@@ -639,4 +652,23 @@
    public String toImportForm() {
        return "admin/hive/vip/vipImport-form";
    }

    @RequestMapping(value = "/validFlagChange")
    @ResponseBody
    public AjaxResult validFlagChange(Long id) {
        SysVipInfo sysVipInfo = vipInfoService.findById(id);

        if (sysVipInfo == null) {
            return AjaxResult.buildFailInstance("用户不存在");
        }

        if (SysVipInfo.VALID_FLAG_Y == sysVipInfo.getValidFlag()) {
            sysVipInfo.setValidFlag(SysVipInfo.VALID_FLAG_N);
        } else {
            sysVipInfo.setValidFlag(SysVipInfo.VALID_FLAG_Y);
        }

        vipInfoService.modify(sysVipInfo);
        return AjaxResult.buildSuccessInstance("设置成功");
    }
}