Merge branch 'master' into cc_20250327_tallyBook

# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java

coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCShopController.java

@@ -59,6 +59,7 @@ public class PCShopController {
     @ApiOperation("删除店铺")
     @PostMapping("/deleteShop")
     public ResponseResult<Integer> deleteShop(@RequestBody @Validated DeleteShopRequest request) {
+        request.setUserId(CurrentUserHolder.getUserId());
         return ResponseResult.success(shopService.deleteShop(request));
     }
 
@@ -117,12 +118,15 @@ public class PCShopController {
         return ResponseResult.success(transferLogService.getTransferLogPage(pageNum, pageSize, lineId, lineShopType));
     }
 
-
-
-
     @ApiOperation("门店结束跟进")
     @GetMapping("/shopClose")
     public ResponseResult<Boolean> shopClose(@RequestParam("shopId")Long shopId) {
         return ResponseResult.success(shopService.shopClose(shopId));
     }
+
+    @ApiOperation("门店恢复状态")
+    @GetMapping("/updateShopStatue")
+    public ResponseResult<Boolean> updateShopStatue(@RequestParam("shopId")Long shopId) {
+        return ResponseResult.success(shopService.updateShopStatue(shopId));
+    }
 }