Merge remote-tracking branch 'origin/master'

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

@@ -72,7 +72,8 @@
         <result column="o_pay_time" property="orderPayTime"/>
         <result column="o_status" property="status"/>
         <result column="o_refund_status" property="refundStatus"/>
-
+        <result column="freight_amount" property="freightAmount"/>
+        <result column="offset_points" property="offsetPoints"/>
 
         <!-- 退货地址信息 -->
         <association property="refundDelivery" javaType="com.yami.shop.bean.model.RefundDelivery">

yami-shop-user/yami-shop-user-comment/src/main/java/com/yami/shop/user/comment/service/impl/UserScoreDetailServiceImpl.java

@@ -153,7 +153,7 @@ public class UserScoreDetailServiceImpl extends ServiceImpl<UserScoreDetailMappe
         IPage<PointsRecord> pointsRecordIPage = pointsRecordMapper.selectPage(page, new LambdaQueryWrapper<PointsRecord>()
                 .eq(PointsRecord::getUserId, userId)
                 .eq(PointsRecord::getChannelId, platform)
-                .orderByAsc(PointsRecord::getCreationDate)
+                .orderByDesc(PointsRecord::getCreationDate)
         );
         SimpleDateFormat sdf = new SimpleDateFormat("MM月dd日 HH:mm");
         List<PointsRecord> collect = pointsRecordIPage.getRecords().stream().flatMap((pointsRecord) -> {