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

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -3400,7 +3400,7 @@ public class OrderServiceImpl implements Orderservice {
         do {
             try {
                 request = orderCenterSdkService.orderCancel(cancelOrderRequest);
-                if (ResponseCodeConstant.RESPONSE_SUCCESS.equals(request.getErrcode())) {
+                if (request!=request) {
                     break;
                 }
             } catch (Exception e) {}
@@ -3409,9 +3409,9 @@ public class OrderServiceImpl implements Orderservice {
 
         backOrdersStatusChange(orderBean.getOid(), orderBean.getStatus());
         if(ResponseCodeConstant.RESPONSE_SUCCESS.equals(request.getErrcode())) {
-            return this.newSendPayFaileMessage();
-        } else {
             return this.newSendPaySuccessNoticeMessage();
+        } else {
+            return this.newSendPayFaileMessage();
         }
     }