校快送2024.12.16.v0.0.7

school_lend_back_end/school_lend_back_end/src/main/java/com/bsz/school_send_back_end/controller/BusinessController.java

@@ -1,7 +1,9 @@
 package com.bsz.school_send_back_end.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.bsz.school_send_back_end.annotation.AuthCheck;
 import com.bsz.school_send_back_end.common.BaseResponse;
@@ -10,18 +12,14 @@ import com.bsz.school_send_back_end.common.ResultUtils;
 import com.bsz.school_send_back_end.contant.UserConstant;
 import com.bsz.school_send_back_end.exception.BusinessException;
 import com.bsz.school_send_back_end.exception.ThrowUtils;
-import com.bsz.school_send_back_end.model.domain.Business;
-import com.bsz.school_send_back_end.model.domain.BusinessAuth;
-import com.bsz.school_send_back_end.model.domain.User;
+import com.bsz.school_send_back_end.model.domain.*;
 import com.bsz.school_send_back_end.model.dto.business.BusinessAddRequest;
 import com.bsz.school_send_back_end.model.dto.business.BusinessQueryRequest;
 import com.bsz.school_send_back_end.model.dto.business.BusinessUpdateMyRequest;
 import com.bsz.school_send_back_end.model.dto.business.BusinessUpdateRequest;
 import com.bsz.school_send_back_end.model.vo.BusinessAdminVO;
 import com.bsz.school_send_back_end.model.vo.BusinessVO;
-import com.bsz.school_send_back_end.service.BusinessAuthService;
-import com.bsz.school_send_back_end.service.BusinessService;
-import com.bsz.school_send_back_end.service.UserService;
+import com.bsz.school_send_back_end.service.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -52,6 +50,12 @@ public class BusinessController {
     @Resource
     private UserService userService;
 
+    @Resource
+    private CollectService collectService;
+
+    @Resource
+    private BusinessLevelService businessLevelService;
+
     @PostMapping("/add")
     public BaseResponse<Long> addBusiness(@RequestBody BusinessAddRequest businessAddRequest) {
 
@@ -166,6 +170,40 @@ public class BusinessController {
         return ResultUtils.success(businessAdminVO);
     }
 
+    /**
+     * 根据id查询
+     */
+    @GetMapping("/my/getById")
+    @AuthCheck(mustRole = UserConstant.DEFAULT_ROLE)
+    public BaseResponse<BusinessVO> getMyBusinessById(@RequestParam Long id, HttpServletRequest request) {
+        if (id <= 0) {
+            throw new BusinessException(ErrorCode.PARAMS_ERROR);
+        }
+        LambdaQueryWrapper<Business> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(Business::getId, id);
+        Business business = businessService.getOne(queryWrapper);
+        ThrowUtils.throwIf(business == null, ErrorCode.OPERATION_ERROR, "没有找到商家");
+
+        BusinessVO businessVO = new BusinessVO();
+        BeanUtils.copyProperties(business, businessVO);
+        User loginUser = userService.getLoginUser(request);
+        Long loginUserId = loginUser.getId();
+        LambdaQueryWrapper<Collect> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(Collect::getUserId, loginUserId);
+        wrapper.eq(Collect::getBusinessId, id);
+        long count = collectService.count(wrapper);
+        Collect collect = collectService.getOne(wrapper);
+        if (count > 0) {
+            businessVO.setCollectId(collect.getId());
+        } else{
+            businessVO.setCollectId(0L);
+        }
+        BusinessLevel level = businessLevelService.getOne(Wrappers.<BusinessLevel>lambdaQuery()
+                .eq(BusinessLevel::getBusinessId, id));
+        businessVO.setLevel(level.getLevel());
+        return ResultUtils.success(businessVO);
+    }
+
     /**
      * 根据当前登录用户获取商家信息
      */

school_lend_back_end/school_lend_back_end/src/main/java/com/bsz/school_send_back_end/controller/OrdersController.java

@@ -146,6 +146,7 @@ public class OrdersController {
      * 根据 id 获取订单信息
      */
     @GetMapping("/get/my")
+    @AuthCheck(mustRole = UserConstant.DEFAULT_ROLE)
     public BaseResponse<OrdersVO> getOrderVOByMyId(@RequestParam Long id, HttpServletRequest request) {
         if (id <= 0) {
             throw new BusinessException(ErrorCode.PARAMS_ERROR);
@@ -399,7 +400,9 @@ public class OrdersController {
         Orders orders = ordersService.getOne(queryWrapper);
         Business loginBusiness = businessService.getLoginBusiness(request);
         Long businessId = loginBusiness.getId();
-        ThrowUtils.throwIf(!businessId.equals(orders.getBusinessId()), ErrorCode.FORBIDDEN_ERROR, "当前订单不属于当前登录用户");
+        ThrowUtils.throwIf(!businessId.equals(orders.getBusinessId()), ErrorCode.FORBIDDEN_ERROR,
+                "当前订单不属于当前登录用户");
+        ThrowUtils.throwIf(!orders.getState().equals(1), ErrorCode.OPERATION_ERROR,"当前订单状态不是已支付状态");
         LambdaUpdateWrapper<Orders> updateWrapper = new LambdaUpdateWrapper<>();
         updateWrapper.set(Orders::getState,4);
         updateWrapper.eq(Orders::getId, id);
@@ -409,6 +412,29 @@ public class OrdersController {
         return ResultUtils.success(true);
     }
 
+    @PostMapping("/update/user")
+    @AuthCheck(mustRole = UserConstant.DEFAULT_ROLE)
+    public BaseResponse<Boolean> updateOrderStateByUser (@RequestBody CommonRequest commonRequest, HttpServletRequest request){
+        if (commonRequest == null) {
+            throw new BusinessException(ErrorCode.PARAMS_ERROR);
+        }
+
+        Long orderId = commonRequest.getId();
+        LambdaQueryWrapper<Orders> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(Orders::getId, orderId);
+        Orders orders = ordersService.getOne(queryWrapper);
+        User loginUser = userService.getLoginUser(request);
+        ThrowUtils.throwIf(!loginUser.getId().equals(orders.getUserId()), ErrorCode.OPERATION_ERROR,
+                "当前订单不属于该用户");
+        ThrowUtils.throwIf(!orders.getState().equals(4), ErrorCode.OPERATION_ERROR,"该订单未出餐");
+        LambdaUpdateWrapper<Orders> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.set(Orders::getState, 5);
+        updateWrapper.eq(Orders::getId, orderId);
+        boolean update = ordersService.update(updateWrapper);
+        ThrowUtils.throwIf(!update, ErrorCode.OPERATION_ERROR,"修改订单状态失败");
+        return ResultUtils.success(true);
+    }
+
 
     private BaseResponse<String> getStringBaseResponse(String type, String startTime, String endTime, QueryWrapper<Orders> queryWrapper) {
         queryWrapper.ge(StringUtils.isNotBlank(startTime), "createTime", startTime);

school_lend_back_end/school_lend_back_end/src/main/java/com/bsz/school_send_back_end/controller/TestAlipayController.java

@@ -142,7 +142,7 @@ public class TestAlipayController {
             throw new BusinessException(ErrorCode.NO_AUTH, "你不是该订单用户！");
         }
 
-        String tradeNo = aliPayService.createPayment(String.valueOf(orderId), miniOpenId, order.getTotalPrice());
+        String tradeNo = aliPayService.createPayment(String.valueOf(orderId), miniOpenId, order.getTotalPrice(), order.getBusinessId());
         log.info("tradeNo:" + tradeNo);
         return ResultUtils.success(tradeNo);
     }
@@ -190,7 +190,7 @@ public class TestAlipayController {
         model.setOutTradeNo(orderNo);
         model.setRefundAmount(String.valueOf(orders.getTotalPrice()));
         //退款请求单号 要求唯一 需改
-        String number = UniqueNumberGenerator.generateNumber();
+        String number = UniqueNumberGenerator.generateNumber(orders.getBusinessId());
         model.setOutRequestNo(number);
         log.info("outRequestNo:" + number);
         request.setBizModel(model);

school_lend_back_end/school_lend_back_end/src/main/java/com/bsz/school_send_back_end/controller/UserRatingController.java

@@ -10,13 +10,11 @@ import com.bsz.school_send_back_end.common.ResultUtils;
 import com.bsz.school_send_back_end.contant.UserConstant;
 import com.bsz.school_send_back_end.exception.BusinessException;
 import com.bsz.school_send_back_end.exception.ThrowUtils;
-import com.bsz.school_send_back_end.model.domain.Business;
 import com.bsz.school_send_back_end.model.domain.User;
 import com.bsz.school_send_back_end.model.domain.UserRating;
 import com.bsz.school_send_back_end.model.dto.CommonRequest;
 import com.bsz.school_send_back_end.model.dto.userRating.UserRatingAddRequest;
 import com.bsz.school_send_back_end.model.dto.userRating.UserRatingReviewRequest;
-import com.bsz.school_send_back_end.service.BusinessService;
 import com.bsz.school_send_back_end.service.UserRatingService;
 import com.bsz.school_send_back_end.service.UserService;
 import lombok.extern.slf4j.Slf4j;
@@ -41,9 +39,6 @@ public class UserRatingController {
     @Resource
     private UserService userService;
 
-    @Resource
-    private BusinessService businessService;
-
     /**
      * 添加用户评分
      * @param userRatingAddRequest 用户评分请求
@@ -51,6 +46,7 @@ public class UserRatingController {
      * @return 是否添加成功
      */
     @PostMapping("/add")
+    @AuthCheck(mustRole = UserConstant.DEFAULT_ROLE)
     public BaseResponse<Boolean> addRating (@RequestBody UserRatingAddRequest userRatingAddRequest, HttpServletRequest request) {
         if (userRatingAddRequest == null) {
             throw new BusinessException(ErrorCode.PARAMS_ERROR);
@@ -70,11 +66,18 @@ public class UserRatingController {
      * @return 是否删除成功
      */
     @PostMapping("/delete")
-    public BaseResponse<Boolean> deleteUserRating (@RequestBody CommonRequest commonRequest) {
+    @AuthCheck(mustRole = UserConstant.DEFAULT_ROLE)
+    public BaseResponse<Boolean> deleteUserRating (@RequestBody CommonRequest commonRequest, HttpServletRequest request) {
         if (commonRequest == null) {
             throw new BusinessException(ErrorCode.PARAMS_ERROR);
         }
-        boolean remove = userRatingService.removeById(commonRequest.getId());
+        Long id = commonRequest.getId();
+        User loginUser = userService.getLoginUser(request);
+        Long loginUserId = loginUser.getId();
+        UserRating rating = userRatingService.getOne(Wrappers.<UserRating>lambdaQuery().eq(UserRating::getId, id));
+        ThrowUtils.throwIf(!rating.getUserId().equals(loginUserId), ErrorCode.OPERATION_ERROR,
+                "当前评分不属于该用户");
+        boolean remove = userRatingService.removeById(id);
         ThrowUtils.throwIf(!remove, ErrorCode.SYSTEM_ERROR, "删除失败");
 
         return ResultUtils.success(true);
@@ -94,14 +97,15 @@ public class UserRatingController {
     }
 
     /**
-     * 展示当前用户评分
-     * @param request 当前用户
+     * 查看商家评分
      * @return 评分列表
      */
     @PostMapping("/list/business")
-    public BaseResponse<List<UserRating>> listUserRatingByBusiness (HttpServletRequest request) {
-        Business loginBusiness = businessService.getLoginBusiness(request);
-        Long businessId = loginBusiness.getId();
+    public BaseResponse<List<UserRating>> listUserRatingByBusiness (@RequestBody CommonRequest commonRequest) {
+        if (commonRequest == null) {
+            throw new BusinessException(ErrorCode.PARAMS_ERROR);
+        }
+        Long businessId = commonRequest.getId();
         List<UserRating> list = userRatingService.list(Wrappers.<UserRating>lambdaQuery()
                 .eq(UserRating::getBusinessId, businessId));
         return ResultUtils.success(list);