10.24。1

nickchange

2023-10-24 5af417d60d0cc3cd37afacead01c01ac2d7b6970

10.24。1

 cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java

@@ -1105,24 +1105,7 @@
            return ResultUtil.error("超过发放数量");
        }

        for (int i = 0; i < goodsNums; i++) {
//            新增积分商品兑换记录
            UserPointsMerchandise pointsMerchandise = new UserPointsMerchandise();
            pointsMerchandise.setPointsMerchandiseId(exchangeType.getGoodId());
            pointsMerchandise.setUserId(userIdFormRedis);
            pointsMerchandise.setStatus(1);
            pointsMerchandise.setState(1);
            if (merchandise.getUseScope() == 3){
                if (exchangeType.getGoodsType() == 2){
                    CoursePackage coursePackage = cpageClient.queryCoursePackageById(merchandise.getCoursePackageId());
                    pointsMerchandise.setStoreId(coursePackage.getStoreId());
                }else {
                    pointsMerchandise.setStoreId(exchangeType.getStoreId());
                }
            }
            pointsMerchandise.setCode(code);
            mcClient.saveDetailsUserPointMercase(pointsMerchandise);
        }


        switch (exchangeType.getExchangeType()){
//            积分
@@ -1228,6 +1211,26 @@
            default:
                break;
        }

        for (int i = 0; i < goodsNums; i++) {
//            新增积分商品兑换记录
            UserPointsMerchandise pointsMerchandise = new UserPointsMerchandise();
            pointsMerchandise.setPointsMerchandiseId(exchangeType.getGoodId());
            pointsMerchandise.setUserId(userIdFormRedis);
            pointsMerchandise.setStatus(1);
            pointsMerchandise.setState(1);
            if (merchandise.getUseScope() == 3){
                if (exchangeType.getGoodsType() == 2){
                    CoursePackage coursePackage = cpageClient.queryCoursePackageById(merchandise.getCoursePackageId());
                    pointsMerchandise.setStoreId(coursePackage.getStoreId());
                }else {
                    pointsMerchandise.setStoreId(exchangeType.getStoreId());
                }
            }
            pointsMerchandise.setCode(code);
            mcClient.saveDetailsUserPointMercase(pointsMerchandise);
        }

        return ResultUtil.success();
    }


 cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java

@@ -160,7 +160,7 @@


        //分账
        Integer    coursePackagePayments = coursePackageClient.queryByCode(outTradeNo);
//        Integer    coursePackagePayments = coursePackageClient.queryByCode(outTradeNo);
//        Integer paymentCompetitions = competitionsClient.queryByCode(outTradeNo);
//        Integer siteBookings = siteClient.queryByCode(outTradeNo);
//        List<Integer> stores = new ArrayList<>();

 cloud-server-activity/src/main/java/com/dsh/activity/service/impl/BenefitsVideosServiceImpl.java

@@ -73,6 +73,7 @@
        if(ToolUtil.isNotEmpty(search)){
            wrapper.like("name", search);
        }

        List<BenefitsVideoClassification> list = benefitsVideoClassificationService.list(wrapper.orderByAsc("sort"));
        List<UserBenefitsVideos> userBenefitsVideos = userBenefitsVideosService.list(new QueryWrapper<UserBenefitsVideos>().eq("appUserId", uid));
        List<Integer> collect = userBenefitsVideos.stream().map(UserBenefitsVideos::getBenefitsVideosId).collect(Collectors.toList());
@@ -82,7 +83,7 @@
            BenefitsVideoClassificationListVo benefitsVideoClassificationListVo = new BenefitsVideoClassificationListVo();
            benefitsVideoClassificationListVo.setId(benefitsVideoClassification.getId());
            benefitsVideoClassificationListVo.setName(benefitsVideoClassification.getName());
            QueryWrapper<BenefitsVideos> benefitsVideosQueryWrapper = new QueryWrapper<BenefitsVideos>().eq("state", 1);
            QueryWrapper<BenefitsVideos> benefitsVideosQueryWrapper = new QueryWrapper<BenefitsVideos>().eq("state", 1).eq("benefitsVideoClassificationId",benefitsVideoClassification.getId());
            if(collect.size() > 0){
                benefitsVideosQueryWrapper.notIn("id", collect);
            }

 cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java

@@ -140,12 +140,14 @@
    @PostMapping("/base/competition/getPlayPaiFGoldPayRecord")
    public List<PaymentCompetition> getPlayPaiFGoldPayRecord(@RequestBody Integer appUserId){
        ArrayList<Integer> integers = new ArrayList<>();
        integers.add(1);
        integers.add(2);
//        integers.add(1);
//        integers.add(2);
        integers.add(3);

        return paymentCompetitionService.list(new QueryWrapper<PaymentCompetition>()
                .in("payType",integers)
                .eq("appUserId",appUserId)
                .eq("payStatus",3));
                .eq("payStatus",2));
    }



 cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java

@@ -138,7 +138,7 @@
            List<Store> stores = storeClient.queryStoreListByName(coursePackageList.getSearch());
            List<Integer> collect = stores.stream().map(Store::getId).collect(Collectors.toList());
            if(collect.size() > 0){
                wrapper.or().in("id", collect);
                wrapper.or().in("storeId", collect);
            }
        }
        List<TCoursePackage> list = this.list(wrapper.last(" order by sort, insertTime desc"));
@@ -524,6 +524,7 @@
            coursePackageInfo.setTime(format.format(coursePackage.getStartTime())+"-"+format.format(coursePackage.getEndTime()));
        }
            coursePackageInfo.setCoverDrawing(coursePackage.getCoverDrawing());

            coursePackageInfo.setName(coursePackage.getName());
            Store store = storeClient.queryStoreById(coursePackage.getStoreId());
            coursePackageInfo.setStoreName(store.getName());
@@ -564,8 +565,6 @@
                CoursePackagePaymentConfigVo coursePackagePaymentConfigVo = new CoursePackagePaymentConfigVo();
                coursePackagePaymentConfigVo.setId(coursePackagePaymentConfig.getId());
                coursePackagePaymentConfigVo.setClassHours(coursePackagePaymentConfig.getClassHours());


                coursePackagePaymentConfigVo.setPlayPaiCoin(coursePackagePaymentConfig.getPlayPaiCoin());

                if(ToolUtil.isNotEmpty(coursePackagePaymentConfig.getCashPayment()) && coursePackagePaymentConfig.getCashPayment()>0 && ToolUtil.isNotEmpty(coursePackagePaymentConfig.getPlayPaiCoin()) && coursePackagePaymentConfig.getPlayPaiCoin()>0 ){

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

@@ -221,7 +221,7 @@
     */
    @ResponseBody
    @RequestMapping(value = "/addOperator")
    public ResultUtil addOperator(String name,String userName,String phone,Integer type ,@RequestParam String comArr) {
    public ResultUtil addOperator(String name,String userName,String phone,Integer type , String comArr) {
        User one = userService.getOne(new QueryWrapper<User>().eq("name", name).eq("phone", phone));
        if (one!=null){
            return ResultUtil.error("当前管理员名称和电话已存在!");
@@ -230,6 +230,7 @@
        user.setName(userName);
        user.setPhone(phone);
        user.setObjectType(2);
        userService.save(user);
        TOperator data = new TOperator();
        data.setUserId(user.getId());
        data.setName(name);
@@ -238,7 +239,7 @@
        data.setState(1);
        operatorService.save(data);
        user.setObjectId(data.getId());
        userService.save(user);
        userService.updateById(user);
        if (SinataUtil.isNotEmpty(comArr)){
            JSONArray jsonArray = JSON.parseArray(comArr);
            int size = jsonArray.size();

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

@@ -1036,7 +1036,7 @@
     */
    @ResponseBody
    @PostMapping("/afterClassExercises")
    public ResultUtil afterClassExercises(Long id, Integer courseId, Integer integral){
    public ResultUtil afterClassExercises(Long id, Integer courseId, Integer integral,Integer packId){
        return coursePackageService.afterClassExercises(id, courseId, integral);
    }


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

@@ -693,10 +693,8 @@
    @RequestMapping(value = "/deleteTwo")
    public Object delete2(Integer id) {
        try {
            TStoreOtherConfigTrue byId = tStoreOtherConfigTrueService.getById(id);
            storeOtherConfigService.removeById(id);

            byId.setState(2);
            tStoreOtherConfigTrueService.updateById(byId);
            return SUCCESS_TIP;
        }catch (Exception e){
            e.printStackTrace();

 cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_info.html

@@ -47,11 +47,13 @@
            {
              "type": "tpl",
              "id": "u:587781d5d181",
              "tpl": "&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp*所属运营商：",
              "tpl": "&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp*所属运营商：",
              "inline": true,
              "wrapperComponent": "",
              "style": {
                "marginLeft": "0"
                "marginLeft": "0",
                "fontFamily": "",
                "fontSize": 18
              }
            },
            {
@@ -254,12 +256,14 @@
            },
            {
              "type": "tpl",
              "tpl": "&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp设备ID：",
              "tpl": "&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp设备ID：",
              "inline": true,
              "wrapperComponent": "",
              "id": "u:587781d5d181",
              "style": {
                "marginLeft": "0"
                "marginLeft": "0",
                "fontFamily": "",
                "fontSize": 18
              }
            },
            {

 cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue.html

@@ -75,7 +75,7 @@
                                <div class="input-group">
                                    <div class="input-group-btn open">
                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button" aria-expanded="true">
                                            支付方式
                                            状态
                                        </button>
                                    </div>
                                    <select class="form-control" id="state">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue_add.html

@@ -103,17 +103,19 @@
                <div class="form-group">
                    <label class="col-sm-3 control-label">现金价格：</label>
                    <div class="col-sm-4">
                        <input class="form-control" id="cash" name="cash" type="text" >
                        <input class="form-control " id="cash" name="cash" type="text"  disabled>


                    </div>
                    元
                </div>

                <div class="form-group">
                    <label class="col-sm-3 control-label">玩派币价格：</label>
                    <div class="col-sm-4">
                        <input class="form-control" id="play" name="play" type="text" >
                        <input class="form-control" id="play" name="play" type="text" disabled >

                    </div>
                    </div>币
                </div>



 cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue_edit.html

@@ -118,7 +118,7 @@
                    <label class="col-sm-3 control-label">现金价格：</label>
                    <div class="col-sm-4">
                        <input class="form-control" id="cash" name="cash" type="text" value="${money[0]!}" >
                    </div>
                    </div>元
                </div>

                <div class="form-group">
@@ -126,7 +126,7 @@
                    <div class="col-sm-4">
                        <input class="form-control" id="play" name="play" type="text" value="${money[1]!}" >

                    </div>
                    </div>币
                </div>



 cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue_info.html

@@ -142,7 +142,7 @@



                <div class="form-group">
                <div class="form-group" id="hi1">
                    <label class="col-sm-3 control-label">联系电话：</label>
                    <div class="col-sm-4">
                        <input class="form-control" id="phone" name="phone" type="text" value="${item.phone}" disabled >
@@ -150,7 +150,7 @@
                    </div>
                </div>

                <div class="form-group">
                <div class="form-group" id="hi2">
                    <label class="col-sm-3 control-label">操作人：</label>
                    <div class="col-sm-4">
                        <input class="form-control" id="cancelUserId" name="cancelUserId" type="text" value="${cancelUser!}" disabled >
@@ -158,7 +158,7 @@
                    </div>
                </div>

                <div class="form-group" disabled>
                <div class="form-group" id="hi3" disabled>
                    <label class="col-sm-3 control-label head-scu-label">*上传凭证：</label>
                    <div class="col-sm-2">
                        <div id="introduceDrawingPreId">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tSite/TSite_edit.html

@@ -85,11 +85,11 @@
                </div>
            </div>
            <div class="form-group" id="siteType">
                <label class="col-sm-3 control-label">*场地类型：</label>
                <label class="col-sm-3 control-label">*场地分类：</label>
                <div class="col-sm-9">
                    <select style="width: 300px" class="form-control" id="siteTypeId" name = "typeId">
                        @for(obj in siteType){
                        <option value="${obj.id}">${obj.name}</option>
                        <option value="${obj.id}" ${obj.id == list.siteTypeId ? 'selected=selected' : ''}>${obj.name}</option>
                        @}
                    </select>
                </div>

 cloud-server-management/src/main/webapp/static/modular/system/ball/yuyue_info.js

@@ -673,6 +673,17 @@


$(function () {

    console.log("=======iiiii======"+            window.parent.TStudent.seItem.status)

    if (window.parent.TStudent.seItem.status != 5 ){
        // Hide the elements with the specified IDs
        document.getElementById("hi1").style.display = "none";
        document.getElementById("hi2").style.display = "none";
        document.getElementById("hi3").style.display = "none";}



    $('#provinceCode').change(function () {
        let ajax = new $ax(Feng.ctxPath + "/coursePackage/queryCity", function (data) {
            let htmlStr = '';

 cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition_info.js

@@ -404,7 +404,7 @@
    ajax.set("name",name);
    ajax.set("startTime",startTime);
    ajax.set("endTime",endTime);
    ajax.set("rEndTime",registerEndTime);
    ajax.set("registerEndTime",registerEndTime);
    ajax.set("startAge",startAge);
    ajax.set("endAge",endAge);
    ajax.set("cashPrice",cashPrice);

 cloud-server-management/src/main/webapp/static/modular/system/tShop/tShopOtherTwo.js

@@ -16,7 +16,15 @@
    return [
        {field: 'selectItem', radio: true},
        {title: '序号', field: 'id', visible: true, align: 'center', valign: 'middle'},
        {title: '图片', field: 'url', visible: role==1?true:false, align: 'center', valign: 'middle',
        {
            title: '图片',
            field: 'url',
            visible: role == 1 ? true : false,
            align: 'center',
            valign: 'middle',
            formatter: function(value, row, index) {
                return '<img src="' + value + '" alt="图片" style="width: 100px; height: 100px;">';
            }
        },
        {title: '跳转模块', field: 'name', visible: role==1?true:false, align: 'center', valign: 'middle',
        },

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

@@ -7,7 +7,7 @@
        select gc.* ,js.jieshao intro,js.vedio video
        from t_game_config gc
        left join t_js js on gc.gameId = js.id
        where gc.otherId = #{id} and gc.img !=""
        where gc.otherId = #{id} and gc.img is not null


    </select>