重新增加退款相关文字描述

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

@@ -958,7 +958,7 @@ public class OrderAdapter {
             responseVo.setOrderStatusDesc(orderViewStatusDto.getOrderStatusDesc());
             responseVo.setOrderStatusDescText(orderViewStatusDto.getOrderStatusDescText());
             if (CollectionUtils.isNotEmpty(ordersBean.getRefundList())) {
-                responseVo.setRefundTips(orderViewStatusDto.getOrderStatusDescText());
+                responseVo.setRefundTips(orderViewStatusDto.getRefundStatusText());
             }
             responseVo.setTakeMealFlows(getTakeMealFlows(ordersBean));
             responseVo.setRiderName(orderViewStatusDto.getRiderName());
@@ -1296,13 +1296,15 @@ public class OrderAdapter {
                     orderViewStatusDto.setButtonRefund(checkRefundButton(orderBean,wxAppId));
                     orderViewStatusDto.setButtonMealCode(true);
                 }
-
+                //申请退款
                 if (refundBean != null && RefundStatus.APPLY_REFUND.getCode().equals(refundBean.getStatus())) {
                     setApplyRefundDesc(orderViewStatusDto, orderBean);
                 }
+                //同意退款
                 if (refundBean != null && RefundStatus.AGREE_REFUND.getCode().equals(refundBean.getStatus())) {
                     setAgreeRefundDesc(orderViewStatusDto, orderBean);
                 }
+                //已退货
                 if (refundBean != null && RefundStatus.ALREADY_REFUND.getCode().equals(refundBean.getStatus())) {
                     setAgreeRefundDesc(orderViewStatusDto, orderBean);
                 }
@@ -1482,25 +1484,29 @@ public class OrderAdapter {
         if (refundBean != null && RefundStatus.AGREE_REFUND.getCode().equals(refundBean.getStatus())) {
             orderViewStatusDto.setOrderStatus(OrderStatus.CALCEL.getCode());
             orderViewStatusDto.setOrderStatusDesc("已退款");
-            orderViewStatusDto.setOrderStatusDescText("订单金额已原路退还，请及时查看~");
+            orderViewStatusDto.setOrderStatusDescText("感谢您对我们的信任，期待再次光临~");
+            orderViewStatusDto.setRefundStatusText("订单金额已原路退还，请及时查看~");
             orderViewStatusDto.setButtonContactPartner(true);
         }
         if (refundBean != null && RefundStatus.ALREADY_REFUND.getCode().equals(refundBean.getStatus())) {
             orderViewStatusDto.setOrderStatus(OrderStatus.CALCEL.getCode());
             orderViewStatusDto.setOrderStatusDesc("退款中");
-            orderViewStatusDto.setOrderStatusDescText("正在退款中，请稍等~");
+            orderViewStatusDto.setOrderStatusDescText("感谢您对我们的信任，期待再次光临~");
+            orderViewStatusDto.setRefundStatusText("正在退款中，请稍等");
             orderViewStatusDto.setButtonContactPartner(true);
         }
         if (OrderStatus.REFUSE.getCode().equals(orderBean.getStatus())) {
             orderViewStatusDto.setOrderStatus(OrderStatus.REFUSE.getCode());
             orderViewStatusDto.setOrderStatusDesc("已退款");
-            orderViewStatusDto.setOrderStatusDescText("订单金额已原路退还，请及时查看~");
+            orderViewStatusDto.setOrderStatusDescText("感谢您对我们的信任，期待再次光临~");
+            orderViewStatusDto.setRefundStatusText("订单金额已原路退还，请及时查看~");
             orderViewStatusDto.setButtonContactPartner(true);
         }
         if (PayStatus.HAVE_REFUND.getCode().equals(orderBean.getPayStatus())) {
             orderViewStatusDto.setOrderStatus(OrderStatus.REFUSE.getCode());
             orderViewStatusDto.setOrderStatusDesc("已退款");
-            orderViewStatusDto.setOrderStatusDescText("订单金额已原路退还，请及时查看~");
+            orderViewStatusDto.setOrderStatusDescText("感谢您对我们的信任，期待再次光临~");
+            orderViewStatusDto.setRefundStatusText("订单金额已原路退还，请及时查看~");
             orderViewStatusDto.setButtonContactPartner(true);
         }
 
@@ -1912,18 +1918,20 @@ public class OrderAdapter {
         productBean1.setSonProducts(new ArrayList<>());
         return productBean1;
     }
-
+    //申请
     public void setApplyRefundDesc(OrderViewStatusDto orderViewStatusDto, QueryOrdersResponse.DataBean.OrderBean orderBean) {
         orderViewStatusDto.setOrderStatus(orderBean.getStatus());
         orderViewStatusDto.setOrderStatusDesc("退款中");
-        orderViewStatusDto.setOrderStatusDescText("正在退款中，请稍等");
+        orderViewStatusDto.setOrderStatusDescText("感谢您对我们的信任，期待再次光临~");
+        orderViewStatusDto.setRefundStatusText("若48小时后商家未处理，则自动同意退款");
         orderViewStatusDto.setButtonContactPartner(true);
     }
-
+    //同意
     public void setAgreeRefundDesc(OrderViewStatusDto orderViewStatusDto, QueryOrdersResponse.DataBean.OrderBean orderBean) {
         orderViewStatusDto.setOrderStatus(orderBean.getStatus());
         orderViewStatusDto.setOrderStatusDesc("退款中");
-        orderViewStatusDto.setOrderStatusDescText("正在退款中，请稍等");
+        orderViewStatusDto.setOrderStatusDescText("感谢您对我们的信任，期待再次光临~");
+        orderViewStatusDto.setRefundStatusText("若48小时后商家未处理，则自动拒绝退款");
         orderViewStatusDto.setButtonContactPartner(true);
     }
 

order-application-service/src/main/java/cn/freemud/entities/dto/OrderViewStatusDto.java

@@ -61,6 +61,8 @@ public class OrderViewStatusDto {
      * 取餐码按钮
      */
     private Boolean buttonMealCode;
-
-
+    /**
+     *  售后单文案描述
+     */
+    private String refundStatusText;
 }