Merge remote-tracking branch 'remotes/origin/feature/1.9.22_C端订单状态描述' into qa

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -968,6 +968,9 @@ public class OrderAdapter {
             responseVo.setOrderStatusFlows(orderChangeTime);
             responseVo.setOrderStatusDesc(orderViewStatusDto.getOrderStatusDesc());
             responseVo.setOrderStatusDescText(orderViewStatusDto.getOrderStatusDescText());
+            if (CollectionUtils.isNotEmpty(ordersBean.getRefundList())) {
+                responseVo.setRefundTips(orderViewStatusDto.getOrderStatusDescText());
+            }
             responseVo.setTakeMealFlows(getTakeMealFlows(ordersBean));
             responseVo.setRiderName(orderViewStatusDto.getRiderName());
             responseVo.setRiderText(orderViewStatusDto.getRiderText());
@@ -1498,7 +1501,7 @@ public class OrderAdapter {
         if (refundBean != null && RefundStatus.ALREADY_REFUND.getCode().equals(refundBean.getStatus())) {
             orderViewStatusDto.setOrderStatus(OrderStatus.CALCEL.getCode());
             orderViewStatusDto.setOrderStatusDesc("退款中");
-            orderViewStatusDto.setOrderStatusDescText("若48小时后商家未处理，则自动【同意】/【拒绝】退款~");
+            orderViewStatusDto.setOrderStatusDescText("正在退款中，请稍等~");
             orderViewStatusDto.setButtonContactPartner(true);
         }
         if (OrderStatus.REFUSE.getCode().equals(orderBean.getStatus())) {

order-application-service/src/main/java/cn/freemud/entities/vo/QueryOrderResponseVo.java

@@ -194,6 +194,10 @@ public class QueryOrderResponseVo {
     private String refundReason;
 
     /**
+     * 退款文案提示  若48小时后商家未处理，自动同意/拒绝退款
+     */
+    private String refundTips;
+    /**
      * 退款单
      */
     private String rid;