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

44323

2023-10-25 6368a855afb72f3c23eed5aedd085c55fe7a2d9f

 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
@@ -123,17 +123,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);
    }