增加退单详情时整单运费

yami-shop-api/src/main/java/com/yami/shop/api/listener/SubmitOrderListener.java

@@ -199,7 +199,7 @@ public class SubmitOrderListener {
                         //后台充值的积分
                         if (1 == mergerOrder.getPlatform() && null != point && point > 0) {
                             Double useActualItem = actualItem;
-                            if (!isUseTransfee) {//每个订单增加手续费，都只扣一次
+                            if (!isUseTransfee) {//每个订单增加运费，都只扣一次
                                 Double transfee = shopCartOrderDto.getTransfee();
                                 useActualItem = Arith.add(useActualItem, transfee);
                                 isUseTransfee = Boolean.TRUE;

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

@@ -655,7 +655,7 @@
             AND
             <choose>
                 <when test="20 == status">
-                    temp.hb_order_status IN (1,20,30,40,70)
+                    temp.hb_order_status IN (1,20,30,40,50,70)
                 </when>
                 <otherwise>
                     temp.hb_order_status = #{status}
@@ -709,8 +709,8 @@
         SELECT
         COUNT(o.order_id) all_count,
         COUNT( CASE WHEN o.hb_order_status = 0 THEN o.order_id ELSE NULL END ) AS unPay,
-        COUNT( CASE WHEN o.hb_order_status = 20 THEN o.order_id ELSE NULL END ) AS payed,
-        COUNT( CASE WHEN o.hb_order_status = 30 THEN o.order_id ELSE NULL END ) AS consignment,
+        COUNT( CASE WHEN o.hb_order_status = 1 THEN o.order_id ELSE NULL END ) AS payed,
+        COUNT( CASE WHEN o.hb_order_status in (1,20,30,40,50,70) THEN o.order_id ELSE NULL END ) AS consignment,
         COUNT( CASE WHEN o.hb_order_status = 40 THEN o.order_id ELSE NULL END ) AS confirm,
         COUNT( CASE WHEN o.hb_order_status = 50 THEN o.order_id ELSE NULL END ) AS success,
         COUNT( CASE WHEN o.hb_order_status = 60 THEN o.order_id ELSE NULL END ) AS `close`

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

@@ -168,7 +168,6 @@ public class UserScoreDetailServiceImpl extends ServiceImpl<UserScoreDetailMappe
                     int remainingPoints = pointsRecord.getPoints().intValue() - variablePoints;
 
                     if (remainingPoints > 0 && isExpiredToday(pointsRecord.getExpiryDate())) {
-
                         PointsRecord expiredRecord = new PointsRecord();
                         // 复制关键属性（根据实际属性补充）
                         expiredRecord.setId(pointsRecord.getId()); // 若ID唯一需注意业务逻辑