Authored by tanling

极速发货

@@ -148,7 +148,8 @@ public class BuyerOrderDetailService extends AbsOrderDetailService implements IO @@ -148,7 +148,8 @@ public class BuyerOrderDetailService extends AbsOrderDetailService implements IO
148 .orElse(null); 148 .orElse(null);
149 } 149 }
150 150
151 - private String formatDetailDesc(BuyerOrder buyerOrder, String temp){ 151 + private String formatDetailDesc(BuyerOrder buyerOrder, String temp, SkupType skupType){
  152 +
152 153
153 String detailDesc = temp; 154 String detailDesc = temp;
154 Integer orderStatus = buyerOrder.getStatus(); 155 Integer orderStatus = buyerOrder.getStatus();
@@ -172,6 +173,11 @@ public class BuyerOrderDetailService extends AbsOrderDetailService implements IO @@ -172,6 +173,11 @@ public class BuyerOrderDetailService extends AbsOrderDetailService implements IO
172 BuyerOrderStatusFlow statusFlow = buyerOrderStatusFlowMapper.selectByStatus(buyerOrder.getOrderCode(), orderStatus); 173 BuyerOrderStatusFlow statusFlow = buyerOrderStatusFlowMapper.selectByStatus(buyerOrder.getOrderCode(), orderStatus);
173 detailDesc = String.format(temp, BuyerOrderStatusFlow.formatRemarkWithPrefixAndSuffix(statusFlow)); 174 detailDesc = String.format(temp, BuyerOrderStatusFlow.formatRemarkWithPrefixAndSuffix(statusFlow));
174 } 175 }
  176 + else if (orderStatus == OrderStatus.SELLER_SEND_OUT.getCode()){
  177 + // 一般默认卖家72小时发货 只有极速默认24小时
  178 + detailDesc = String.format(temp, skupType == SkupType.FAST_DELIVERY ? 24 :72);
  179 + }
  180 +
175 181
176 }catch (Exception ex){ 182 }catch (Exception ex){
177 getLogger().warn("in formatDetailDesc error buyerOrder {} temp {}", buyerOrder, temp, ex); 183 getLogger().warn("in formatDetailDesc error buyerOrder {} temp {}", buyerOrder, temp, ex);
@@ -186,7 +192,7 @@ public class BuyerOrderDetailService extends AbsOrderDetailService implements IO @@ -186,7 +192,7 @@ public class BuyerOrderDetailService extends AbsOrderDetailService implements IO
186 .statuStr(orderStatus.getStatusStr(tabType)) 192 .statuStr(orderStatus.getStatusStr(tabType))
187 .build(); 193 .build();
188 OrderAttributes oa = OrderAttributes.getOrderAttributes(buyerOrder.getAttributes()); 194 OrderAttributes oa = OrderAttributes.getOrderAttributes(buyerOrder.getAttributes());
189 - String detailDesc = formatDetailDesc(buyerOrder, orderStatus.getDetailDesc(tabType, oa)); 195 + String detailDesc = formatDetailDesc(buyerOrder, orderStatus.getDetailDesc(tabType, oa), skupType);
190 statusDetail.setDetailDesc(detailDesc); 196 statusDetail.setDetailDesc(detailDesc);
191 197
192 // 待付款时,剩余时间 198 // 待付款时,剩余时间