10.24。4

nickchange

2023-10-24 1869200173b11ba40149752b648e85af2ab62a1f

10.24。4

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

@@ -193,11 +193,22 @@
    }
@Resource
private CoursePackageClient coursePackageClient;
    @Autowired
     private PointsMerchandiseService pointsMerchandiseService;

    @ResponseBody
    @PostMapping("/base/pointMerchars/getCommoditys")
    public PointMerchandiseVo getVicinityGoods(@RequestBody CommodityRequest request){
        if (request.getShopId()!=null){
            List<CoursePackage> coursePackages = coursePackageClient.queryByStoreId(request.getShopId());
            List<Integer> coursIds = new ArrayList<>();
            for (CoursePackage coursePackage : coursePackages) {
                coursIds.add(coursePackage.getId());
            }
            List<PointsMerchandise> points = pointsMerchandiseService.list(new QueryWrapper<PointsMerchandise>().eq("state",1).eq("shelves",1).in("coursePackageId", coursIds));
            PointMerchandiseVo pointMerchandiseVo = new PointMerchandiseVo();
            pointMerchandiseVo.setMerchandises(points);
            return pointMerchandiseVo;

        }


 cloud-server-management/src/main/java/com/dsh/course/mapper/StoreMapper.java

@@ -35,6 +35,7 @@
     * @return
     */
    List<Map<String, Object>> queryCity(@Param("provinceCode") String provinceCode, @Param("cityCode") String cityCode);
    List<Map<String, Object>> queryCity1();

    List<Map<String, Object>> queryListOfpage(@Param("provinceCode") String provinceCode,
                                              @Param("cityCode")  String cityCode,

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

@@ -652,6 +652,15 @@
        return new ResultUtil(0,null,null,storeService.queryCity(code, cityCode),null);
    }

    @ResponseBody
    @PostMapping("/queryCity3")
    public ResultUtil queryCity3(){

        System.out.println("======="+storeService.queryCity1());
//        return storeService.queryCity(code, cityCode);
        return new ResultUtil(0,null,null,storeService.queryCity1(),null);
    }


    @ResponseBody
    @PostMapping("/queryCity1/")

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

@@ -220,8 +220,24 @@
        game.setRed(red);
        game.setState(0);
        game.setBlue(blue);


        Integer objectType = UserExt.getUser().getObjectType();

        if (objectType ==3){


            TStore byId = storeService.getById(UserExt.getUser().getObjectId());
            System.out.println("=====byId======="+byId);
            game.setProvinceCode(byId.getProvinceCode());
            game.setCityCode(byId.getCityCode());


        }else {
        game.setProvinceCode(province);
        game.setCityCode(city);

        }
        game.setSiteId(site);
        game.setStoreId(store);
        game.setId(id);
@@ -384,6 +400,7 @@
            model.addAttribute("is3","true");
            model.addAttribute("storeId",UserExt.getUser().getObjectId());
            TStore byId = storeService.getById(UserExt.getUser().getObjectId());
            System.out.println("=====byId======="+byId);
            model.addAttribute("cityCode",byId.getCityCode());
            model.addAttribute("provinceCode",byId.getProvinceCode());
            model.addAttribute("oId",byId.getOperatorId());

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

@@ -38,6 +38,7 @@
     * @return
     */
    List<Map<String, Object>> queryCity(String provinceCode, String cityCode);
    List<Map<String, Object>> queryCity1();

    List<Map<String, Object>> queryListOfpage(String provinceCode, String cityCode, Integer operatorId, String storeName, Page<Map<String, Object>> page);

@@ -76,7 +77,6 @@
    List<SelectDto> getSelect();

    List<TStoreListVo> listAllStore(Page<TStoreListVo> page, String provinceCode, String cityCode, String name, String phone, String shopName, Integer objectId);



}

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

@@ -48,6 +48,10 @@
    public List<Map<String, Object>> queryCity(String provinceCode, String cityCode) {
        return this.baseMapper.queryCity(provinceCode, cityCode);
    }
    @Override
    public List<Map<String, Object>> queryCity1() {
        return this.baseMapper.queryCity1();
    }

    @Override
    public List<Map<String, Object>> queryListOfpage(String provinceCode, String cityCode, Integer operatorId, String storeName, Page<Map<String, Object>> page) {

 cloud-server-management/src/main/resources/mapper/TStoreMapper.xml

@@ -73,6 +73,12 @@
        group by cityCode
        ) as aa order by aa.code
    </select>
    <select id="queryCity1" resultType="map">
        select * from (
        select cityCode as code, city as name from t_store where state = 1
        group by cityCode
        ) as aa order by aa.code
    </select>
    <select id="queryListOfpage" resultType="java.util.Map">
        SELECT `id`, `operatorId`, `province`, `city`, `name`,ids
        from t_store

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

@@ -62,6 +62,7 @@
              "label": "",
              "name": "operationId",
              "id": "u:c037c33c2c81",
              "hidden": `${is3}`,
              "value":`${oId!}`,
              "mode": "inline",
              "size": "md",
@@ -81,11 +82,11 @@
                }
              },
              "labelField": "value",
              "valueField": "id",
              "hidden": `${is3}`
              "valueField": "id"
            },{
              "type": "checkbox",
              "option": "平台",
              "hidden": `${is3}`,
              "name": "is",
              "id": "u:88f23ebcf4f7",
              "onEvent": {
@@ -104,95 +105,8 @@
              },
              "trueValue": "平台",
              "falseValue": 0,
              "mode": "inline",
              "hidden": `${is3}`
              "mode": "inline"

            },
            {
              "type": "select",
              "label": "所在省：",
              "name": "province",
              "id": "u:63c85c19f3aa",
              "multiple": false,
              "value":`${provinceCode!}`,

              "mode": "horizontal",
              "size": "md",
              "value":"",
              "horizontal": {
                "leftFixed": "lg"
              },
              "source": {
                "url": "/coursePackage/queryProvince",
                "method": "get",
                "messages": {
                },
                "sendOn": "",
                "requestAdaptor": "",
                "adaptor": "",
                "silent": true,
                "hidden": `${is3}`

              },
              "onEvent": {
                "change": {
                  "weight": 0,
                  "actions": [
                    {
                      "componentId": "u:14bafe37d5f3",
                      "actionType": "reload",
                      "dataMergeMode": "merge"
                    }
                  ]
                }
              },
              "labelField": "name",
              "valueField": "code",
              "required": true,
              "hidden": `${is3}`
            },
            {
              "type": "select",
              "label": "所在市：",
              "value":`${cityCode!}`,
              "name": "city",
              "value": "",
              "id": "u:14bafe37d5f3",
              "multiple": false,
              "mode": "horizontal",
              "hidden": `${is3}`,
              "size": "md",
              "horizontal": {
                "leftFixed": "lg"
              },
              "source": {
                "url": "/coursePackage/queryCity1/$province",
                "method": "post",
                "messages": {
                },
                "sendOn": "this.province != null &&this.province != ' '",
                "requestAdaptor": "",
                "adaptor": "",
                "silent": true
              },
              "onEvent": {
                "change": {
                  "weight": 0,
                  "actions": [
                    {
                      "componentId": "u:576899b1b531",
                      "actionType": "reload",
                      "dataMergeMode": "merge"
                    }
                  ]
                }
              },
              "labelField": "name",
              "valueField": "code",
              "required": true,
              "loadingConfig": {
                "show": true
              }
            },
            {
              "type": "select",