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

app/src/main/java/com/sheep/gamegroup/view/activity/ActPay.java

@@ -233,9 +233,13 @@ public class ActPay extends BaseActivity{
     }
     public static final int RESULT_CODE = 666;
     public static final String EXTRA_NAME_STATUS = "status";
+    public static final String EXTRA_NAME_ORDERNO = "orderno";
     //返回结果给sdk
     private void setStatusResult(){
-        setResult(RESULT_CODE, new Intent().putExtra(EXTRA_NAME_STATUS, status));
+        Intent intent = new Intent();
+        intent.putExtra(EXTRA_NAME_ORDERNO, payOrder.getOrderNo());
+        intent.putExtra(EXTRA_NAME_STATUS, status);
+        setResult(RESULT_CODE, intent);
     }
     //展示支付失败界面
     private void showPayFailed() {