更改小程序赛事微信付款回调逻辑

src/main/java/com/ctrip/fun/golf/dao/order/OrderDao.java

@@ -1001,6 +1001,15 @@ public class OrderDao extends GenericHibernateDao<Order, Integer> {
         List<Order> list = query.list(); // 获得数据
         return CollectionUtils.isEmpty(list) ? null : list.get(0);
     }
+    
+    @SuppressWarnings({ "unchecked", "deprecation" })
+    public Order getAndLockOrderByOrderNo(Long orderNo) {
+    	String hsql = "from Order t where t.orderNo=" + orderNo;
+        Query query = getSession().createQuery(hsql);
+        query.setLockMode("t", LockMode.UPGRADE); // 加锁
+        List<Order> list = query.list(); // 获得数据
+        return CollectionUtils.isEmpty(list) ? null : list.get(0);
+    }
 
     public PagedResponseBean<TourOrderListBean> queryTourOrderList(OpOrderQuery tourOrderQuery) {
         StringBuilder sb = new StringBuilder(300);

src/main/java/com/ctrip/fun/golf/service/payment/AbstractNotifyService.java

@@ -128,8 +128,8 @@ public abstract class AbstractNotifyService extends CorePaymentService {
     public String notifyForWeiXinPay(String xml) throws Exception{
     	  Map<String,Object> notifyMap = WXUtil.doXMLParse(xml); 
      	  if(notifyMap.get("return_code").equals("SUCCESS")){  
-        	  String orderId = notifyMap.get("out_trade_no").toString();//商户订单号
-              Order order = this.orderDao.getAndLockOrderByOutTradeId(orderId);
+        	  String orderNo = notifyMap.get("out_trade_no").toString();//商户订单号
+              Order order = this.orderDao.getAndLockOrderByOrderNo(Long.parseLong(orderNo));
               if(notifyMap.get("result_code").equals("SUCCESS")){
             	  // 4、设置订单的状态：除去扣款失败，增加已扣款状态
                   order.setProcessStatus(order.getProcessStatus()