Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-10 6f54cebf07887237f5eb8efdf9d1d0b784dbaa49

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

@@ -2,7 +2,6 @@

import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.TableDataInfo;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.order.service.ShoppingCartService;
@@ -11,7 +10,7 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import model.ShoppingCart;
import com.ruoyi.order.model.ShoppingCart;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
@@ -89,7 +88,7 @@
   @ResponseBody
   @PostMapping("/shoppingCartPayment")
   @ApiOperation(value = "购物车订单支付", tags = {"商城-购物车-小程序"})
   public R<Void> shoppingCartPayment(@RequestBody ShoppingCartPayment shoppingCartPayment){
   public R<String> shoppingCartPayment(@RequestBody ShoppingCartPayment shoppingCartPayment){
      return shoppingCartService.shoppingCartPayment(shoppingCartPayment);
   }