配置优化

jyy

2021-07-11 49fac1c7329140f0b9c6799a7483675e54001a73

 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("有效");