Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z

src/main/java/com/glxp/api/task/AsyncIoCollectOrderFinishTask.java

@@ -90,7 +90,12 @@ public class AsyncIoCollectOrderFinishTask implements SchedulingConfigurer {
                         AuthAdmin authAdmin = new AuthAdmin();
                         authAdmin.setId(1l);
                         collectOrderRequest.setUpdateUser(1l);
-                        collectOrderService.finishOrder(collectOrderRequest, authAdmin, true);
+                        try {
+                            collectOrderService.finishOrder(collectOrderRequest, authAdmin, true);
+                        }catch (Exception e){
+                            log.error("自动完成第三方处方单异常",e);
+                        }
+
                     }
                 }
             }