修改同步日志

bms-back/bms-system/src/main/java/com/bms/price/search/EsBizLogSupport.java

@@ -94,11 +94,27 @@ public final class EsBizLogSupport
         return text;
     }
 
+    /**
+     * Billing ES bizId: prefer transferNo, then orderNo.
+     */
     public static String billBizId(TmsPriceBillRequest request)
     {
-        if (request != null && StringUtils.isNotEmpty(request.getOrderNo()))
+        if (request == null)
         {
-            return request.getOrderNo().trim();
+            return "FAIL-" + UUID.randomUUID();
+        }
+        return billBizId(request.getTransferNo(), request.getOrderNo());
+    }
+
+    public static String billBizId(String transferNo, String orderNo)
+    {
+        if (StringUtils.isNotEmpty(transferNo))
+        {
+            return transferNo.trim();
+        }
+        if (StringUtils.isNotEmpty(orderNo))
+        {
+            return orderNo.trim();
         }
         return "FAIL-" + UUID.randomUUID();
     }
@@ -213,12 +229,7 @@ public final class EsBizLogSupport
             {
                 return billFailBizId((TmsPriceBillRequest) boundTarget);
             }
-            String orderNo = extractJsonField(rawBody, "orderNo");
+            return billBizId(extractJsonField(rawBody, "transferNo"), extractJsonField(rawBody, "orderNo"));
-            if (StringUtils.isNotEmpty(orderNo))
-            {
-                return orderNo.trim();
-            }
-            return "FAIL-" + UUID.randomUUID();
         }
         if (EsLogType.QUOTE.equals(logType))
         {

bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcOrderBillServiceImpl.java

@@ -159,6 +159,7 @@ public class PrcOrderBillServiceImpl implements IPrcOrderBillService
             {
                 throw new ServiceException(MessageUtils.message("price.bill.notFound"));
             }
+            failReq.setTransferNo(bill.getTransferNo());
             assertOrderBillEditable(bill);
 
             List<PrcIncomeBillFee> fees = incomeBillFeeMapper.selectByBillId(bill.getBillId());
@@ -215,12 +216,15 @@ public class PrcOrderBillServiceImpl implements IPrcOrderBillService
             JSONObject req = new JSONObject();
             req.put("action", "REFUND");
             req.put("orderNo", orderNo);
+            req.put("transferNo", bill.getTransferNo());
             req.put("billId", bill.getBillId());
             req.put("refundAmount", feeSum.negate());
             req.put("feeId", refundFee.getFeeId());
             if (billSearchStore != null)
             {
-                billSearchStore.save(EsLogType.BILL, orderNo, req.toJSONString(), toResponseJson(result));
+                billSearchStore.save(EsLogType.BILL,
+                    EsBizLogSupport.billBizId(bill.getTransferNo(), orderNo),
+                    req.toJSONString(), toResponseJson(result));
             }
             return result;
         }
@@ -906,7 +910,7 @@ public class PrcOrderBillServiceImpl implements IPrcOrderBillService
         String requestJson = toRequestJson(request);
         persistBillExt(bill, request.getUpstreamRow());
         result.setRequestJson(requestJson);
-        billSearchStore.save(EsLogType.BILL, orderNo, requestJson, toResponseJson(result));
+        billSearchStore.save(EsLogType.BILL, EsBizLogSupport.billBizId(request), requestJson, toResponseJson(result));
     }
 
     /**
@@ -1355,7 +1359,7 @@ public class PrcOrderBillServiceImpl implements IPrcOrderBillService
             return null;
         }
         obj.remove("apiCode");
-        obj.remove("upstreamRow");
+        // Keep upstreamRow (Oracle/TAB_ORDER payload) in ES request for ops troubleshooting.
         return obj.toJSONString();
     }