Authored by chenchao

fix nullpoint

... ... @@ -64,7 +64,6 @@ public class BuyerOrderCancelService {
@Autowired
private IPaymentService paymentService;
@Autowired
private SellerOrderMapper sellerOrderMapper;
... ... @@ -212,7 +211,7 @@ public class BuyerOrderCancelService {
int sellerUid = sellerOrder.getUid();
long sellerOrderCode = sellerOrder.getOrderCode();
BigDecimal earnestMoney = sellerOrder.getEarnestMoney();
PaymentRequest refundReqOfSeller = PaymentRequest.builder().uid(sellerUid)
PaymentRequest refundReqOfSeller = PaymentRequest.builder().uid(sellerUid).refundCase(RefundCase.SELLER_EARNEST_MONEY)
.orderCode(sellerOrderCode).refundAmount(earnestMoney.doubleValue())
.build();
boolean sellerIsSurper = sellerService.isSuperEntrySeller(sellerUid);
... ...
... ... @@ -284,12 +284,13 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I
private Long getOrderCode(SkupStatus skupStatus, SellerOrder order){
Long orderCode;
Long orderCode = order.getOrderCode();
/*
if (noNeedShowOrderCode.contains(skupStatus)){
orderCode = null;
}else{
orderCode = order.getOrderCode();
}
}*/
return orderCode;
}
... ... @@ -382,8 +383,8 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I
@Override
protected void resetDynamicProporties(OrderDetailInfo orderDetailInfo) {
long orderCode = orderDetailInfo.getOrderCode();
CodeMeta codeMeta = orderCodeGenerator.expId(orderCode);
Long orderCode = orderDetailInfo.getOrderCode();
CodeMeta codeMeta = orderCode==null ? null : orderCodeGenerator.expId(orderCode);
//TabType tabType = TabType.SELL;
Integer orderStatus = orderDetailInfo.getStatusDetail().getStatus();
if (codeMeta!=null) {
... ...