物流文案

@@ -95,9 +95,13 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
     @Autowired
     private QualityCheckMapper qualityCheckMapper;
 
-    //private static String EXPRESS_MQ_SEND = "logistics.logistics_data";
-    //private static String EXPRESS_MQ_SEND = "order.updateChangeRefundOrderExpressInfo";
     private static String EXPRESS_MQ_SEND = "third.logistics.logistics_data";
+
+    //物流文案设置
+    private final String pre_seller="尊敬的卖家您好，你出售的鞋子实收品相如图，";
+    private final String pre_buyer ="尊敬的买家您好，你购买的鞋子实收品相如图，";
+    private final String last_seller_un_accept="，买家不接受。";
+    private final String last_seller_confirm="，等待买家确认。";
     /**
      *
      * @param sellerUid 卖家的uid
@@ -728,12 +732,7 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
                 expressInfoDetail.setAcceptRemark(expressInfo.getAcceptRemark());
                 expressInfoDetail.setCreateTimeStr(DateUtil.formatDate(expressInfo.getCreateTime(), DateUtil.yyyy_MM_dd_HH_mm_SS));
 
-                //文案设置
-                String pre_seller="尊敬的卖家您好，你出售的鞋子实收品相如图，";
-                String last_seller="，买家不接受。";
 
-                String pre_buyer ="尊敬的买家您好，你购买的鞋子实收品相如图，";
-                String last_seller2="，等待买家确认。";
 
                 //确认信息
                 if(expressInfo.getQualityCheck()!=null){
@@ -745,9 +744,18 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
                     if(qualityCheck.getType()!=null&&EnumQualityCheckType.CHECK_NOT_PASS.getCode().intValue()==qualityCheck.getType().intValue()){
                          if(TabType.SELL ==actor){
                             miniFaultConfirm.setPreText(pre_seller);
-                            miniFaultConfirm.setSuppleText(last_seller);
+                            miniFaultConfirm.setSuppleText(last_seller_un_accept);
                         }
 
+                    }else{
+                        //瑕疵待确认
+                        if(TabType.BUY==actor){
+                            miniFaultConfirm.setPreText(pre_buyer);
+                            miniFaultConfirm.setSuppleText(last_seller_un_accept);
+                        }else if(TabType.SELL ==actor){
+                            miniFaultConfirm.setPreText(pre_seller);
+                            miniFaultConfirm.setSuppleText(last_seller_confirm);
+                        }
                     }
 
                     //瑕疵待确认
@@ -763,11 +771,7 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
                             }
 
                             //
-                            miniFaultConfirm.setPreText(pre_buyer);
                             miniFaultConfirm.setSuppleText("");//后续由app添加倒计时
-                        }else if(TabType.SELL ==actor){
-                            miniFaultConfirm.setPreText(pre_seller);
-                            miniFaultConfirm.setSuppleText(last_seller2);
                         }
 
                     }