Merge branch 'master' of http://git.lionquexpress.com/wuweihua/BMS
This commit is contained in:
+9
-2
@@ -1014,11 +1014,18 @@ public class PrcOrderBillServiceImpl implements IPrcOrderBillService
|
|||||||
private void saveCreditEsLog(PrcOrderBill bill, CreditUsageCommand cmd, String action, boolean success,
|
private void saveCreditEsLog(PrcOrderBill bill, CreditUsageCommand cmd, String action, boolean success,
|
||||||
String errorMessage)
|
String errorMessage)
|
||||||
{
|
{
|
||||||
if (billSearchStore == null || bill == null || StringUtils.isEmpty(bill.getOrderNo()))
|
if (billSearchStore == null || bill == null)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
if (StringUtils.isEmpty(bill.getTransferNo()) && StringUtils.isEmpty(bill.getOrderNo()))
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// bizId: prefer transferNo, fallback orderNo (same as BILL)
|
||||||
|
String bizId = EsBizLogSupport.billBizId(bill.getTransferNo(), bill.getOrderNo());
|
||||||
JSONObject req = new JSONObject();
|
JSONObject req = new JSONObject();
|
||||||
|
req.put("transferNo", bill.getTransferNo());
|
||||||
req.put("orderNo", bill.getOrderNo());
|
req.put("orderNo", bill.getOrderNo());
|
||||||
req.put("billId", bill.getBillId());
|
req.put("billId", bill.getBillId());
|
||||||
req.put("customerId", bill.getCustomerId());
|
req.put("customerId", bill.getCustomerId());
|
||||||
@@ -1048,7 +1055,7 @@ public class PrcOrderBillServiceImpl implements IPrcOrderBillService
|
|||||||
}
|
}
|
||||||
String status = success ? EsBizLogSupport.STATUS_SUCCESS : EsBizLogSupport.STATUS_FAIL;
|
String status = success ? EsBizLogSupport.STATUS_SUCCESS : EsBizLogSupport.STATUS_FAIL;
|
||||||
String err = success ? null : EsBizLogSupport.cut(errorMessage);
|
String err = success ? null : EsBizLogSupport.cut(errorMessage);
|
||||||
billSearchStore.save(EsLogType.CREDIT, bill.getOrderNo(), req.toJSONString(), resp.toJSONString(), status, err);
|
billSearchStore.save(EsLogType.CREDIT, bizId, req.toJSONString(), resp.toJSONString(), status, err);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user