|
@@ -29,6 +29,7 @@ import org.springframework.transaction.annotation.Transactional;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
|
|
import jakarta.servlet.http.HttpServletResponse;
|
|
import jakarta.servlet.http.HttpServletResponse;
|
|
|
|
|
+
|
|
|
import java.math.BigDecimal;
|
|
import java.math.BigDecimal;
|
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
|
import java.util.Arrays;
|
|
import java.util.Arrays;
|
|
@@ -45,8 +46,7 @@ import java.util.stream.Collectors;
|
|
|
*/
|
|
*/
|
|
|
@RestController
|
|
@RestController
|
|
|
@RequestMapping("/chanting/store")
|
|
@RequestMapping("/chanting/store")
|
|
|
-public class PosStoreController extends BaseController
|
|
|
|
|
-{
|
|
|
|
|
|
|
+public class PosStoreController extends BaseController {
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private IPosStoreService posStoreService;
|
|
private IPosStoreService posStoreService;
|
|
|
|
|
|
|
@@ -60,16 +60,18 @@ public class PosStoreController extends BaseController
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private IInfoUserService infoUserService;
|
|
private IInfoUserService infoUserService;
|
|
|
@Autowired
|
|
@Autowired
|
|
|
|
|
+ private IPosReviewService posReviewService;
|
|
|
|
|
+ @Autowired
|
|
|
private IOperatingHoursService operatingHoursService;
|
|
private IOperatingHoursService operatingHoursService;
|
|
|
@Autowired
|
|
@Autowired
|
|
|
|
|
+ private IPosOrderService posOrderService;
|
|
|
|
|
+ @Autowired
|
|
|
private SysConfigMapper sysConfigMapper;
|
|
private SysConfigMapper sysConfigMapper;
|
|
|
|
|
|
|
|
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
/**
|
|
/**
|
|
|
* 根据评分查旬门店
|
|
* 根据评分查旬门店
|
|
|
|
|
+ *
|
|
|
* @param longitude
|
|
* @param longitude
|
|
|
* @param latitude
|
|
* @param latitude
|
|
|
* @param page
|
|
* @param page
|
|
@@ -80,19 +82,18 @@ public class PosStoreController extends BaseController
|
|
|
@Anonymous
|
|
@Anonymous
|
|
|
@GetMapping("/getPfStore")
|
|
@GetMapping("/getPfStore")
|
|
|
public AjaxResult getPfStore(@RequestParam BigDecimal longitude,
|
|
public AjaxResult getPfStore(@RequestParam BigDecimal longitude,
|
|
|
- @RequestParam BigDecimal latitude,
|
|
|
|
|
- @RequestParam Integer page,
|
|
|
|
|
- @RequestParam Integer juli,
|
|
|
|
|
- @RequestParam Integer type)
|
|
|
|
|
- {
|
|
|
|
|
- if(type==0){
|
|
|
|
|
- List<PosStore> list = posStoreMapper.getPingfStore(longitude,latitude,(page-1)*10,juli);
|
|
|
|
|
|
|
+ @RequestParam BigDecimal latitude,
|
|
|
|
|
+ @RequestParam Integer page,
|
|
|
|
|
+ @RequestParam Integer juli,
|
|
|
|
|
+ @RequestParam Integer type) {
|
|
|
|
|
+ if (type == 0) {
|
|
|
|
|
+ List<PosStore> list = posStoreMapper.getPingfStore(longitude, latitude, (page - 1) * 10, juli);
|
|
|
return success(list);
|
|
return success(list);
|
|
|
- }else if(type==1){
|
|
|
|
|
- List<PosStore> list = posStoreMapper.getReduStore(longitude,latitude,(page-1)*10,juli);
|
|
|
|
|
|
|
+ } else if (type == 1) {
|
|
|
|
|
+ List<PosStore> list = posStoreMapper.getReduStore(longitude, latitude, (page - 1) * 10, juli);
|
|
|
return success(list);
|
|
return success(list);
|
|
|
- }else {
|
|
|
|
|
- List<PosStore> list = posStoreMapper.getNewStore(longitude,latitude,(page-1)*10,juli);
|
|
|
|
|
|
|
+ } else {
|
|
|
|
|
+ List<PosStore> list = posStoreMapper.getNewStore(longitude, latitude, (page - 1) * 10, juli);
|
|
|
return success(list);
|
|
return success(list);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -101,13 +102,13 @@ public class PosStoreController extends BaseController
|
|
|
@Anonymous
|
|
@Anonymous
|
|
|
@Auth
|
|
@Auth
|
|
|
@GetMapping("/delemendian")
|
|
@GetMapping("/delemendian")
|
|
|
- public AjaxResult delemendian(@RequestParam String id){
|
|
|
|
|
- QueryWrapper<PosFenlei> queryWrapper= new QueryWrapper<>();
|
|
|
|
|
- queryWrapper.eq("mendid",id);
|
|
|
|
|
|
|
+ public AjaxResult delemendian(@RequestParam String id) {
|
|
|
|
|
+ QueryWrapper<PosFenlei> queryWrapper = new QueryWrapper<>();
|
|
|
|
|
+ queryWrapper.eq("mendid", id);
|
|
|
List<PosFenlei> list = posFenleiService.list(queryWrapper);
|
|
List<PosFenlei> list = posFenleiService.list(queryWrapper);
|
|
|
- if(list.size()>0){
|
|
|
|
|
|
|
+ if (list.size() > 0) {
|
|
|
return error(MessageUtils.message("no.mendian.exist.classify.not.del"));
|
|
return error(MessageUtils.message("no.mendian.exist.classify.not.del"));
|
|
|
- }else {
|
|
|
|
|
|
|
+ } else {
|
|
|
return toAjax(posStoreService.deletePosStoreById(Long.valueOf(id)));
|
|
return toAjax(posStoreService.deletePosStoreById(Long.valueOf(id)));
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -120,17 +121,16 @@ public class PosStoreController extends BaseController
|
|
|
@GetMapping("/storelistlist")
|
|
@GetMapping("/storelistlist")
|
|
|
public AjaxResult storelistlist(@RequestHeader String token,
|
|
public AjaxResult storelistlist(@RequestHeader String token,
|
|
|
@RequestParam Integer page,
|
|
@RequestParam Integer page,
|
|
|
- @RequestParam Integer size)
|
|
|
|
|
- {
|
|
|
|
|
|
|
+ @RequestParam Integer size) {
|
|
|
JwtUtil jwtUtil = new JwtUtil();
|
|
JwtUtil jwtUtil = new JwtUtil();
|
|
|
String id = jwtUtil.getusid(token);
|
|
String id = jwtUtil.getusid(token);
|
|
|
- IPage<PosStore> stlist = new Page<>(page,size);
|
|
|
|
|
|
|
+ IPage<PosStore> stlist = new Page<>(page, size);
|
|
|
QueryWrapper<PosStore> queryWrapper = new QueryWrapper<>();
|
|
QueryWrapper<PosStore> queryWrapper = new QueryWrapper<>();
|
|
|
- queryWrapper.eq("user_id",id);
|
|
|
|
|
- IPage<PosStore> list = posStoreService.page(stlist,queryWrapper);
|
|
|
|
|
- if(!list.getRecords().isEmpty()){
|
|
|
|
|
|
|
+ queryWrapper.eq("user_id", id);
|
|
|
|
|
+ IPage<PosStore> list = posStoreService.page(stlist, queryWrapper);
|
|
|
|
|
+ if (!list.getRecords().isEmpty()) {
|
|
|
QueryWrapper<OperatingHours> wrapper = new QueryWrapper<>();
|
|
QueryWrapper<OperatingHours> wrapper = new QueryWrapper<>();
|
|
|
- wrapper.in("md_id",list.getRecords().stream().map(PosStore::getId).collect(Collectors.toList()));
|
|
|
|
|
|
|
+ wrapper.in("md_id", list.getRecords().stream().map(PosStore::getId).collect(Collectors.toList()));
|
|
|
List<OperatingHours> hourslist = operatingHoursService.list(wrapper);
|
|
List<OperatingHours> hourslist = operatingHoursService.list(wrapper);
|
|
|
list.getRecords().forEach(posStore -> {
|
|
list.getRecords().forEach(posStore -> {
|
|
|
posStore.setBusinessHours(hourslist);
|
|
posStore.setBusinessHours(hourslist);
|
|
@@ -139,15 +139,16 @@ public class PosStoreController extends BaseController
|
|
|
|
|
|
|
|
return success(list);
|
|
return success(list);
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
//查询我的门店列表
|
|
//查询我的门店列表
|
|
|
@Anonymous
|
|
@Anonymous
|
|
|
@Auth
|
|
@Auth
|
|
|
@GetMapping("/getmystorelist")
|
|
@GetMapping("/getmystorelist")
|
|
|
- public AjaxResult getmystorelist(@RequestHeader String token){
|
|
|
|
|
|
|
+ public AjaxResult getmystorelist(@RequestHeader String token) {
|
|
|
JwtUtil jwtUtil = new JwtUtil();
|
|
JwtUtil jwtUtil = new JwtUtil();
|
|
|
String id = jwtUtil.getusid(token);
|
|
String id = jwtUtil.getusid(token);
|
|
|
- QueryWrapper<PosStore> queryWrapper= new QueryWrapper<>();
|
|
|
|
|
- queryWrapper.eq("user_id",id);
|
|
|
|
|
|
|
+ QueryWrapper<PosStore> queryWrapper = new QueryWrapper<>();
|
|
|
|
|
+ queryWrapper.eq("user_id", id);
|
|
|
List<PosStore> list = posStoreService.list(queryWrapper);
|
|
List<PosStore> list = posStoreService.list(queryWrapper);
|
|
|
return success(list);
|
|
return success(list);
|
|
|
}
|
|
}
|
|
@@ -155,43 +156,43 @@ public class PosStoreController extends BaseController
|
|
|
//查询门店列表
|
|
//查询门店列表
|
|
|
@Anonymous
|
|
@Anonymous
|
|
|
@GetMapping("/getstore")
|
|
@GetMapping("/getstore")
|
|
|
- public AjaxResult getstore(@RequestHeader(defaultValue = "") String token,@RequestParam Integer id){
|
|
|
|
|
- if(!"".equals(token)){
|
|
|
|
|
|
|
+ public AjaxResult getstore(@RequestHeader(defaultValue = "") String token, @RequestParam Integer id) {
|
|
|
|
|
+ if (!"".equals(token)) {
|
|
|
JwtUtil jwtUtil = new JwtUtil();
|
|
JwtUtil jwtUtil = new JwtUtil();
|
|
|
String usid = jwtUtil.getusid(token);
|
|
String usid = jwtUtil.getusid(token);
|
|
|
- QueryWrapper<PosCollect> queryWrapper= new QueryWrapper<>();
|
|
|
|
|
- queryWrapper.eq("user_id",usid);
|
|
|
|
|
- queryWrapper.eq("md_id",id);
|
|
|
|
|
|
|
+ QueryWrapper<PosCollect> queryWrapper = new QueryWrapper<>();
|
|
|
|
|
+ queryWrapper.eq("user_id", usid);
|
|
|
|
|
+ queryWrapper.eq("md_id", id);
|
|
|
List<PosCollect> list = posCollectService.list(queryWrapper);
|
|
List<PosCollect> list = posCollectService.list(queryWrapper);
|
|
|
PosStore posStore = posStoreService.getById(id);
|
|
PosStore posStore = posStoreService.getById(id);
|
|
|
JSONObject org = new JSONObject();
|
|
JSONObject org = new JSONObject();
|
|
|
- org.put("id",posStore.getId());
|
|
|
|
|
- org.put("posName",posStore.getPosName());
|
|
|
|
|
- org.put("image",posStore.getImage());
|
|
|
|
|
- org.put("posPrice",posStore.getPosPrice());
|
|
|
|
|
- org.put("area",posStore.getArea());
|
|
|
|
|
- org.put("address",posStore.getAddress());
|
|
|
|
|
- org.put("longitude",posStore.getLongitude());
|
|
|
|
|
- org.put("latitude",posStore.getLatitude());
|
|
|
|
|
- org.put("briefIntroduction",posStore.getBriefIntroduction());
|
|
|
|
|
- org.put("type",posStore.getType());
|
|
|
|
|
- org.put("hygienePermit",posStore.getHygienePermit());
|
|
|
|
|
- org.put("hygieneLicence",posStore.getHygieneLicence());
|
|
|
|
|
- org.put("openBusiness",posStore.getOpenBusiness());
|
|
|
|
|
- org.put("windingUp",posStore.getWindingUp());
|
|
|
|
|
- org.put("sort",posStore.getSort());
|
|
|
|
|
- org.put("userId",posStore.getUserId());
|
|
|
|
|
- org.put("juli",posStore.getJuli());
|
|
|
|
|
- org.put("cretim",posStore.getCretim());
|
|
|
|
|
- org.put("zhitsj",posStore.getJuli());
|
|
|
|
|
- org.put("tgpaixv",posStore.getCretim());
|
|
|
|
|
- org.put("state",posStore.getState());
|
|
|
|
|
- org.put("serverType",posStore.getServerType());
|
|
|
|
|
- org.put("telephone",posStore.getTelephone());
|
|
|
|
|
- org.put("Collect", !list.isEmpty() ?1:0);
|
|
|
|
|
- org.put("logo",posStore.getLogo());
|
|
|
|
|
- org.put("isNightMarket",posStore.getIsNightMarket());
|
|
|
|
|
- org.put("nightMarketId",posStore.getNightMarketId());
|
|
|
|
|
|
|
+ org.put("id", posStore.getId());
|
|
|
|
|
+ org.put("posName", posStore.getPosName());
|
|
|
|
|
+ org.put("image", posStore.getImage());
|
|
|
|
|
+ org.put("posPrice", posStore.getPosPrice());
|
|
|
|
|
+ org.put("area", posStore.getArea());
|
|
|
|
|
+ org.put("address", posStore.getAddress());
|
|
|
|
|
+ org.put("longitude", posStore.getLongitude());
|
|
|
|
|
+ org.put("latitude", posStore.getLatitude());
|
|
|
|
|
+ org.put("briefIntroduction", posStore.getBriefIntroduction());
|
|
|
|
|
+ org.put("type", posStore.getType());
|
|
|
|
|
+ org.put("hygienePermit", posStore.getHygienePermit());
|
|
|
|
|
+ org.put("hygieneLicence", posStore.getHygieneLicence());
|
|
|
|
|
+ org.put("openBusiness", posStore.getOpenBusiness());
|
|
|
|
|
+ org.put("windingUp", posStore.getWindingUp());
|
|
|
|
|
+ org.put("sort", posStore.getSort());
|
|
|
|
|
+ org.put("userId", posStore.getUserId());
|
|
|
|
|
+ org.put("juli", posStore.getJuli());
|
|
|
|
|
+ org.put("cretim", posStore.getCretim());
|
|
|
|
|
+ org.put("zhitsj", posStore.getJuli());
|
|
|
|
|
+ org.put("tgpaixv", posStore.getCretim());
|
|
|
|
|
+ org.put("state", posStore.getState());
|
|
|
|
|
+ org.put("serverType", posStore.getServerType());
|
|
|
|
|
+ org.put("telephone", posStore.getTelephone());
|
|
|
|
|
+ org.put("Collect", !list.isEmpty() ? 1 : 0);
|
|
|
|
|
+ org.put("logo", posStore.getLogo());
|
|
|
|
|
+ org.put("isNightMarket", posStore.getIsNightMarket());
|
|
|
|
|
+ org.put("nightMarketId", posStore.getNightMarketId());
|
|
|
|
|
|
|
|
QueryWrapper<OperatingHours> wrapper = new QueryWrapper<>();
|
|
QueryWrapper<OperatingHours> wrapper = new QueryWrapper<>();
|
|
|
wrapper.eq("md_id", posStore.getId());
|
|
wrapper.eq("md_id", posStore.getId());
|
|
@@ -207,17 +208,18 @@ public class PosStoreController extends BaseController
|
|
|
}
|
|
}
|
|
|
//不在时间范围内标识为打烊
|
|
//不在时间范围内标识为打烊
|
|
|
if (dayang == false) {
|
|
if (dayang == false) {
|
|
|
- org.put("state",1);
|
|
|
|
|
|
|
+ org.put("state", 1);
|
|
|
}
|
|
}
|
|
|
org.put("businessHours", hourslist);
|
|
org.put("businessHours", hourslist);
|
|
|
return success(org);
|
|
return success(org);
|
|
|
- }else {
|
|
|
|
|
|
|
+ } else {
|
|
|
PosStore posStore = posStoreService.getById(id);
|
|
PosStore posStore = posStoreService.getById(id);
|
|
|
return success(posStore);
|
|
return success(posStore);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
//根据行业分类查询门店列表
|
|
//根据行业分类查询门店列表
|
|
|
@Anonymous
|
|
@Anonymous
|
|
|
@GetMapping("/getstorelist")
|
|
@GetMapping("/getstorelist")
|
|
@@ -226,78 +228,130 @@ public class PosStoreController extends BaseController
|
|
|
@RequestParam Integer page,
|
|
@RequestParam Integer page,
|
|
|
@RequestParam String area,
|
|
@RequestParam String area,
|
|
|
@RequestParam Integer juli,
|
|
@RequestParam Integer juli,
|
|
|
- @RequestParam(defaultValue = "") Integer sort)
|
|
|
|
|
- {
|
|
|
|
|
- if(sort==null){
|
|
|
|
|
- List<PosStore> list = posStoreMapper.getmdlist(longitude,latitude,(page-1)*20,"%"+area+"%",juli);
|
|
|
|
|
|
|
+ @RequestParam(defaultValue = "") Integer sort) {
|
|
|
|
|
+ List<PosStore> list;
|
|
|
|
|
+ if (sort == null) {
|
|
|
|
|
+ list = posStoreMapper.getmdlist(longitude, latitude, (page - 1) * 20, "%" + area + "%", juli);
|
|
|
|
|
+ } else {
|
|
|
|
|
+ list = posStoreMapper.getdaidiq(longitude, latitude, (page - 1) * 20, "%" + area + "%", juli, sort);
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
- return success(list);
|
|
|
|
|
- }else {
|
|
|
|
|
- List<PosStore> list = posStoreMapper.getdaidiq(longitude,latitude,(page-1)*20,"%"+area+"%",juli,sort);
|
|
|
|
|
- return success(list);
|
|
|
|
|
|
|
+ // 为门店列表设置评分与月售订单数量
|
|
|
|
|
+ if (!list.isEmpty()) {
|
|
|
|
|
+ List<Long> mdIds = list.stream()
|
|
|
|
|
+ .map(store -> store.getId() == null ? null : store.getId().longValue())
|
|
|
|
|
+ .filter(idVal -> idVal != null)
|
|
|
|
|
+ .collect(Collectors.toList());
|
|
|
|
|
+
|
|
|
|
|
+ if (!mdIds.isEmpty()) {
|
|
|
|
|
+ // 1. 计算各门店评分
|
|
|
|
|
+ QueryWrapper<PosReview> reviewWrapper = new QueryWrapper<>();
|
|
|
|
|
+ reviewWrapper.in("md_id", mdIds);
|
|
|
|
|
+ List<PosReview> reviews = posReviewService.list(reviewWrapper);
|
|
|
|
|
+
|
|
|
|
|
+ Map<Long, List<PosReview>> reviewMap = reviews.stream()
|
|
|
|
|
+ .collect(Collectors.groupingBy(PosReview::getMdId));
|
|
|
|
|
+
|
|
|
|
|
+ // 2. 统计各门店本月订单数(按 cretim 当前月份)
|
|
|
|
|
+ QueryWrapper<PosOrder> orderWrapper = new QueryWrapper<>();
|
|
|
|
|
+ orderWrapper.in("md_id", mdIds);
|
|
|
|
|
+ orderWrapper.apply("DATE_FORMAT(cretim,'%Y-%m') = DATE_FORMAT(NOW(),'%Y-%m')");
|
|
|
|
|
+ List<PosOrder> orders = posOrderService.list(orderWrapper);
|
|
|
|
|
+ Map<Long, Long> orderCountMap = orders.stream()
|
|
|
|
|
+ .collect(Collectors.groupingBy(PosOrder::getMdId, Collectors.counting()));
|
|
|
|
|
+
|
|
|
|
|
+ for (PosStore store : list) {
|
|
|
|
|
+ Long mdId = store.getId() == null ? null : store.getId().longValue();
|
|
|
|
|
+ List<PosReview> storeReviews = mdId == null ? null : reviewMap.get(mdId);
|
|
|
|
|
+
|
|
|
|
|
+ double score;
|
|
|
|
|
+ if (storeReviews == null || storeReviews.isEmpty()) {
|
|
|
|
|
+ score = 4.5d;
|
|
|
|
|
+ } else {
|
|
|
|
|
+ double avg = storeReviews.stream()
|
|
|
|
|
+ .mapToLong(PosReview::getScore)
|
|
|
|
|
+ .average()
|
|
|
|
|
+ .orElse(4.5d);
|
|
|
|
|
+ // 平均分按 0.5 分粒度四舍五入,例如 3, 3.5, 4, 4.5
|
|
|
|
|
+ score = Math.round(avg * 2.0d) / 2.0d;
|
|
|
|
|
+ }
|
|
|
|
|
+ store.setPingf(score);
|
|
|
|
|
+
|
|
|
|
|
+ // 设置本月售出订单数量(ddsl)
|
|
|
|
|
+ long monthCount = (mdId == null) ? 0L : orderCountMap.getOrDefault(mdId, 0L);
|
|
|
|
|
+ store.setDdsl(monthCount);
|
|
|
|
|
+ }
|
|
|
|
|
+ } else {
|
|
|
|
|
+ // 没有有效门店 ID,全部按默认评分与 0 月售
|
|
|
|
|
+ list.forEach(store -> {
|
|
|
|
|
+ store.setPingf(4.5d);
|
|
|
|
|
+ store.setDdsl(0L);
|
|
|
|
|
+ });
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ return success(list);
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
//根据服务分类查询门店列表
|
|
//根据服务分类查询门店列表
|
|
|
@Anonymous
|
|
@Anonymous
|
|
|
@GetMapping("/getserverlist")
|
|
@GetMapping("/getserverlist")
|
|
|
public AjaxResult getserverlist(@RequestParam BigDecimal longitude,
|
|
public AjaxResult getserverlist(@RequestParam BigDecimal longitude,
|
|
|
- @RequestParam BigDecimal latitude,
|
|
|
|
|
- @RequestParam Integer page,
|
|
|
|
|
- @RequestParam String area,
|
|
|
|
|
- @RequestParam Integer juli,
|
|
|
|
|
- @RequestParam(defaultValue = "") String serverType)
|
|
|
|
|
- {
|
|
|
|
|
- if(!"".equals(serverType)){
|
|
|
|
|
- List<PosStore> list = posStoreMapper.getserverlist(longitude,latitude,(page-1)*20,"%"+area+"%",juli,"%"+serverType+"%");
|
|
|
|
|
|
|
+ @RequestParam BigDecimal latitude,
|
|
|
|
|
+ @RequestParam Integer page,
|
|
|
|
|
+ @RequestParam String area,
|
|
|
|
|
+ @RequestParam Integer juli,
|
|
|
|
|
+ @RequestParam(defaultValue = "") String serverType) {
|
|
|
|
|
+ if (!"".equals(serverType)) {
|
|
|
|
|
+ List<PosStore> list = posStoreMapper.getserverlist(longitude, latitude, (page - 1) * 20, "%" + area + "%", juli, "%" + serverType + "%");
|
|
|
return success(list);
|
|
return success(list);
|
|
|
- }else {
|
|
|
|
|
- List<PosStore> list = posStoreMapper.getmdlist(longitude,latitude,(page-1)*20,"%"+area+"%",juli);
|
|
|
|
|
|
|
+ } else {
|
|
|
|
|
+ List<PosStore> list = posStoreMapper.getmdlist(longitude, latitude, (page - 1) * 20, "%" + area + "%", juli);
|
|
|
return success(list);
|
|
return success(list);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
//添加门店
|
|
//添加门店
|
|
|
@Anonymous
|
|
@Anonymous
|
|
|
@PostMapping("/addmendian")
|
|
@PostMapping("/addmendian")
|
|
|
@Transactional
|
|
@Transactional
|
|
|
- public AjaxResult addmendian(@RequestBody PosStore posStore)
|
|
|
|
|
- {
|
|
|
|
|
|
|
+ public AjaxResult addmendian(@RequestBody PosStore posStore) {
|
|
|
Boolean org = posStoreService.saveOrUpdate(posStore);
|
|
Boolean org = posStoreService.saveOrUpdate(posStore);
|
|
|
|
|
|
|
|
- if(org){
|
|
|
|
|
|
|
+ if (org) {
|
|
|
QueryWrapper<PosStore> wrapper = new QueryWrapper<>();
|
|
QueryWrapper<PosStore> wrapper = new QueryWrapper<>();
|
|
|
- wrapper.eq("pos_name",posStore.getPosName());
|
|
|
|
|
- wrapper.eq("user_id",posStore.getUserId());
|
|
|
|
|
|
|
+ wrapper.eq("pos_name", posStore.getPosName());
|
|
|
|
|
+ wrapper.eq("user_id", posStore.getUserId());
|
|
|
PosStore store = posStoreService.getOne(wrapper);
|
|
PosStore store = posStoreService.getOne(wrapper);
|
|
|
|
|
|
|
|
- if(posStore.getBusinessHours()!=null && posStore.getBusinessHours().size()>0){
|
|
|
|
|
|
|
+ if (posStore.getBusinessHours() != null && posStore.getBusinessHours().size() > 0) {
|
|
|
LambdaQueryWrapper<OperatingHours> query = new LambdaQueryWrapper<>();
|
|
LambdaQueryWrapper<OperatingHours> query = new LambdaQueryWrapper<>();
|
|
|
- query.eq(OperatingHours::getMdId,Long.valueOf(store.getId()));
|
|
|
|
|
- operatingHoursService.remove( query);
|
|
|
|
|
|
|
+ query.eq(OperatingHours::getMdId, Long.valueOf(store.getId()));
|
|
|
|
|
+ operatingHoursService.remove(query);
|
|
|
posStore.getBusinessHours().forEach(operatingHours -> {
|
|
posStore.getBusinessHours().forEach(operatingHours -> {
|
|
|
operatingHours.setMdId(Long.valueOf(store.getId()));
|
|
operatingHours.setMdId(Long.valueOf(store.getId()));
|
|
|
});
|
|
});
|
|
|
operatingHoursService.saveBatch(posStore.getBusinessHours());
|
|
operatingHoursService.saveBatch(posStore.getBusinessHours());
|
|
|
}
|
|
}
|
|
|
- return success(MessageUtils.message("no.success"),store);
|
|
|
|
|
- }else {
|
|
|
|
|
|
|
+ return success(MessageUtils.message("no.success"), store);
|
|
|
|
|
+ } else {
|
|
|
return error();
|
|
return error();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 查询posstore列表
|
|
* 查询posstore列表
|
|
|
*/
|
|
*/
|
|
|
@PreAuthorize("@ss.hasPermi('chanting:store:list')")
|
|
@PreAuthorize("@ss.hasPermi('chanting:store:list')")
|
|
|
// @Anonymous
|
|
// @Anonymous
|
|
|
@GetMapping("/list")
|
|
@GetMapping("/list")
|
|
|
- public TableDataInfo list(PosStore posStore)
|
|
|
|
|
- {
|
|
|
|
|
|
|
+ public TableDataInfo list(PosStore posStore) {
|
|
|
startPage();
|
|
startPage();
|
|
|
List<PosStore> list = posStoreService.selectPosStoreList(posStore);
|
|
List<PosStore> list = posStoreService.selectPosStoreList(posStore);
|
|
|
- for (PosStore store:list){
|
|
|
|
|
|
|
+ for (PosStore store : list) {
|
|
|
InfoUser user = infoUserService.getById(store.getUserId());
|
|
InfoUser user = infoUserService.getById(store.getUserId());
|
|
|
store.setUserName(user.getUserName());
|
|
store.setUserName(user.getUserName());
|
|
|
}
|
|
}
|
|
@@ -310,8 +364,7 @@ public class PosStoreController extends BaseController
|
|
|
@PreAuthorize("@ss.hasPermi('chanting:store:export')")
|
|
@PreAuthorize("@ss.hasPermi('chanting:store:export')")
|
|
|
@Log(title = "posstore", businessType = BusinessType.EXPORT)
|
|
@Log(title = "posstore", businessType = BusinessType.EXPORT)
|
|
|
@PostMapping("/export")
|
|
@PostMapping("/export")
|
|
|
- public void export(HttpServletResponse response, PosStore posStore)
|
|
|
|
|
- {
|
|
|
|
|
|
|
+ public void export(HttpServletResponse response, PosStore posStore) {
|
|
|
List<PosStore> list = posStoreService.selectPosStoreList(posStore);
|
|
List<PosStore> list = posStoreService.selectPosStoreList(posStore);
|
|
|
ExcelUtil<PosStore> util = new ExcelUtil<PosStore>(PosStore.class);
|
|
ExcelUtil<PosStore> util = new ExcelUtil<PosStore>(PosStore.class);
|
|
|
util.exportExcel(response, list, MessageUtils.message("no.export.excel.posstore"));
|
|
util.exportExcel(response, list, MessageUtils.message("no.export.excel.posstore"));
|
|
@@ -322,8 +375,7 @@ public class PosStoreController extends BaseController
|
|
|
*/
|
|
*/
|
|
|
@PreAuthorize("@ss.hasPermi('chanting:store:query')")
|
|
@PreAuthorize("@ss.hasPermi('chanting:store:query')")
|
|
|
@GetMapping(value = "/{id}")
|
|
@GetMapping(value = "/{id}")
|
|
|
- public AjaxResult getInfo(@PathVariable("id") Long id)
|
|
|
|
|
- {
|
|
|
|
|
|
|
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
|
|
|
return success(posStoreService.selectPosStoreById(id));
|
|
return success(posStoreService.selectPosStoreById(id));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -333,8 +385,7 @@ public class PosStoreController extends BaseController
|
|
|
@PreAuthorize("@ss.hasPermi('chanting:store:add')")
|
|
@PreAuthorize("@ss.hasPermi('chanting:store:add')")
|
|
|
@Log(title = "posstore", businessType = BusinessType.INSERT)
|
|
@Log(title = "posstore", businessType = BusinessType.INSERT)
|
|
|
@PostMapping
|
|
@PostMapping
|
|
|
- public AjaxResult add(@RequestBody PosStore posStore)
|
|
|
|
|
- {
|
|
|
|
|
|
|
+ public AjaxResult add(@RequestBody PosStore posStore) {
|
|
|
return toAjax(posStoreService.insertPosStore(posStore));
|
|
return toAjax(posStoreService.insertPosStore(posStore));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -344,33 +395,32 @@ public class PosStoreController extends BaseController
|
|
|
@PreAuthorize("@ss.hasPermi('chanting:store:edit')")
|
|
@PreAuthorize("@ss.hasPermi('chanting:store:edit')")
|
|
|
@Log(title = "posstore", businessType = BusinessType.UPDATE)
|
|
@Log(title = "posstore", businessType = BusinessType.UPDATE)
|
|
|
@PutMapping
|
|
@PutMapping
|
|
|
- public AjaxResult edit(@RequestBody PosStore posStore)
|
|
|
|
|
- {
|
|
|
|
|
|
|
+ public AjaxResult edit(@RequestBody PosStore posStore) {
|
|
|
return toAjax(posStoreService.updatePosStore(posStore));
|
|
return toAjax(posStoreService.updatePosStore(posStore));
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 修改posstore下架状态
|
|
* 修改posstore下架状态
|
|
|
*/
|
|
*/
|
|
|
@Anonymous
|
|
@Anonymous
|
|
|
@PutMapping("/changeOffShelf")
|
|
@PutMapping("/changeOffShelf")
|
|
|
- public AjaxResult changeOffShelf(@RequestBody PosStore posStore)
|
|
|
|
|
- {
|
|
|
|
|
|
|
+ public AjaxResult changeOffShelf(@RequestBody PosStore posStore) {
|
|
|
Boolean res = posStoreService.saveOrUpdate(posStore);
|
|
Boolean res = posStoreService.saveOrUpdate(posStore);
|
|
|
- if (res){
|
|
|
|
|
|
|
+ if (res) {
|
|
|
return success();
|
|
return success();
|
|
|
- }else {
|
|
|
|
|
|
|
+ } else {
|
|
|
return error();
|
|
return error();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 删除posstore
|
|
* 删除posstore
|
|
|
*/
|
|
*/
|
|
|
@PreAuthorize("@ss.hasPermi('chanting:store:remove')")
|
|
@PreAuthorize("@ss.hasPermi('chanting:store:remove')")
|
|
|
@Log(title = "posstore", businessType = BusinessType.DELETE)
|
|
@Log(title = "posstore", businessType = BusinessType.DELETE)
|
|
|
- @DeleteMapping("/{ids}")
|
|
|
|
|
- public AjaxResult remove(@PathVariable Long[] ids)
|
|
|
|
|
- {
|
|
|
|
|
|
|
+ @DeleteMapping("/{ids}")
|
|
|
|
|
+ public AjaxResult remove(@PathVariable Long[] ids) {
|
|
|
return toAjax(posStoreService.deletePosStoreByIds(ids));
|
|
return toAjax(posStoreService.deletePosStoreByIds(ids));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -382,8 +432,8 @@ public class PosStoreController extends BaseController
|
|
|
public AjaxResult compressStoreImage(@RequestParam String idsStr) {
|
|
public AjaxResult compressStoreImage(@RequestParam String idsStr) {
|
|
|
LambdaQueryWrapper<PosStore> queryWrapper = new LambdaQueryWrapper<>();
|
|
LambdaQueryWrapper<PosStore> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
|
|
|
|
|
- List<Integer> ids= new ArrayList<>();
|
|
|
|
|
- if(!StringUtils.isEmpty(idsStr)){
|
|
|
|
|
|
|
+ List<Integer> ids = new ArrayList<>();
|
|
|
|
|
+ if (!StringUtils.isEmpty(idsStr)) {
|
|
|
ids = Arrays.stream(idsStr.split(","))
|
|
ids = Arrays.stream(idsStr.split(","))
|
|
|
.map(Integer::valueOf)
|
|
.map(Integer::valueOf)
|
|
|
.collect(Collectors.toList());
|
|
.collect(Collectors.toList());
|
|
@@ -400,11 +450,11 @@ public class PosStoreController extends BaseController
|
|
|
posStore.setImage(compressImage);
|
|
posStore.setImage(compressImage);
|
|
|
posStoreService.saveOrUpdate(posStore);
|
|
posStoreService.saveOrUpdate(posStore);
|
|
|
count.getAndIncrement();
|
|
count.getAndIncrement();
|
|
|
- System.out.println("store成功压缩的图片数量:"+count.get());
|
|
|
|
|
- logger.info("store成功压缩的图片数量:"+count.get());
|
|
|
|
|
|
|
+ System.out.println("store成功压缩的图片数量:" + count.get());
|
|
|
|
|
+ logger.info("store成功压缩的图片数量:" + count.get());
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
|
- return success("成功压缩的图片数量:"+count.get());
|
|
|
|
|
|
|
+ return success("成功压缩的图片数量:" + count.get());
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
}
|
|
}
|