Merge branch 'release' into test

2 years ago · 8d4f1435a9
parent 99dc6c6e99 7ab10f950c
commit 8d4f1435a9
1 changed files with 1 additions and 1 deletions
--- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java
@ -1972,7 +1972,7 @@ public class OrderInfoServiceImpl implements OrderInfoService {
        String spjc = taxClassCodeEntity.getSpjc();
        String xmmc = itemInfo.getXmmc().replace("*" + spjc + "*", "");
        comm.setXmmc(xmmc);
-        comm.setZxbm(StringUtils.isNotBlank(itemInfo.getZxbm())?itemInfo.getZxbm():comm.getId());
+        comm.setZxbm(StringUtils.isNotBlank(itemInfo.getZxbm())?itemInfo.getZxbm():baseService.getGenerateShotKey());
        comm.setSpsm(taxClassCodeEntity.getSm());
        comm.setSpjm("");
        String sl = itemInfo.getSl().replace("%", "");