Authored by chenchao

fix nullpoint

@@ -64,7 +64,6 @@ public class BuyerOrderCancelService { @@ -64,7 +64,6 @@ public class BuyerOrderCancelService {
64 @Autowired 64 @Autowired
65 private IPaymentService paymentService; 65 private IPaymentService paymentService;
66 66
67 -  
68 @Autowired 67 @Autowired
69 private SellerOrderMapper sellerOrderMapper; 68 private SellerOrderMapper sellerOrderMapper;
70 69
@@ -212,7 +211,7 @@ public class BuyerOrderCancelService { @@ -212,7 +211,7 @@ public class BuyerOrderCancelService {
212 int sellerUid = sellerOrder.getUid(); 211 int sellerUid = sellerOrder.getUid();
213 long sellerOrderCode = sellerOrder.getOrderCode(); 212 long sellerOrderCode = sellerOrder.getOrderCode();
214 BigDecimal earnestMoney = sellerOrder.getEarnestMoney(); 213 BigDecimal earnestMoney = sellerOrder.getEarnestMoney();
215 - PaymentRequest refundReqOfSeller = PaymentRequest.builder().uid(sellerUid) 214 + PaymentRequest refundReqOfSeller = PaymentRequest.builder().uid(sellerUid).refundCase(RefundCase.SELLER_EARNEST_MONEY)
216 .orderCode(sellerOrderCode).refundAmount(earnestMoney.doubleValue()) 215 .orderCode(sellerOrderCode).refundAmount(earnestMoney.doubleValue())
217 .build(); 216 .build();
218 boolean sellerIsSurper = sellerService.isSuperEntrySeller(sellerUid); 217 boolean sellerIsSurper = sellerService.isSuperEntrySeller(sellerUid);
@@ -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) {