修复订场现付/预付bug

src/main/java/com/ctrip/fun/golf/service/order/AbstractOrderService.java

@@ -1287,10 +1287,17 @@ public abstract class AbstractOrderService<H extends AbstractOrderBean<T>, T> ex
                 response.setBody(jSONObject);
             }
         }else {
+        	//如果订单走现付O 存 ProcessStatus = 4  OrderUserStatus = 1
+            if(order.getPayMode().equalsIgnoreCase("O")){
+             order.setProcessStatus(order.getProcessStatus() | OrderStatusBitEnum.DEDUCTING.getValue());
+             order.setOrderUserStatus(1);
+             order.setPayDate(null);
+            }else{
+             order.setProcessStatus(order.getProcessStatus() | OrderStatusBitEnum.DEDUCTED.getValue());
+             order.setOrderUserStatus(4);
+            }
             order.setOrderType(1);
-            order.setProcessStatus(order.getProcessStatus() | OrderStatusBitEnum.DEDUCTED.getValue());
             order.setOrderStatus("A");
-            order.setOrderUserStatus(4);
             order.setPayDate(new Date());
             getOrderDao().update(order);
             if ((order.getProcessStatus() & (OrderStatusBitEnum.CONFIRM_CUSTOMER.getValue() + OrderStatusBitEnum.CONFIRM_PRODUCT.getValue())) == (OrderStatusBitEnum.CONFIRM_CUSTOMER