Merge remote-tracking branch 'origin/master'

nickchange

2023-10-25 80b4175382a9030ecb9722d8a080c12a41001871

Merge remote-tracking branch 'origin/master'

 cloud-server-account/src/main/java/com/dsh/account/dto/StudentSearch.java

@@ -4,6 +4,8 @@
import lombok.Data;
import lombok.NoArgsConstructor;

import java.util.List;

@Data
@AllArgsConstructor
@NoArgsConstructor
@@ -12,4 +14,5 @@
    private String city;String name;
    private String userName;
    private String phone;
    private List<Integer> ids;
}

 cloud-server-account/src/main/resources/mapper/TStudentMapper.xml

@@ -51,6 +51,11 @@
            <if test="item.phone != null and item.phone != ''">
                and o.phone  LIKE CONCAT('%',#{item.phone},'%')
            </if>
            <if test="item.ids != null and item.ids.size >0 ">
                and o.appUserId  in <foreach collection="item.ids" separator="," open="(" item="id" close=")">
                #{id}
            </foreach>
            </if>
        </where>

    </select>

 cloud-server-course/src/main/java/com/dsh/course/controller/CourseStudentController.java

@@ -3,6 +3,7 @@

import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.dsh.course.entity.*;
@@ -85,6 +86,16 @@

    }

    @ResponseBody
    @PostMapping("/queryIdsByStore")
    public List<Integer> queryIdsByStore(@RequestBody Integer objectId){
        List<TCoursePackage> list = packageService.list(new LambdaQueryWrapper<TCoursePackage>().eq(TCoursePackage::getStoreId, objectId));
        List<Integer> collect = list.stream().map(TCoursePackage::getId).collect(Collectors.toList());
        if(collect.size()==0){
            collect.add(-1);
        }
        return collect;
    }


    //获取学员课时数信息

 cloud-server-course/src/main/java/com/dsh/course/model/CoursePackagePaymentQuery.java

@@ -27,4 +27,6 @@
    private String payUser;
    // 购买学员
    private String payStudent;

    private List<Integer> ids;
}

 cloud-server-course/src/main/resources/mapper/CoursePackagePaymentConfigMapper.xml

@@ -54,6 +54,11 @@
            <if test="query.payStatus!=null and query.payStatus!= ''">
                and t1.payStatus = #{query.payStatus}
            </if>
            <if test="query.ids !=null and query.ids.size >0">
                and t2.storeId in <foreach collection="query.ids" close=")" item="id" open="(" separator=",">
                #{id}
            </foreach>
            </if>
        </where>
    </select>
    <select id="listAllRegister" resultType="com.dsh.course.model.RegisterOrderVO">

 cloud-server-management/src/main/java/com/dsh/course/dto/StudentSearch.java

@@ -4,6 +4,8 @@
import lombok.Data;
import lombok.NoArgsConstructor;

import java.util.List;

@Data

@AllArgsConstructor
@@ -14,4 +16,6 @@
    private String name;
    private String userName;
    private String phone;

    private List<Integer> ids;
}

 cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CoursePackageClient.java

@@ -84,4 +84,11 @@

    @PostMapping("/courdent/bypac")
    List<Map<String, Object>> bypac(PacQueryDto pacQueryDto);


    @PostMapping("/courdent/queryIdsByStore")
    List<Integer> queryIdsByStore(Integer objectId);



}

 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);
    }

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

@@ -715,6 +715,9 @@
    @RequestMapping(value = "/backStore")
    @ResponseBody
    public Object backStore(Integer id) {
        if(UserExt.getUser().getObjectType()==3){
            id = UserExt.getUser().getObjectId();
        }
        HashMap<String, Object> map = new HashMap<>();
        List<Integer> userPt = appUserClient.getUserStore(id);
        if(userPt.size()==0){
@@ -879,6 +882,9 @@
    @RequestMapping(value = "/userAndVipStore")
    @ResponseBody
    public Object userAndVipStore(Integer id) {
        if(UserExt.getUser().getObjectType()==3){
            id = UserExt.getUser().getObjectId();
        }
        HashMap<String, Object> map = appUserClient.userAndVipStore(id);
        return map;
    }
@@ -943,6 +949,12 @@
    @RequestMapping(value = "/actStore")
    @ResponseBody
    public Object actStore(Integer id) {


        Integer objectType = UserExt.getUser().getObjectType();
        if(objectType==3){
            id = UserExt.getUser().getObjectId();
        }
        List<Integer> userPt = appUserClient.getUserStore(id);
        HashMap<String, Object> map = competitionClient.actPt(userPt);

@@ -1105,6 +1117,10 @@
        // 找出平台的用户
        List<User> list = sysUserService.list(new LambdaQueryWrapper<User>().eq(User::getObjectType, 2));
        List<Integer> ids = list.stream().map(User::getId).collect(Collectors.toList());
        Integer objectType = UserExt.getUser().getObjectType();
        if(objectType==3){
            id = UserExt.getUser().getObjectId();
        }
        List<Integer> userIds = appUserClient.getUserStore(id);
        QueryDataFee queryDataFee = new QueryDataFee(time, userIds);
        // 会员费
@@ -1363,6 +1379,9 @@
    @RequestMapping("/stuUserDataStore")
    @ResponseBody
    public Object stuUserDataStore(Integer id) {
        if(UserExt.getUser().getObjectType()==3){
            id = UserExt.getUser().getObjectId();
        }
        ArrayList<Integer> objects = new ArrayList<>();
        objects.add(1);
        HashMap<String, Object> map = appUserClient.queryUserAgeStore(id);
@@ -1398,6 +1417,10 @@
    @RequestMapping("/selectStoreJx")
    @ResponseBody
    public Object selectStoreJx(Integer id) {
        Integer objectType = UserExt.getUser().getObjectType();
        if(objectType==3){
            id = UserExt.getUser().getObjectId();
        }
        ArrayList<Integer> objects = new ArrayList<>();
        objects.add(1);
        HashMap<String, Object> map1 = appUserClient.queryUserAgeStore1(id);

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

@@ -1097,7 +1097,7 @@
     * @return
     */
    @ResponseBody
    @PostMapping("/queryWalkInStudentList")
    @PostMapping("/queryWalkInStudentListqueryCoursePackageLists")
    public Object queryWalkInStudentList(Long coursePackageSchedulingId, String userName, String studentName){
        Page<Map<String, Object>> page = coursePackageService.queryWalkInStudentList(coursePackageSchedulingId, userName, studentName);
        return super.packForBT(page);

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

@@ -880,6 +880,10 @@
    @RequestMapping("/yuyuelist")
    @ResponseBody
    public List<Map<String,Object>> yuyuelist(BookingQuery bookingQuery) {
        Integer objectType = UserExt.getUser().getObjectType();
        if(objectType==3){
            bookingQuery.setStoreId(UserExt.getUser().getObjectId());
        }
        List<Map<String,Object>> orders =   ballClient.listorder(bookingQuery);
        System.out.println("=======ballQueryDto=========="+bookingQuery);


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

@@ -44,10 +44,7 @@
import java.math.RoundingMode;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;

/**
 * 控制器
@@ -340,7 +337,15 @@
    @RequestMapping("/list")
    @ResponseBody
    public List<TStudentDto> list(StudentSearch search) {
        List<Integer> ids = new ArrayList<>();

        if(UserExt.getUser().getObjectType()==3){
            ids = appUserClient.getUserStore(UserExt.getUser().getObjectId());
            if(ids.size()==0){
                ids.add(-1);
            }
            search.setIds(ids);
        }
        System.out.println("============学员查询接口=========");
        return itStudentService.listAll(search);
    }

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/CoursePackagePaymentQuery.java

@@ -28,4 +28,7 @@
    // 购买学员
    private String payStudent;


    private List<Integer> ids;

}

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/dto/BookingQuery.java

@@ -15,5 +15,5 @@
    Integer state;
    Integer payMethod;


    Integer storeId;
}

 cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/storeIncome.html

@@ -1766,6 +1766,7 @@
        if(type==1){
            srtj()
            tuifei()
            income()
        }

        if(type==2){

 cloud-server-other/src/main/java/com/dsh/other/entity/BookingQuery.java

@@ -15,5 +15,5 @@
    Integer state;
    Integer payMethod;


    Integer storeId;
}

 cloud-server-other/src/main/resources/mapper/GameMapper.xml

@@ -14,6 +14,9 @@
            <if test ="query.type==3">
                and st.id =#{query.id}
            </if>
            <if test ="query.type==2">
                and ga.operationId =#{query.id}
            </if>
            <if test="query.provinceCode!=null and query.provinceCode!=''">
                and ga.provinceCode = #{query.provinceCode}

@@ -68,6 +71,9 @@
            <if test="state!=null ">
                and  bk.status=#{state}
            </if>
            <if test="storeId!=null ">
                and  st.id=#{storeId}
            </if>

        
        </where>