"解决冲突"

src/main/java/com/ctrip/fun/golf/dao/basic/VoucherDao.java

@@ -922,7 +922,7 @@ public class VoucherDao extends GenericHibernateDao<Voucher, Integer> {
     }
 	
 	public List<VoucherItemDTO> queryListByIdsForMiniApps(String ids) {
-        StringBuilder sb = new StringBuilder("select SQL_CALC_FOUND_ROWS v.Id AS id,v.Type AS type,v.Amount AS amount,v.OrderNo as orderNo,v.StartUseDate AS startUseDate,v.EndUseDate AS endUseDate,v.Used AS used,v.UseDate AS useDate,rule.remark AS remark,rule.description AS description,v.UID AS uid,v.Source AS source,v.ruleId AS ruleId,v.shared,v.isShare,v.userLimit  from bsc_voucher v LEFT JOIN bsc_voucher_rule rule on (v.ruleId=rule.id) where 1=1 ");
+		StringBuilder sb = new StringBuilder("select SQL_CALC_FOUND_ROWS v.Id AS id,v.Type AS type,v.Amount AS amount,v.StartUseDate AS startUseDate,v.EndUseDate AS endUseDate,v.Used AS used,v.UseDate AS useDate,rule.remark AS remark,rule.description AS description,v.UID AS uid,v.Source AS source,v.ruleId AS ruleId,v.shared,v.isShare,v.userLimit,v.OrderNo as orderNo  from bsc_voucher v LEFT JOIN bsc_voucher_rule rule on (v.ruleId=rule.id) where 1=1 ");
         sb.append(" and v.id in(").append(ids).append(")");
         Session session = this.getSession();
         Query query = session.createSQLQuery(sb.toString());

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

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