Merge remote-tracking branch 'origin/master'

luodangjia

2024-12-12 ff811ae8df41273d7ab0011b6b7f1f278f03bbd2

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/ShoppingCartService.java

@@ -1,6 +1,7 @@
package com.ruoyi.order.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.account.api.model.AppUser;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.order.model.ShoppingCart;
import com.ruoyi.order.vo.*;
@@ -47,4 +48,6 @@
    * @return
    */
   R shoppingCartPayment(ShoppingCartPayment shoppingCartPayment);

   Price getPrice(AppUser appUser, Integer goodsId, Integer shopId);
}