Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai int...

puzhibing

2024-03-15 5b83b50d38c757b38dcc87a40a17d34cc2948e10

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

@@ -501,7 +501,19 @@
        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
        pointsMerchandise.setStartTime(format.parse(startTime.split(" - ")[0]));
        pointsMerchandise.setEndTime(format.parse(startTime.split(" - ")[1]));
        pointsMerchandise.setUseScope(useScope);
        if (UserExt.getUser().getObjectType()==3){
            if (StringUtils.hasLength(sites)){
                useScope = 4;
                storeIds="";
                pointsMerchandise.setUseScope(4);
            }else{
                useScope = 3;
                pointsMerchandise.setUseScope(3);
            }
        }else{
            pointsMerchandise.setUseScope(useScope);

        }
        if(ToolUtil.isNotEmpty(provinceCode)){
            TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, provinceCode));
            pointsMerchandise.setProvinceCode(provinceCode);
@@ -561,30 +573,11 @@
                    }
                }
                }

                if (StringUtils.hasLength(sites)){
                    Integer oid=null;
                    String[] split = storeIds.split(",");
                    for (int i = 0; i < split.length; i++) {
                        if(i==0){
                            Integer operatorId = siteService.getById(split[0]).getOperatorId();
                            oid=operatorId;
                        }
                        Integer operatorId = siteService.getById(split[i]).getOperatorId();
                        if(oid!=operatorId){
                            return "5004";
                        }
                    }
                }

                Integer id = pointMercharsClient.add(pointsMerchandise);

                String pam = id+"_"+storeIds+"_"+sites;
                // 添加多个城市 门店 场地
                try{
                    pointMercharsClient.addOther(pam);


                }catch (Exception e){
                    e.printStackTrace();
                }