去掉退费校验
This commit is contained in:
-10
@@ -767,7 +767,6 @@ public class PrcOrderBillServiceImpl implements IPrcOrderBillService
|
|||||||
{
|
{
|
||||||
throw new ServiceException(MessageUtils.message("price.bill.bizDateRequired"));
|
throw new ServiceException(MessageUtils.message("price.bill.bizDateRequired"));
|
||||||
}
|
}
|
||||||
assertOrderBillNotRefunded(bill);
|
|
||||||
TmsPriceBillRequest req = buildBillRequestFromBill(bill);
|
TmsPriceBillRequest req = buildBillRequestFromBill(bill);
|
||||||
return billLocalWithDbRetry(billId.trim(), req);
|
return billLocalWithDbRetry(billId.trim(), req);
|
||||||
}
|
}
|
||||||
@@ -1653,7 +1652,6 @@ public class PrcOrderBillServiceImpl implements IPrcOrderBillService
|
|||||||
String billKey = Md5Utils.hash(orderNo);
|
String billKey = Md5Utils.hash(orderNo);
|
||||||
PrcOrderBill existed = orderBillMapper.selectPrcOrderBillByOrderNo(orderNo);
|
PrcOrderBill existed = orderBillMapper.selectPrcOrderBillByOrderNo(orderNo);
|
||||||
assertOrderBillEditable(existed);
|
assertOrderBillEditable(existed);
|
||||||
assertOrderBillNotRefunded(existed);
|
|
||||||
BigDecimal previousIncome = existed == null ? BigDecimal.ZERO : nz(existed.getIncomeTotal());
|
BigDecimal previousIncome = existed == null ? BigDecimal.ZERO : nz(existed.getIncomeTotal());
|
||||||
PrcOrderBill bill = existed == null ? new PrcOrderBill() : existed;
|
PrcOrderBill bill = existed == null ? new PrcOrderBill() : existed;
|
||||||
if (existed == null)
|
if (existed == null)
|
||||||
@@ -2110,14 +2108,6 @@ public class PrcOrderBillServiceImpl implements IPrcOrderBillService
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Block rebill when refundStatus=REFUNDED (order_status=9 alone is logistics return, not fee refund). */
|
|
||||||
private void assertOrderBillNotRefunded(PrcOrderBill bill)
|
|
||||||
{
|
|
||||||
if (bill != null && BillRefundStatus.REFUNDED.getCode().equalsIgnoreCase(bill.getRefundStatus()))
|
|
||||||
{
|
|
||||||
throw new ServiceException("\u8ba2\u5355\u5df2\u9000\u8d39\uff0c\u4e0d\u53ef\u91cd\u65b0\u8ba1\u8d39");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static BigDecimal nz(BigDecimal v)
|
private static BigDecimal nz(BigDecimal v)
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user