|  | @@ -1862,17 +1862,17 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
 | 
											
												
													
														|  |              storeOrder.setPayTime(new Date());
 |  |              storeOrder.setPayTime(new Date());
 | 
											
												
													
														|  |              fsStoreOrderMapper.updateFsStoreOrder(storeOrder);
 |  |              fsStoreOrderMapper.updateFsStoreOrder(storeOrder);
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  | -            //非处方直接提交OMS
 |  | 
 | 
											
												
													
														|  | -            if(order.getIsPrescribe().equals(0)){
 |  | 
 | 
											
												
													
														|  | -                createOmsOrder(order.getId());
 |  | 
 | 
											
												
													
														|  | -            }
 |  | 
 | 
											
												
													
														|  | -            else if(order.getIsPrescribe().equals(1)){
 |  | 
 | 
											
												
													
														|  | -                //是否已开方
 |  | 
 | 
											
												
													
														|  | -                FsPrescribe prescribe=prescribeService.selectFsPrescribeByOrderId(order.getId());
 |  | 
 | 
											
												
													
														|  | -                if(prescribe!=null&&prescribe.getStatus()==1){
 |  | 
 | 
											
												
													
														|  | -                    createOmsOrder(order.getId());
 |  | 
 | 
											
												
													
														|  | -                }
 |  | 
 | 
											
												
													
														|  | -            }
 |  | 
 | 
											
												
													
														|  | 
 |  | +//            //非处方直接提交OMS
 | 
											
												
													
														|  | 
 |  | +//            if(order.getIsPrescribe().equals(0)){
 | 
											
												
													
														|  | 
 |  | +//                createOmsOrder(order.getId());
 | 
											
												
													
														|  | 
 |  | +//            }
 | 
											
												
													
														|  | 
 |  | +//            else if(order.getIsPrescribe().equals(1)){
 | 
											
												
													
														|  | 
 |  | +//                //是否已开方
 | 
											
												
													
														|  | 
 |  | +//                FsPrescribe prescribe=prescribeService.selectFsPrescribeByOrderId(order.getId());
 | 
											
												
													
														|  | 
 |  | +//                if(prescribe!=null&&prescribe.getStatus()==1){
 | 
											
												
													
														|  | 
 |  | +//                    createOmsOrder(order.getId());
 | 
											
												
													
														|  | 
 |  | +//                }
 | 
											
												
													
														|  | 
 |  | +//            }
 | 
											
												
													
														|  |          }
 |  |          }
 | 
											
												
													
														|  |          catch (Exception e){
 |  |          catch (Exception e){
 | 
											
												
													
														|  |              logger.error("payConfirm: {} ",e.getMessage(),e);
 |  |              logger.error("payConfirm: {} ",e.getMessage(),e);
 |