|
@@ -284,12 +284,13 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I |
|
@@ -284,12 +284,13 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I |
284
|
|
284
|
|
285
|
|
285
|
|
286
|
private Long getOrderCode(SkupStatus skupStatus, SellerOrder order){
|
286
|
private Long getOrderCode(SkupStatus skupStatus, SellerOrder order){
|
287
|
- Long orderCode;
|
287
|
+ Long orderCode = order.getOrderCode();
|
|
|
288
|
+ /*
|
288
|
if (noNeedShowOrderCode.contains(skupStatus)){
|
289
|
if (noNeedShowOrderCode.contains(skupStatus)){
|
289
|
orderCode = null;
|
290
|
orderCode = null;
|
290
|
}else{
|
291
|
}else{
|
291
|
orderCode = order.getOrderCode();
|
292
|
orderCode = order.getOrderCode();
|
292
|
- }
|
293
|
+ }*/
|
293
|
return orderCode;
|
294
|
return orderCode;
|
294
|
}
|
295
|
}
|
295
|
|
296
|
|
|
@@ -382,8 +383,8 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I |
|
@@ -382,8 +383,8 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I |
382
|
|
383
|
|
383
|
@Override
|
384
|
@Override
|
384
|
protected void resetDynamicProporties(OrderDetailInfo orderDetailInfo) {
|
385
|
protected void resetDynamicProporties(OrderDetailInfo orderDetailInfo) {
|
385
|
- long orderCode = orderDetailInfo.getOrderCode();
|
|
|
386
|
- CodeMeta codeMeta = orderCodeGenerator.expId(orderCode);
|
386
|
+ Long orderCode = orderDetailInfo.getOrderCode();
|
|
|
387
|
+ CodeMeta codeMeta = orderCode==null ? null : orderCodeGenerator.expId(orderCode);
|
387
|
//TabType tabType = TabType.SELL;
|
388
|
//TabType tabType = TabType.SELL;
|
388
|
Integer orderStatus = orderDetailInfo.getStatusDetail().getStatus();
|
389
|
Integer orderStatus = orderDetailInfo.getStatusDetail().getStatus();
|
389
|
if (codeMeta!=null) {
|
390
|
if (codeMeta!=null) {
|