Merge branch 'master' of https://git.lionquexpress.com/wuweihua/BMS

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

@@ -1828,7 +1828,8 @@ public class PrcOrderBillServiceImpl implements IPrcOrderBillService
         bill.setBizDate(bizDate);
         bill.setTmsId(request.getTmsId() == null ? null : Long.valueOf(request.getTmsId()));
         bill.setMatchSource(result.getMatchSource());
-        bill.setMatchMessage(result.getMatchMessage());
+        // Do not persist match_message (varchar(200)); fail text stays in error_message.
+        bill.setMatchMessage(null);
         bill.setPriceSetId(result.getPriceSetId());
         bill.setPriceSetCode(result.getPriceSetCode());
         bill.setPriceSetName(result.getPriceSetName());
@@ -3420,6 +3421,6 @@ public class PrcOrderBillServiceImpl implements IPrcOrderBillService
             failText = failText.substring(0, 1000);
         }
         bill.setErrorMessage(failText);
-        bill.setMatchMessage(failText);
+        bill.setMatchMessage(null);
     }
 }