Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

44323

2023-10-25 cf6b7d7ebd13d2b6fe131112b92f5c607bebd868

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoursePackagePaymentController.java

@@ -31,7 +31,7 @@
import java.util.stream.Collectors;

/**
 * 购课记录控制器
 * 广告管理控制器
 *
 */
@Controller
@@ -80,7 +80,23 @@
        List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
        model.addAttribute("list",list);
        Integer roleType = UserExt.getUser().getObjectType();
        if (roleType==2){
            Integer objectId = UserExt.getUser().getObjectId();
            List<TStore> operatorId = storeService.list(new QueryWrapper<TStore>().eq("operatorId", objectId));
            model.addAttribute("stores",operatorId);
        }else{
            model.addAttribute("stores",new ArrayList<>());
        }
        // 获取所有课包类型
        List<TCoursePackageType> tCoursePackageTypes = coursePackageTypeClient.queryAllCoursePackageType();
        model.addAttribute("roleType",roleType);
        if(UserExt.getUser().getObjectType()==3){
            List<TStore> list1 = storeService.list(new LambdaQueryWrapper<TStore>().eq(TStore::getId, UserExt.getUser().getObjectId()));
            model.addAttribute("stores",list1);
        }else {
            model.addAttribute("stores",new ArrayList<>());
        }
        model.addAttribute("coursePackageType",tCoursePackageTypes);
        return PREFIX + "cpPayment_add.html";
    }
    /**
@@ -123,17 +139,17 @@
    @ResponseBody
    public List<CoursePackagePaymentVO> listAll(CoursePackagePaymentQuery query) {
        Integer objectType = UserExt.getUser().getObjectType();
        List<Integer> ids =new ArrayList<>();
        if(objectType==3){
            // 找出当前门店的课包
            ids =  coursePackageClient.queryIdsByStore(UserExt.getUser().getObjectId());
            query.setIds(ids);
        }
        if (objectType == 2){
            Integer objectId = UserExt.getUser().getObjectId();
            List<Integer> operatorId = storeService.list(new QueryWrapper<TStore>().eq("operatorId", objectId))
                    .stream().map(TStore::getId).collect(Collectors.toList());
            query.setStoreIds(operatorId);
        }
        if (objectType == 3){
            Integer objectId = UserExt.getUser().getObjectId();
            List<Integer> list = new ArrayList<>();
            list.add(objectId);
            query.setStoreIds(list);
        }
        return coursePackagePaymentClient.listAll(query);
    }