Merge branch 'release' into test

# Conflicts:
#	order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java

@@ -1925,7 +1925,9 @@ public class OrderInfoServiceImpl implements OrderInfoService {
                 OrderItemInfo item = new OrderItemInfo();
                 item.setId(itemInfo.getId());
                 item.setZnfm(ConfigureConstant.STRING_0);
-                item.setZxbm(StringUtils.isNotBlank(itemInfo.getZxbm())?itemInfo.getZxbm():baseService.getGenerateShotKey());
+                if (StringUtils.isBlank(itemInfo.getZxbm())) {
+                    item.setZxbm(itemInfo.getZxbm());
+                }
                 items.add(item);
                 continue;
             }
@@ -1956,7 +1958,7 @@ public class OrderInfoServiceImpl implements OrderInfoService {
                     item.setId(itemInfo.getId());
                     item.setZnfm(ConfigureConstant.STRING_0);
                     if (StringUtils.isBlank(itemInfo.getZxbm())) {
-                        item.setZxbm(commodityCodeEntity.getZxbm());
+                        item.setZxbm(itemInfo.getZxbm());
                     }
                     items.add(item);
                 }
@@ -2127,6 +2129,7 @@ public class OrderInfoServiceImpl implements OrderInfoService {
         orderProcessInfoNew.setKpse(se.toString());
         orderMapper.updateOrderInfoByOrderId(orderInfoNew,Arrays.asList(orderInfo.getNsrsbh()));
         orderProcessInfoMapper.updateOrderProcessInfoByProcessId(orderProcessInfoNew,Arrays.asList(orderInfo.getNsrsbh()));
+
         return R.ok();
     }