Merge branch 'dev/2024/0822/update-app-Y' of Harper/feifan-backend-zx-app into master

订单查看如果有售后订单就返回售后状态

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/mysql/ptprofitlog/PtProfitLogMapper.java

@@ -53,7 +53,7 @@ public interface PtProfitLogMapper extends BaseMapperX<PtProfitLogDO> {
                     WITHDRAWAL_ERROR.getType(),
                     COMMISSION_TRANSITION.getType()
             );
-//            queryWrapper.ne(PtProfitLogDO::getAmount,0);
+            queryWrapper.ne(PtProfitLogDO::getAmount,0);
         } else {
             //冻结
             profitStatus = Arrays.asList(

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/consumptiontransferlog/ConsumptionTransferLogServiceImpl.java

@@ -77,6 +77,8 @@ public class ConsumptionTransferLogServiceImpl implements ConsumptionTransferLog
         IntegralDO transferIntegral = integralService.selectByUser(createReqVO.getTransferUserId());
         transferIntegral.setConsumptionPoints(transferIntegral.getConsumptionPoints() - createReqVO.getConsumptionPoints());
         integralService.updateIntegral(BeanUtils.toBean(transferIntegral, IntegralSaveReqVO.class));
+        // 接收人钱包
+        IntegralDO recipientIntegral = integralService.selectByUser(createReqVO.getRecipientUserId());
 
         // 记录变动日志
         consumptionChangeLogService.createConsumptionChangeLog(
@@ -85,12 +87,10 @@ public class ConsumptionTransferLogServiceImpl implements ConsumptionTransferLog
                         .consumptionPoints(-createReqVO.getConsumptionPoints())
                         .afterConsumptionPoints(transferIntegral.getConsumptionPoints())
                         .consumptionStatus(ConsumptionEnum.CONSUMPTION_TRANSFER.getType())
-                        .generateUserId(transferIntegral.getUserId())
+                        .generateUserId(recipientIntegral.getUserId())
                         .build()
         );
 
-        // 接收人钱包
-        IntegralDO recipientIntegral = integralService.selectByUser(createReqVO.getRecipientUserId());
         recipientIntegral.setConsumptionPoints(recipientIntegral.getConsumptionPoints() + createReqVO.getConsumptionPoints());
         integralService.updateIntegral(BeanUtils.toBean(recipientIntegral, IntegralSaveReqVO.class));
 

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/app/order/AppTradeOrderController.java

@@ -190,6 +190,9 @@ public class AppTradeOrderController {
         // 最终组合
         CommonResult<AppTradeOrderDetailRespVO> rs=
                 success(TradeOrderConvert.INSTANCE.convert02(order, orderItems, tradeOrderProperties, express));
+        for (AppTradeOrderItemRespVO item : rs.getData().getItems()) {
+            if(item.getAfterSaleId() != null) item.setRefundStatus(afterSaleService.getAfterSale(item.getAfterSaleId()).getStatus());
+        }
 
         //设置订单支付的积分
         rs.getData().setPayIntegral(order.getPayIntegral());

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/app/order/vo/item/AppTradeOrderItemRespVO.java

@@ -68,4 +68,7 @@ public class AppTradeOrderItemRespVO {
     @Schema(description = "商品支付类别", example = "1")
     private Integer spuPayType;
 
+    @Schema(description = "退款状态")
+    private Integer refundStatus;
+
 }