门票 门店权限

liujie

2023-10-25 5234b3a5f970969cc15b05c52ee9e31d6885d1d5

门票 门店权限

 cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java

@@ -108,7 +108,25 @@
    @ResponseBody
    @PostMapping("/base/pointMerchars/ticketList")
    public List<Map<String,Object>> ticketList(@RequestBody IntegralGoodsOfSearch ofSearch){
        List<Map<String, Object>> result = pmdsService.ticketList(ofSearch);
        List<Map<String, Object>> result1 = pmdsService.ticketList(ofSearch);
        List<Map<String, Object>> result = new ArrayList<>();
        if(ofSearch.getObjType()==3){
            for (Map<String, Object> map : result1) {
                List<PointsMerchandiseStore> id = pmdstoService.list(new LambdaQueryWrapper<PointsMerchandiseStore>().eq(PointsMerchandiseStore::getPointsMerchandiseId, map.get("id")));
                List<Integer> collect = id.stream().map(PointsMerchandiseStore::getStoreId).collect(Collectors.toList());
                if(collect.size()==0){
                    collect.add(-1);
                }
                if(collect.contains(ofSearch.getObjId())){
                    if(id.size()>1){
                        map.put("size",1);
                    }else {
                        map.put("size",0);
                    }
                    result.add(map);
                }
            }
        }
        if (result.size() > 0){
            for (Map<String, Object> stringObjectMap : result) {
                Integer o = (Integer) stringObjectMap.get("id");

 cloud-server-activity/src/main/java/com/dsh/activity/model/request/IntegralGoodsOfSearch.java

@@ -26,4 +26,8 @@
    private Integer state;

    private Page<Map<String, Object>> page;

    private Integer objType;

    private Integer objId;
}

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

@@ -26,4 +26,8 @@
    private Integer state;

    private Page<Map<String, Object>> page;

    private Integer objType;

    private Integer objId;
}

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

@@ -499,7 +499,9 @@
                }
                pointMercharsClient.addCitys(objects);
            }else if(useScope==3){

                if(UserExt.getUser().getObjectType()==3){
                    storeIds=UserExt.getUser().getObjectId().toString();
                }
                Integer oid=null;
                String[] split = storeIds.split(",");
                for (int i = 0; i < split.length; i++) {

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

@@ -141,6 +141,8 @@
        integralGoodsOfSearch.setActiveStatus(activeStatus);
        integralGoodsOfSearch.setState(state);
        integralGoodsOfSearch.setPage(page);
        integralGoodsOfSearch.setObjType(UserExt.getUser().getObjectType());
        integralGoodsOfSearch.setObjId(UserExt.getUser().getObjectId());
        return pointMercharsClient.ticketList(integralGoodsOfSearch);
    }


 cloud-server-management/src/main/webapp/WEB-INF/view/system/ticket/ticket_add.html

@@ -178,6 +178,7 @@
                </div>
            </div>

            @if(userType!=3){
            <div class="row" id="storeSelect" >
                <div class="form-group">
                    <div class="form-group">
@@ -206,6 +207,7 @@

                </div>
            </div>
            @}
            <div class="form-group" style="margin-left:262px">
                <label class="col-sm-1 control-label">兑换说明：</label>
                <div class="col-sm-5">

 cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods_info.js

@@ -624,7 +624,7 @@

}
TGoodsInfoDlg.addSubmit1 = function() {
    let company = document.querySelector('input[name="company"]:checked').value;
    let company = 3;
    this.clearData();
    this.collectData();
    if(!this.validate()){
@@ -770,7 +770,7 @@


    var stores = "";
    if (company === '3'){
    if (company === 3 && $("#userType").val()!="3"){
        console.log('3---this.storeIds',this.storeIds);
        if (TGoodsInfoDlg.storeIds.length === 0 ){
            return Feng.error('请至少选择一个门店');

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

@@ -160,6 +160,11 @@
 */
TPointProducts.openEditPage = function () {
    if (this.check()) {
       let size =  TPointProducts.seItem.size
        if(size>0){
            Feng.info("没有操作权限");
            return;
        }
        var index = layer.open({
            type: 2,
            title:'编辑',
@@ -178,6 +183,11 @@
 */
TPointProducts.onShelf = function () {
    if (this.check()){
        let size =  TPointProducts.seItem.size
        if(size>0){
            Feng.info("没有操作权限");
            return;
        }
        var selected = $('#' + this.id).bootstrapTable('getSelections');
        const data1 = {
            ids:[],
@@ -211,6 +221,11 @@
 */
TPointProducts.offShelf = function () {
    if (this.check()){
        let size =  TPointProducts.seItem.size
        if(size>0){
            Feng.info("没有操作权限");
            return;
        }
        var selected = $('#' + this.id).bootstrapTable('getSelections');
        const data1 = {
            ids:[],