1. 新增套餐中有效和无效的操作 2. 会员修改门店功能 3. 套餐新增编辑次数功能 4. 计算是否为赠送的条件为，全部为赠送金额购买且支付金额大于0...

jyy

2021-07-17 ad31648c6f7a8bff1f7ccdf84b76006b9ffb78f8

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

@@ -115,7 +115,6 @@
        queryUse.setType(Dictionary.SHOPPING_GOODS_TYPE_XM);
        queryUse.setTaocanId(-1L);
        queryUse.setStatus(Dictionary.TAOCAN_STATUS_YX);
        queryUse.setIsOver(Dictionary.FLAG_NO_N);
        List<SysProjUse> projList = projUseService.findInPage(queryUse, null);

        List<List<Object>> list = new ArrayList<>();
@@ -136,9 +135,11 @@
        }
        //套餐
        //切换到套餐查询条件
        queryUse.setTaocanId(null);
        queryUse.setType(Dictionary.SHOPPING_GOODS_TYPE_TC);
        List<SysProjUse> taoCanList = projUseService.findInPage(queryUse, null);
        SysProjUse queryTaocan = new SysProjUse();
        queryTaocan.setType(Dictionary.SHOPPING_GOODS_TYPE_TC);
        queryTaocan.setStatus(Dictionary.TAOCAN_STATUS_YX);
        queryTaocan.setVipId(vipId);
        List<SysProjUse> taoCanList = projUseService.findInPage(queryTaocan, null);
        taoCanList.forEach(item->{
            item.setTaocanProjUse(projUseService.selectTaocanProjUse(item.getId(), queryUse.getStatus()));
            item.setProjInfo(shoppingGoodsDao.selectById(item.getProjId()));
@@ -146,7 +147,12 @@
        if (taoCanList.size() > 0) {
            for (SysProjUse item : taoCanList) {
                List<Object> temp = new ArrayList<>();
                temp.add("套餐");

                if(Dictionary.FLAG_YES_Y.equals(item.getIsCourse())){
                    temp.add("任选套餐");
                }else{
                    temp.add("固定套餐");
                }
                temp.add(item.getProjName());
                temp.add(item.getSource());
                temp.add("有效");
@@ -231,9 +237,9 @@
    public @ResponseBody
    AjaxResult showList(PaginationVO pageVo, SysVipInfo vipInfo) {

//        if (!getMe().getShopRole().equals(Dictionary.FLAG_YES_Y)) {
        vipInfo.setShopId(getMe().getShopId());
//        }

        QueryUtil.setQueryLimit(vipInfo);

        return showList(vipInfoService, vipInfo, pageVo);
    }

@@ -287,7 +293,9 @@
        } else {
            vipInfo.setVipState(Dictionary.VIP_STATE_HY);
            SysUsers users = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
            vipInfo.setShopId(users.getShopId());
            if(vipInfo.getShopId()==null){
                vipInfo.setShopId(users.getShopId());
            }
            return add(vipInfoService, vipInfo, "会员信息");
        }
    }