Merge branch 'release' into test

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

@@ -2062,6 +2062,7 @@ public class OrderInfoServiceImpl implements OrderInfoService {
                 deleteItem.addAll(value.stream().map(t->t.getId()).collect(Collectors.toList()));
             }else{
                 log.info("订单id：{}合并明细超过0.06暂时不合并",orderInfoId);
+                return R.error("明细行号{}合并错误，合并明细超过0.06暂时不合并",orderItemInfo.getSphxh());
             }
         }
 //        OrderInfo orderInfo = new OrderInfo();
@@ -2076,6 +2077,7 @@ public class OrderInfoServiceImpl implements OrderInfoService {
 //        orderProcessInfo.setHjbhsje();
 //        orderProcessInfo.setKpse();
 //        orderProcessService.updateOrderProcessInfoByProcessId(orderProcessInfo,null);
+        log.debug("合并明细{}",JSONObject.toJSONString(orderItemInfoList));
         if(!orderItemInfoList.isEmpty()){
             orderItemInfoMapper.deleteItemByItemId(deleteItem);
             orderItemInfoMapper.insertOrderItemByList(orderItemInfoList);