Merge remote-tracking branch 'origin/master'

yami-shop-bean/src/main/java/com/yami/shop/bean/param/OrderRefundAmountDTO.java

@@ -13,6 +13,6 @@ import java.math.BigDecimal;
  */
 @Data
 public class OrderRefundAmountDTO {
-    private BigDecimal orderRefundAmount;
-    private Long offsetPoints;
+    private BigDecimal orderRefundAmount = BigDecimal.ZERO;
+    private Long offsetPoints = 0L;
 }

yami-shop-bean/src/main/java/com/yami/shop/bean/param/OrderRefundAmountParam.java

@@ -0,0 +1,19 @@
+package com.yami.shop.bean.param;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * TODO
+ *
+ * @author mr wang
+ * @version 1.0.0
+ * @since 2025-10-22
+ */
+@Data
+public class OrderRefundAmountParam {
+    private Long skuId;
+    //sku退单数量
+    private Integer prodCount;
+}

yami-shop-service/src/main/java/com/yami/shop/service/OrderService.java

@@ -38,14 +38,16 @@ public interface OrderService extends IService<Order> {
 
     /**
      * 根据订单号和用户id获取订单
+     *
      * @param orderNumber
      * @param userId
      * @return
      */
-    Order getOrderByOrderNumberAndUserId(String orderNumber,String userId, boolean valid);
+    Order getOrderByOrderNumberAndUserId(String orderNumber, String userId, boolean valid);
 
     /**
      * 根据店铺id获取支付数据
+     *
      * @param shopId
      */
     OrderPayParam getPayUserCountByshopId(Long shopId, Date startTime, Date endTime);
@@ -62,11 +64,12 @@ public interface OrderService extends IService<Order> {
 
     /**
      * 根据店铺id和订单号获取订单
+     *
      * @param orderNumber
      * @param shopId
      * @return
      */
-    Order getOrderByOrderNumberAndShopId(String orderNumber,Long shopId, boolean valid);
+    Order getOrderByOrderNumberAndShopId(String orderNumber, Long shopId, boolean valid);
 
 
     ShopCartOrderMergerDto putConfirmOrderCache(String userId, ShopCartOrderMergerDto shopCartOrderMergerDto);
@@ -106,6 +109,7 @@ public interface OrderService extends IService<Order> {
 
     /**
      * 获取退款的订单项的id和退款状态
+     *
      * @param orderId
      * @return
      */
@@ -116,14 +120,16 @@ public interface OrderService extends IService<Order> {
 
     /**
      * 订单申请退款
+     *
      * @param orderRefundParam 订单申请退款参数
-     * @param rReturnMoneySts 退款状态
+     * @param rReturnMoneySts  退款状态
      * @return 订单申请退款结果
      */
-    OrderRefund applyAgain(OrderRefundParam orderRefundParam , Integer  rReturnMoneySts);
+    OrderRefund applyAgain(OrderRefundParam orderRefundParam, Integer rReturnMoneySts);
 
     /**
      * 订单申请退款
+     *
      * @param orderNumber 订单单号
      * @return 订单申请退款结果
      */
@@ -132,10 +138,10 @@ public interface OrderService extends IService<Order> {
 
     /**
      * 计算退单金额和积分
+     *
      * @param orderNumber 订单编号
-     * @param skuId id
-     * @param prodCount 退单sku的数量
+     * @param suk  {@link OrderRefundAmountParam}
      * @return {@link OrderRefundAmountDTO}
      */
-    OrderRefundAmountDTO computeOrderRefundAmount(String orderNumber,Long skuId,Integer prodCount);
+    OrderRefundAmountDTO computeOrderRefundAmount(String orderNumber, List<OrderRefundAmountParam> suk);
 }

yami-shop-service/src/main/java/com/yami/shop/service/impl/OrderServiceImpl.java

@@ -1083,10 +1083,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     }
 
     @Override
-    public OrderRefundAmountDTO computeOrderRefundAmount(String orderNumber, Long skuId, Integer prodCount) {
+    public OrderRefundAmountDTO computeOrderRefundAmount(String orderNumber, List<OrderRefundAmountParam> suk) {
         return null;
     }
 
+
     private boolean isPaymentOver7Days(Date paymentDate) {
         // 1. 将支付时间转换为 Instant
         Instant paymentInstant = paymentDate.toInstant();