修改bug

liujie

2023-10-26 e030255c23c7ba3e2cbad1036a810d6d72fa864f

 cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java

@@ -1,11 +1,12 @@
package com.dsh.other.controller;


import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsh.other.entity.Store;
import com.dsh.other.entity.*;
import com.dsh.other.feignclient.model.*;
import com.dsh.other.model.*;
import com.dsh.other.service.StoreService;
import com.dsh.other.service.*;
import com.dsh.other.util.GDMapGeocodingUtil;
import com.dsh.other.util.ResultUtil;
import com.dsh.other.util.ToolUtil;
@@ -16,6 +17,7 @@
import org.springframework.web.bind.annotation.*;

import java.util.*;
import java.util.stream.Collectors;

@RestController
@RequestMapping("")
@@ -28,6 +30,52 @@
    @Autowired
    private GDMapGeocodingUtil gdMapGeocodingUtil;

    @Autowired
    private TStoreOtherService tStoreOtherService;

    @Autowired
    private TBackRecordService backRecordService;


    /**
     * 根据城市管理员id获取门店
     */
    @RequestMapping("base/site/getStoreByCityManagerId")
    public Object getStoreByCityManagerId(@RequestBody Integer id){
        return storeService.getStoreByCityManagerId(id);
    }
    /**
     * 根据员工id获取门店
     */
    @RequestMapping("base/site/getStoreByStoreStaffId")
    public Object getStoreByStoreStaffId(@RequestBody Integer id){
        return storeService.getStoreByStoreStaffId(id);
    }

    /**
     * 根据门店id获取门店信息
     */
    @RequestMapping("base/site/getStoreById")
    public Store getStoreById(@RequestBody Integer id){
        return storeService.getOne(new QueryWrapper<Store>().eq("id",id));
    }
    /**
     * 选择市区 展示全部门店
     */
    @RequestMapping("base/store/getStore")
    public List<Store> getStore(@RequestBody String city){
        return storeService.list(new QueryWrapper<Store>().eq("city",city));
    }

    /**
     * 根据所选门店 查询经营时间
     * @param oneId
     * @return
     */
    @RequestMapping("base/store/getTime")
    public Store getTime(@RequestBody String oneId){
        return storeService.getOne(new QueryWrapper<Store>().eq("name",oneId));
    }



@@ -44,8 +92,11 @@

    @PostMapping("/base/protocol/storeDetail/nearbyStore")
    public List<StoreInfo> getAllNearbyStoreList(@RequestBody GetAllNearbyStoreList list ){
        String current = list.getLongitude()+","+list.getLatitude();
        List<StoreInfo> storeInfos = new ArrayList<>();
        if (ToolUtil.isEmpty(list.getLongitude()) && ToolUtil.isEmpty(list.getLatitude())){
            return storeInfos;
        }
        String current = list.getLongitude()+","+list.getLatitude();
        String cityCode = "";
        try {
            Map<String, String> geocode = gdMapGeocodingUtil.geocode(list.getLongitude(), list.getLatitude());
@@ -62,11 +113,17 @@
                String storeLat = store.getLat();
                String result = storeLon+","+storeLat;
                String distanceTOKilometer = gdMapGeocodingUtil.getDistanceTOKilometer(current, result);
                long l = 0;
                try {
                    l = Long.parseLong(distanceTOKilometer);
                }catch (Exception e){
                    l = 0;
                }
                StoreInfo info = new StoreInfo();
                info.setStoreId(store.getId());
                info.setStoreName(store.getName());
                info.setStoreImg(store.getRealPicture());
                info.setDistance(Long.parseLong(distanceTOKilometer));
                info.setStoreImg(store.getCoverDrawing());
                info.setDistance(l);
                info.setStoreAddr(store.getAddress());
                info.setLatitude(storeLat);
                info.setLongitude(storeLon);
@@ -89,12 +146,11 @@
     * @return
     */
    @PostMapping("/base/protocol/storeDetail/distanceCal")
    public long calculateDistance(@RequestBody GetDistanceVo distanceVo){
    public String calculateDistance(@RequestBody GetDistanceVo distanceVo){
        String current = distanceVo.getLongitude()+","+distanceVo.getLatitude();
        Store store = storeService.getById(distanceVo.getStoreId());
        String result = store.getLon()+","+store.getLat();
        String distanceTOKilometer = gdMapGeocodingUtil.getDistanceTOKilometer(current, result);
        return Long.parseLong(distanceTOKilometer);
        return gdMapGeocodingUtil.getDistanceTOKilometer(current, result);
    }


@@ -105,12 +161,16 @@
                .eq("state",1 )
                .eq("cityCode",citycodeResp.getCityCode()));
        if (list.size() > 0 ){
            if (ToolUtil.isEmpty(citycodeResp.getLongitude()) && ToolUtil.isEmpty(citycodeResp.getLatitude())){
                return detailLists;
            }
            for (Store store : list) {
                String current = citycodeResp.getLongitude() +","+citycodeResp.getLatitude();
                String result = store.getLon()+","+store.getLat();
                String distanceTOKilometer = gdMapGeocodingUtil.getDistanceTOKilometer(current, result);
                long l = Long.parseLong(distanceTOKilometer);
                if (ToolUtil.isNotEmpty(citycodeResp.getSpace()) && l > citycodeResp.getSpace()){
//                取5公里范围内的门店
                if ( l > 5){
                    continue;
                }
                StoreDetailList detailList = new StoreDetailList();
@@ -149,6 +209,50 @@
    }


    /**
     * 获取门店列表
     * @return
     */
    @ResponseBody
    @PostMapping("/store/queryStoreByIds")
    public List<Store> queryStoreByIds(@RequestBody List<Integer> ids){
        try {
            List<Store> list = storeService.list(new LambdaQueryWrapper<Store>()
                    .in(Store::getId, ids));
            for (Store store : list) {
                Integer operatorId = store.getOperatorId();
                if(operatorId == null){
                    operatorId=-1;
                }
                String name = storeService.getOName(operatorId);
                store.setOName(name);
            }
            return list;
        }catch (Exception e){
            e.printStackTrace();
            return new ArrayList<>();
        }
    }

    @ResponseBody
    @PostMapping("/store/queryStoreIdByCityCode")
    List<Integer> queryStoreIdByCityCode(@RequestBody List<String> collect){
        try {
            return storeService.list(new LambdaQueryWrapper<Store>()
                    .in(Store::getCityCode,collect)).stream().map(Store::getId).collect(Collectors.toList());
        }catch (Exception e){
            e.printStackTrace();
            return new ArrayList<>();
        }
    }

    @ResponseBody
    @PostMapping("/store/querySiteIdById")
    public List<Integer> querySiteIdById(@RequestBody List<Integer> storeIds){
        List<Site> list = siteService.list(new LambdaQueryWrapper<Site>().in(Site::getStoreId, storeIds));
        List<Integer> collect = list.stream().map(Site::getId).collect(Collectors.toList());
        return collect;
    }



@@ -158,10 +262,11 @@
    @ApiImplicitParams({
            @ApiImplicitParam(value = "经纬", name = "lon", dataType = "string", required = false),
            @ApiImplicitParam(value = "纬度", name = "lat", dataType = "string", required = false),
            @ApiImplicitParam(value = "cityCode", name = "cityCode", dataType = "string", required = false),
    })
    public ResultUtil<List<BaseVo>> queryStoreLists(String lon, String lat){
    public ResultUtil<List<BaseVo>> queryStoreLists(String lon, String lat,String cityCode){
        try {
            List<BaseVo> baseVos = storeService.queryStoreLists(lon, lat);
            List<BaseVo> baseVos = storeService.queryStoreLists(lon, lat,cityCode);
            return ResultUtil.success(baseVos);
        }catch (Exception e){
            e.printStackTrace();
@@ -177,7 +282,7 @@
     */
    @ResponseBody
    @PostMapping("/store/queryStoreListByName")
    public List<Store> queryStoreListByName(@RequestParam("name") String name){
    public List<Store> queryStoreListByName(@RequestBody String name){
        try {
            List<Store> stores = storeService.list(new QueryWrapper<Store>().eq("state", 1).like("name", name));
            return stores;
@@ -204,6 +309,39 @@
        }
    }

    @ResponseBody
    @PostMapping("/store/queryByStoreId")
    public OperatorUser queryByStoreId(@RequestBody Integer id){
        try {
            return storeService.queryByStoreId(id);
        }catch (Exception e){
            e.printStackTrace();
            return null;
        }
    }


    @Autowired
    private ISiteService siteService;
    @ResponseBody
    @PostMapping("/store/querySiteId")
    public List<Integer> querySiteId(@RequestBody Integer storeId){
        List<Site> list = siteService.list(new LambdaQueryWrapper<Site>().eq(Site::getStoreId, storeId).eq(Site::getSign, 1));
        List<Integer> collect = list.stream().map(Site::getId).collect(Collectors.toList());
        return collect;
    }


    @PostMapping("/store/addBackRecord")
    public void addBackRecord(@RequestBody String s){
        TBackRecord tBackRecord = new TBackRecord();
        String[] split = s.split("_");
        tBackRecord.setMoney(Double.valueOf(split[0]));
        tBackRecord.setUserId(Integer.valueOf(split[1]));
        tBackRecord.setTime(new Date());
        backRecordService.save(tBackRecord);
    }




@@ -226,6 +364,30 @@
        }
    }

    @Autowired
    private TStoreOtherConfigTrueService tStoreOtherConfigTrueService;
    @ResponseBody
    @PostMapping("/base/store/queryIndexSet")
    @ApiOperation(value = "获取门店首页设置 2.0", tags = {"APP-免费福利"})
    @ApiImplicitParams({
            @ApiImplicitParam(value = "门店id", name = "id", dataType = "int", required = true),
    })
    public ResultUtil<List<TStoreOtherConfigTrue>> queryIndexSet(Integer id){
        try {
            List<TStoreOtherConfigTrue> tStoreOtherConfigTrues = new ArrayList<>();

            List<TStoreOther> list = tStoreOtherService.list(new LambdaQueryWrapper<TStoreOther>().eq(TStoreOther::getStoreId, id).eq(TStoreOther::getState,1));
            if(list.size()>0){
                tStoreOtherConfigTrues= tStoreOtherConfigTrueService.list(new LambdaQueryWrapper<TStoreOtherConfigTrue>().in(TStoreOtherConfigTrue::getPid, list.stream().map(TStoreOther::getId).collect(Collectors.toList())).eq(TStoreOtherConfigTrue::getState,1));
            }
            return ResultUtil.success(tStoreOtherConfigTrues);
        }catch (Exception e){
            e.printStackTrace();
            return ResultUtil.runErr();
        }
    }