支付会员送券功能补充 运营商权限bug修改

44323

2023-11-02 c697ed09cb1e257bc54603213b304e0f156326a6

支付会员送券功能补充 运营商权限bug修改

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

@@ -2,6 +2,8 @@

import lombok.Data;

import java.util.List;

/**
 * @author zhibing.pu
 * @Date 2023/8/1 15:08
@@ -23,7 +25,7 @@
    /**
     * 门店id
     */
    private Integer storeId;
    private List<Integer> storeIds;
    /**
     * 课程名称
     */

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

@@ -79,8 +79,11 @@
        <if test="null != item.coursePackageTypeId">
            and a.coursePackageTypeId = #{item.coursePackageTypeId}
        </if>
        <if test="null != item.storeId">
            and a.storeId = #{item.storeId}
        <if test="item.storeIds != null and item.storeIds.size()>0">
            AND a.storeId IN
            <foreach collection="item.storeIds" separator="," item="id" open="(" close=")">
                #{id}
            </foreach>
        </if>
        <if test="null != item.name and '' != item.name">
            and a.name line CONCAT('%', #{item.name}, '%')

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

@@ -2,6 +2,8 @@

import lombok.Data;

import java.util.List;

/**
 * @author zhibing.pu
 * @Date 2023/8/1 15:08
@@ -23,7 +25,7 @@
    /**
     * 门店id
     */
    private Integer storeId;
    private List<Integer> storeIds;
    /**
     * 课程名称
     */

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

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsh.course.feignClient.other.model.Site;
import com.dsh.guns.config.UserExt;
import com.dsh.guns.core.base.controller.BaseController;
import com.dsh.guns.modular.system.model.*;
import com.dsh.guns.modular.system.service.ISiteBookingService;
@@ -194,9 +195,18 @@
            }
        }
        List<TStore> stores = storeService.list(new QueryWrapper<TStore>());
        model.addAttribute("list", result);
        model.addAttribute("stores", stores);
        model.addAttribute("list", result);
        model.addAttribute("sites", list);
        if(UserExt.getUser().getObjectType() == 2){
            List<TStore> operatorId = storeService.list(new QueryWrapper<TStore>()
                    .eq("operatorId", UserExt.getUser().getObjectId()));
            model.addAttribute("stores", operatorId);
            List<TSite> sites = siteService.list(new QueryWrapper<TSite>()
                    .eq("operatorId", UserExt.getUser().getObjectId()));
            model.addAttribute("sites", sites);
        }

        return PREFIX + "GameData.html";
    }


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

@@ -32,6 +32,7 @@
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;

/**
 * @author zhibing.pu
@@ -835,15 +836,21 @@
        Integer objectType = UserExt.getUser().getObjectType();
        Integer objectId = UserExt.getUser().getObjectId();
        Integer storeId = null;
        if(objectType == 2){//城市管理员
            CityManager cityManager = cityManagerClient.queryCityManagerById(objectId);
            provinceCode = cityManager.getProvinceCode();
            cityCode = cityManager.getCityCode();
        List<Integer> storeIds = new ArrayList<>();

        if(objectType == 2){// 城市管理员
//            CityManager cityManager = cityManagerClient.queryCityManagerById(objectId);
//            provinceCode = cityManager.getProvinceCode();
//            cityCode = cityManager.getCityCode();
            // 获取运营商下的门店ids
            List<Integer> operatorId = storeService.list(new QueryWrapper<TStore>().eq("operatorId", objectId))
                    .stream().map(TStore::getId).collect(Collectors.toList());
            storeIds = operatorId;
        }
        if(objectType == 3) {//城市管理员
            storeId = objectId;
        if(objectType == 3) {// 门店
            storeIds.add(objectId);
        }
        Page<Map<String, Object>> mapPage = coursePackageService.queryCoursePackageLists(provinceCode, cityCode, coursePackageTypeId, storeId, name, status, state);
        Page<Map<String, Object>> mapPage = coursePackageService.queryCoursePackageLists(provinceCode, cityCode, coursePackageTypeId, storeIds, name, status, state);
        return super.packForBT(mapPage);
    }

@@ -906,9 +913,13 @@

        coursePackage.setClassStartTime(firstString);
        coursePackage.setClassEndTime(secondString);
        coursePackage.setAuditStatus(1);
        coursePackage.setStatus(1);
        coursePackage.setState(1);
        if (UserExt.getUser().getObjectType() == 1){
            coursePackage.setAuditStatus(2);
        }else{
            coursePackage.setAuditStatus(1);
        }
        coursePackage.setInsertTime(new Date());
        Integer objectType = UserExt.getUser().getObjectType();
        Integer objectId = UserExt.getUser().getObjectId();

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/ICoursePackageService.java

@@ -5,6 +5,7 @@
import com.dsh.course.feignClient.course.model.TCoursePackage;
import com.dsh.guns.modular.system.util.ResultUtil;

import java.util.List;
import java.util.Map;

/**
@@ -24,7 +25,7 @@
     * @param state
     * @return
     */
    Page<Map<String, Object>> queryCoursePackageLists(String provinceCode, String cityCode, Integer coursePackageTypeId, Integer storeId, String name, Integer status, Integer state);
    Page<Map<String, Object>> queryCoursePackageLists(String provinceCode, String cityCode, Integer coursePackageTypeId, List<Integer> storeId, String name, Integer status, Integer state);


    /**

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java

@@ -70,12 +70,12 @@
     * @return
     */
    @Override
    public Page<Map<String, Object>> queryCoursePackageLists(String provinceCode, String cityCode, Integer coursePackageTypeId, Integer storeId, String name, Integer status, Integer state) {
    public Page<Map<String, Object>> queryCoursePackageLists(String provinceCode, String cityCode, Integer coursePackageTypeId, List<Integer> storeId, String name, Integer status, Integer state) {
        QueryCoursePackageLists queryCoursePackageLists = new QueryCoursePackageLists();
        queryCoursePackageLists.setProvinceCode(provinceCode);
        queryCoursePackageLists.setCityCode(cityCode);
        queryCoursePackageLists.setCoursePackageTypeId(coursePackageTypeId);
        queryCoursePackageLists.setStoreId(storeId);
        queryCoursePackageLists.setStoreIds(storeId);
        queryCoursePackageLists.setName(name);
        queryCoursePackageLists.setState(state);
        queryCoursePackageLists.setStatus(status);
@@ -285,7 +285,12 @@
                coursePackageDiscount1.setCoursePackagePaymentConfigId(coursePackagePaymentConfigId);
                coursePackageDiscount1.setType(type);
                coursePackageDiscount1.setContent(cpd.getString("content"));
                coursePackageDiscount1.setAuditStatus(2);
                if (UserExt.getUser().getObjectType() == 1){
                    coursePackageDiscount1.setAuditStatus(2);
                }else if (UserExt.getUser().getObjectType() == 2){
                    coursePackageDiscount1.setAuditStatus(1);
                }

                coursePackageDiscount1.setInsertTime(new Date());
                list.add(coursePackageDiscount1);
            }

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

@@ -63,7 +63,11 @@
                                            "hidden": true
                                        },
                                        {
                                            "type": "textarea",
                                            "type": "input-rich-text",
                                            "receiver": {
                                                "url": "/mgr/uploadImgAmis",
                                                "method": "post"
                                            },
                                            "label": "文字介绍",
                                            "name": "jieshao",
                                            "id": "u:aa105bcfd51b",
@@ -208,7 +212,11 @@
                                            "hidden": true
                                        },
                                        {
                                            "type": "textarea",
                                            "type": "input-rich-text",
                                            "receiver": {
                                                "url": "/mgr/uploadImgAmis",
                                                "method": "post"
                                            },
                                            "label": "文字介绍",
                                            "name": "jieshao",
                                            "id": "u:aa105bcfd51b",
@@ -354,7 +362,11 @@
                                            "hidden": true
                                        },
                                        {
                                            "type": "textarea",
                                            "type": "input-rich-text",
                                            "receiver": {
                                                "url": "/mgr/uploadImgAmis",
                                                "method": "post"
                                            },
                                            "label": "文字介绍",
                                            "name": "jieshao",
                                            "id": "u:aa105bcfd51b",
@@ -500,7 +512,11 @@
                                            "hidden": true
                                        },
                                        {
                                            "type": "textarea",
                                            "type": "input-rich-text",
                                            "receiver": {
                                                "url": "/mgr/uploadImgAmis",
                                                "method": "post"
                                            },
                                            "label": "文字介绍",
                                            "name": "jieshao",
                                            "id": "u:aa105bcfd51b",
@@ -646,7 +662,11 @@
                                            "hidden": true
                                        },
                                        {
                                            "type": "textarea",
                                            "type": "input-rich-text",
                                            "receiver": {
                                                "url": "/mgr/uploadImgAmis",
                                                "method": "post"
                                            },
                                            "label": "文字介绍",
                                            "name": "jieshao",
                                            "id": "u:aa105bcfd51b",
@@ -792,7 +812,11 @@
                                            "hidden": true
                                        },
                                        {
                                            "type": "textarea",
                                            "type": "input-rich-text",
                                            "receiver": {
                                                "url": "/mgr/uploadImgAmis",
                                                "method": "post"
                                            },
                                            "label": "文字介绍",
                                            "name": "jieshao",
                                            "id": "u:aa105bcfd51b",
@@ -938,7 +962,11 @@
                                            "hidden": true
                                        },
                                        {
                                            "type": "textarea",
                                            "type": "input-rich-text",
                                            "receiver": {
                                                "url": "/mgr/uploadImgAmis",
                                                "method": "post"
                                            },
                                            "label": "文字介绍",
                                            "name": "jieshao",
                                            "id": "u:aa105bcfd51b",
@@ -1084,7 +1112,11 @@
                                            "hidden": true
                                        },
                                        {
                                            "type": "textarea",
                                            "type": "input-rich-text",
                                            "receiver": {
                                                "url": "/mgr/uploadImgAmis",
                                                "method": "post"
                                            },
                                            "label": "文字介绍",
                                            "name": "jieshao",
                                            "id": "u:aa105bcfd51b",
@@ -1230,7 +1262,11 @@
                                            "hidden": true
                                        },
                                        {
                                            "type": "textarea",
                                            "type": "input-rich-text",
                                            "receiver": {
                                                "url": "/mgr/uploadImgAmis",
                                                "method": "post"
                                            },
                                            "label": "文字介绍",
                                            "name": "jieshao",
                                            "id": "u:aa105bcfd51b",
@@ -1376,7 +1412,11 @@
                                            "hidden": true
                                        },
                                        {
                                            "type": "textarea",
                                            "type": "input-rich-text",
                                            "receiver": {
                                                "url": "/mgr/uploadImgAmis",
                                                "method": "post"
                                            },
                                            "label": "文字介绍",
                                            "name": "jieshao",
                                            "id": "u:aa105bcfd51b",