From 07de03ccae02d00be243911a003115fe9b24f863 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期二, 08 四月 2025 16:07:07 +0800
Subject: [PATCH] 订单部分+个人中心部分
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
index 5b7826c..6529950 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
@@ -253,7 +253,7 @@
@DeleteMapping("/deleteShop")
@ApiOperation(value = "删除门店", tags = {"管理后台-门店管理"})
public R<Void> deleteShop(@ApiParam("门店id") @RequestParam("id") Integer id){
- List<Goods> list1 = goodsService.list(new LambdaQueryWrapper<Goods>().eq(Goods::getDelFlag, 0).eq(Goods::getAppointStore, 1).eq(Goods::getStatus, 2));
+ /*List<Goods> list1 = goodsService.list(new LambdaQueryWrapper<Goods>().eq(Goods::getDelFlag, 0).eq(Goods::getAppointStore, 1).eq(Goods::getStatus, 2));
if(list1.size() > 0){
Set<Integer> collect1 = list1.stream().map(Goods::getId).collect(Collectors.toSet());
long count = goodsShopService.count(new LambdaQueryWrapper<GoodsShop>().eq(GoodsShop::getShopId, id).in(GoodsShop::getGoodsId, collect1));
@@ -280,7 +280,7 @@
if(data.size() > 0){
//删除门店后台账号和关系数据
sysUserClient.delShopUser(shop.getId(), 2);
- }
+ }*/
return R.ok();
}
@@ -655,7 +655,7 @@
@GetMapping("/getVerifiableShop")
@ApiOperation(value = "获取可核销门店列表", tags = {"购物车-小程序"})
public R<List<VerifiableShopVo>> getVerifiableShop(String longitude, String latitude, Integer goodsId){
- String city = TencentMapUtil.inverseGeographicalAnalysis(longitude, latitude, false);
+ /* String city = TencentMapUtil.inverseGeographicalAnalysis(longitude, latitude, false);
if(null == city){
city = "510100";
}
@@ -689,7 +689,8 @@
return o1.getDistance().compareTo(o2.getDistance());
}
});
- return R.ok(verifiableShopVoList);
+ return R.ok(verifiableShopVoList);*/
+ return null;
}
--
Gitblit v1.7.1