Merge remote-tracking branch 'origin/master'

puzhibing

2025-02-05 74b0e0814e37d640596f44ec86d20fa9ecce9ed6

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TShoppingOrderController.java

@@ -17,6 +17,8 @@
import com.ruoyi.common.core.utils.OrderCodeUtil;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.security.annotation.Logical;
import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.order.api.model.TChargingOrderRefund;
import com.ruoyi.order.api.model.TExchangeOrder;
@@ -113,6 +115,7 @@
      }
   }
   
   @RequiresPermissions(value = {"/shoppingOrder"}, logical = Logical.OR)
   @PostMapping("/getShoppingOrderList")
   @ApiOperation(value = "列表查询", tags = {"管理后台-购物订单"})
   public AjaxResult<PageInfo<TShoppingOrder>> getShoppingOrderList(@RequestBody ShoppingOrderQuery query) {
@@ -136,6 +139,7 @@
      return AjaxResult.success(res);
   }
   
   @RequiresPermissions(value = {"/shoppingOrder/deliver_goods"}, logical = Logical.OR)
   @GetMapping("/getShoppingOrderInfoById")
   @ApiOperation(value = "根据订单id查看订单详情", tags = {"管理后台-购物订单"})
   public AjaxResult<TShoppingOrder> getShoppingOrderList(String id) {
@@ -176,6 +180,8 @@
      return AjaxResult.success(byId);
   }
   
	
   @RequiresPermissions(value = {"/shoppingOrder/del"}, logical = Logical.OR)
   @GetMapping("/deleteShoppingOrder")
   @ApiOperation(value = "批量删除订单", tags = {"管理后台-购物订单"})
   public AjaxResult<TShoppingOrder> deleteShoppingOrder(String ids) {
@@ -183,6 +189,8 @@
      return AjaxResult.success();
   }

	
   @RequiresPermissions(value = {"/shoppingOrder/cancel"}, logical = Logical.OR)
   @GetMapping("/cancelShoppingOrder")
   @ApiOperation(value = "取消订单", tags = {"管理后台-购物订单"})
   public AjaxResult cancelShoppingOrder(String id) {
@@ -264,6 +272,8 @@
      return AjaxResult.success();
   }
   
	
   @RequiresPermissions(value = {"/shoppingOrder/deliver_goods"}, logical = Logical.OR)
   @GetMapping("/consignerShoppingOrder")
   @ApiOperation(value = "发货", tags = {"管理后台-购物订单"})
   public AjaxResult consignerShoppingOrder(String id, String companyName, String code) {
@@ -304,8 +314,27 @@
   
   
   @GetMapping("/getMyShoppingOrderInfo/{id}")
   @ApiOperation(value = "获取购买订单详情", tags = {"小程序-商城购买订单", "管理后台-支付订单-订单信息"})
   @ApiOperation(value = "获取购买订单详情", tags = {"管理后台-支付订单-订单信息"})
   public AjaxResult<MyShoppingOrderInfo> getMyShoppingOrderInfo(@PathVariable String id) {
      TShoppingOrder shoppingOrder = shoppingOrderService.getById(id);
      Long userId = tokenService.getLoginUserApplet().getUserId();
      if(!shoppingOrder.getAppUserId().equals(userId)){
         return AjaxResult.error("权限不足");
      }
      MyShoppingOrderInfo info = shoppingOrderService.getMyShoppingOrderInfo(id);
      return AjaxResult.success(info);
   }
	
	
	
   @GetMapping("/getMyShoppingOrderInfo1/{id}")
   @ApiOperation(value = "获取购买订单详情", tags = {"小程序-商城购买订单"})
   public AjaxResult<MyShoppingOrderInfo> getMyShoppingOrderInfo1(@PathVariable String id) {
      TShoppingOrder shoppingOrder = shoppingOrderService.getById(id);
      Long userId = tokenService.getLoginUserApplet().getUserId();
      if(!shoppingOrder.getAppUserId().equals(userId)){
         return AjaxResult.error("权限不足");
      }
      MyShoppingOrderInfo info = shoppingOrderService.getMyShoppingOrderInfo(id);
      return AjaxResult.success(info);
   }
@@ -315,6 +344,10 @@
   @ApiOperation(value = "确认收货操作", tags = {"小程序-商城购买订单"})
   public AjaxResult confirmReceipt(@PathVariable String id) {
      TShoppingOrder shoppingOrder = shoppingOrderService.getById(id);
      Long userId = tokenService.getLoginUserApplet().getUserId();
      if(!shoppingOrder.getAppUserId().equals(userId)){
         return AjaxResult.error("权限不足");
      }
      if (shoppingOrder.getStatus() == 3) {
         return AjaxResult.error("不能重复确认收货");
      }
@@ -334,6 +367,11 @@
   @PutMapping("/cancelOrder/{id}")
   @ApiOperation(value = "取消订单操作", tags = {"小程序-商城购买订单"})
   public AjaxResult cancelOrder(@PathVariable String id) {
      TShoppingOrder shoppingOrder = shoppingOrderService.getById(id);
      Long userId = tokenService.getLoginUserApplet().getUserId();
      if(!shoppingOrder.getAppUserId().equals(userId)){
         return AjaxResult.error("权限不足");
      }
      return shoppingOrderService.cancelOrder(id);
   }