优化订单退单积分

yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/MyOrderDto.java

@@ -31,7 +31,7 @@ public class MyOrderDto {
     private Double actualTotal;
 
     @ApiModelProperty(value = "使用积分", required = true)
-    private Integer userScore;
+    private Integer userScore=0;
 
     @ApiModelProperty(value = "订单状态", required = true)
     private Integer status;

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

@@ -1,5 +1,6 @@
 package com.yami.shop.bean.param;
 
+import lombok.Builder;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -12,6 +13,7 @@ import java.math.BigDecimal;
  * @since 2025-10-22
  */
 @Data
+@Builder
 public class OrderRefundAmountDTO {
     private BigDecimal orderRefundAmount = BigDecimal.ZERO;
     private Long offsetPoints = 0L;

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

@@ -52,7 +52,9 @@ public class MyOrderServiceImpl extends ServiceImpl<OrderMapper, Order> implemen
             }
 //            List<MyOrderItemDto> orderItemDtos = myOrderDto.getOrderItemDtos();
 //            int score = orderItemDtos.stream().mapToInt(MyOrderItemDto::getUseScore).sum();
-            myOrderDto.setUserScore(Math.toIntExact(myOrderDto.getOffsetPoints()));
+            if(null!=myOrderDto.getOffsetPoints()){
+                myOrderDto.setUserScore(Math.toIntExact(myOrderDto.getOffsetPoints()));
+            }
             if (null != myOrderDto.getPayTime()) {
                 // 转换为 LocalDateTime 并增加 1 小时
                 LocalDateTime delayedTime = myOrderDto.getPayTime().toInstant()

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

@@ -1084,7 +1084,13 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
     @Override
     public OrderRefundAmountDTO computeOrderRefundAmount(String orderNumber, List<OrderRefundAmountParam> suk) {
-        return null;
+        BigDecimal orderRefundAmount = BigDecimal.ZERO;
+        Long offsetPoints = 0L;
+        Order order = orderMapper.selectOne(new LambdaQueryWrapper<Order>()
+                .eq(Order::getOrderNumber, orderNumber)
+                .eq(Order::getDeleteStatus, 0));
+        List<OrderItem> orderItems = orderItemMapper.selectList(new LambdaQueryWrapper<OrderItem>().eq(OrderItem::getOrderNumber, orderNumber));
+        return OrderRefundAmountDTO.builder().orderRefundAmount(orderRefundAmount).offsetPoints(offsetPoints).build();
     }
 
 

yami-shop-service/src/main/resources/mapper/OrderMapper.xml

@@ -536,7 +536,7 @@
             temp.pay_time,
             temp.dvy_type,
             temp.order_id, temp.create_time, temp.freight_amount,temp.order_number,temp.actual_total,temp.shop_id,temp.addr_order_id FROM tz_order temp
-        WHERE temp.user_id = #{userId} and temp.delete_status = 0
+        WHERE temp.user_id = #{userId}
         <if test="status != null">
             AND
             <choose>

yami-shop-service/src/main/resources/mapper/ProductMapper.xml

@@ -165,7 +165,7 @@
                  LEFT JOIN tz_shop_sku AS tss ON tp.prod_id = tss.spu_id
                  LEFT JOIN tz_channel_shop AS tcs ON tss.shop_id = tcs.shop_id
         WHERE tp.prod_id = #{prodId}
-          AND tcs.channel_id = #{platform} and p.`is_delete`=0
+          AND tcs.channel_id = #{platform} and tp.`is_delete`=0
         GROUP BY
             tp.prod_id,
             tcs.shop_id