支付宝修改

component_resource/src/main/res/values/strings.xml

@@ -39,4 +39,24 @@
     <string name="departure">出发地:</string>
     <string name="destination">目的地:</string>
     <string name="event_date">活动日期:</string>
+    <string name="confirm_order">确认订单</string>
+    <string name="contact_information">联系人信息</string>
+    <string name="name">姓名:</string>
+    <string name="name_hint">请输入姓名</string>
+    <string name="phone_number">手机号:</string>
+    <string name="phone_number_hint">请输入手机号码</string>
+    <string name="mailbox">邮箱:</string>
+    <string name="mailbox_hint">用于接收出游通知</string>
+    <string name="tourist_information">出游人信息</string>
+    <string name="insurance_information">保险信息</string>
+    <string name="insurance_information_hint">保险 每天</string>
+    <string name="use_a_coupon">使用优惠券</string>
+    <string name="no_coupons">暂无优惠券</string>
+    <string name="booking_notice">预定须知</string>
+    <string name="internal_inviter">内部邀请人</string>
+    <string name="internal_inviter_hint">请输入邀请人手机号</string>
+    <string name="consent_to_booking">同意预订须知和</string>
+    <string name="contract">《合同协议》</string>
+    <string name="payment_amount">支付金额：</string>
+    <string name="detail">明细</string>
 </resources>

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/ConfirmOrderActivity.java

@@ -1054,10 +1054,13 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
                     // 判断resultStatus 为9000则代表支付成功
                     if (TextUtils.equals(resultStatus, "9000")) {
                         startActivity(OrderListActivity.getIntent(mActivity, 1));
+                        showToast("支付成功！");
+                        RxBus.post(new PaymentSuccessfulEvent());
                         finish();
                     } else if ("6001".equals(resultStatus)) {
                         startActivity(OrderListActivity.getIntent(mActivity, 0));
                         showToast("支付取消！");
+                        RxBus.post(new PaymentFailedEvent());
                         finish();
                     } else {
                         // 该笔订单真实的支付结果，需要依赖服务端的异步通知。

module_tourism/src/main/java/com/rv/tourism/other/TravelerConfirmOrderActivity.java

@@ -161,7 +161,7 @@ public class TravelerConfirmOrderActivity extends BaseStatusActivity<TourismPres
 
     @Override
     protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
-        titleView.setTitle("确认订单");
+        titleView.setTitle(mActivity.getString(R.string.confirm_order));
         api = WXAPIFactory.createWXAPI(this, RvFrameConfig.APP_ID);
         dataBean = (BeanOrderParam) intent.getSerializableExtra("dataBean");
         selectCouponList = new ArrayList<>();
@@ -719,10 +719,13 @@ public class TravelerConfirmOrderActivity extends BaseStatusActivity<TourismPres
                         ARouter.getInstance().build(Constance.ACTIVITY_URL_ORDERLIST)
                                 .withInt("position", 1)
                                 .navigation();
+                        showToast("支付成功！");
+                        RxBus.post(new PaymentSuccessfulEvent());
                         finish();
                     } else if ("6001".equals(resultStatus)) {
                         showToast("支付取消！");
                         ARouter.getInstance().build(Constance.ACTIVITY_URL_ORDERLIST).navigation();
+                        RxBus.post(new PaymentFailedEvent());
                         finish();
                     } else {
                         // 该笔订单真实的支付结果，需要依赖服务端的异步通知。

module_tourism/src/main/res/layout/activity_confirm_order_travel.xml

@@ -156,7 +156,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/size_50"
                     android:gravity="center_vertical"
-                    android:text="联系人信息"
+                    android:text="@string/contact_information"
                     android:textColor="@color/colorMain"
                     android:textSize="@dimen/text_14" />
 
@@ -188,7 +188,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_centerVertical="true"
-                            android:text="姓名:"
+                            android:text="@string/name"
                             android:textColor="@color/colorMain"
                             android:textSize="@dimen/text_14" />
                     </LinearLayout>
@@ -200,7 +200,7 @@
                         android:layout_marginLeft="@dimen/size_60"
                         android:background="@null"
                         android:gravity="center|start"
-                        android:hint="请输入姓名"
+                        android:hint="@string/name_hint"
                         android:inputType="text"
                         android:lines="1"
                         android:textColor="@color/colorMain"
@@ -237,7 +237,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_centerVertical="true"
-                            android:text="手机号"
+                            android:text="@string/phone_number"
                             android:textColor="@color/colorMain"
                             android:textSize="@dimen/text_14" />
                     </LinearLayout>
@@ -249,7 +249,7 @@
                         android:layout_marginLeft="@dimen/size_60"
                         android:background="@null"
                         android:gravity="center|start"
-                        android:hint="请输入手机号码"
+                        android:hint="@string/phone_number_hint"
                         android:inputType="phone"
                         android:lines="1"
                         android:maxLength="11"
@@ -271,7 +271,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_centerVertical="true"
-                        android:text="邮箱"
+                        android:text="@string/mailbox"
                         android:textColor="@color/colorMain"
                         android:textSize="@dimen/text_14" />
 
@@ -282,7 +282,7 @@
                         android:layout_marginLeft="@dimen/size_60"
                         android:background="@null"
                         android:gravity="center|start"
-                        android:hint="用于接收出游通知"
+                        android:hint="@string/mailbox_hint"
                         android:inputType="textEmailAddress"
                         android:lines="1"
                         android:textColor="@color/colorMain"
@@ -310,7 +310,7 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="出游人信息"
+                        android:text="@string/tourist_information"
                         android:textColor="@color/colorMain"
                         android:textSize="@dimen/text_14" />
 
@@ -353,7 +353,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="保险信息"
+                    android:text="@string/insurance_information"
                     android:textColor="@color/colorMain"
                     android:textSize="@dimen/text_14" />
 
@@ -361,7 +361,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/size_10"
-                    android:text="保险 每天"
+                    android:text="@string/insurance_information_hint"
                     android:textSize="@dimen/text_14" />
 
                 <LinearLayout
@@ -416,7 +416,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
-                    android:text="使用优惠券"
+                    android:text="@string/use_a_coupon"
                     android:textColor="@color/colorMain"
                     android:textSize="@dimen/text_16" />
 
@@ -426,7 +426,7 @@
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
-                    android:text="暂无优惠券"
+                    android:text="@string/no_coupons"
                     android:textColor="@color/gray_FFB74B"
                     android:textSize="@dimen/text_14" />
             </RelativeLayout>
@@ -444,7 +444,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
-                    android:text="预定须知"
+                    android:text="@string/booking_notice"
                     android:textColor="@color/colorMain"
                     android:textSize="@dimen/text_14" />
 
@@ -469,7 +469,7 @@
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
                     android:layout_weight="1"
-                    android:text="内部邀请人"
+                    android:text="@string/internal_inviter"
                     android:textColor="@color/textMain"
                     android:textSize="@dimen/text_16" />
 
@@ -481,7 +481,7 @@
                     android:layout_centerVertical="true"
                     android:background="@color/colorWrite"
                     android:gravity="center_vertical|right"
-                    android:hint="请输入邀请人手机号"
+                    android:hint="@string/internal_inviter_hint"
                     android:inputType="phone"
                     android:maxLength="11"
                     android:textColor="@color/text_Gray"
@@ -500,7 +500,7 @@
                     android:id="@+id/cb_agree_to_know"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="同意预订须知和"
+                    android:text="@string/consent_to_booking"
                     android:textColor="@color/textGray"
                     android:textSize="@dimen/text_12" />
 
@@ -510,7 +510,7 @@
                     android:layout_height="match_parent"
                     android:clickable="true"
                     android:gravity="center"
-                    android:text="《合同协议》"
+                    android:text="@string/contract"
                     android:textColor="@color/colorYellow"
                     android:textSize="@dimen/text_12" />
             </LinearLayout>
@@ -536,7 +536,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="支付金额："
+                android:text="@string/payment_amount"
                 android:textColor="@color/colorMain"
                 android:textSize="@dimen/text_16" />
 
@@ -565,7 +565,7 @@
                 android:gravity="center"
                 android:paddingLeft="@dimen/size_15"
                 android:paddingRight="@dimen/size_15"
-                android:text="明细"
+                android:text="@string/detail"
                 android:textColor="@color/colorMain"
                 android:textSize="@dimen/text_16" />
 
@@ -578,7 +578,7 @@
             android:layout_weight="1"
             android:background="@color/gray_FFB74B"
             android:gravity="center"
-            android:text="确认订单"
+            android:text="@string/confirm_order"
             android:textColor="@color/colorWrite"
             android:textSize="@dimen/text_16" />
     </LinearLayout>

plugin_member/src/main/java/com/rv.member/presenter/MemberPresenter.java

@@ -34,6 +34,7 @@ import java.util.Map;
 
 public class MemberPresenter extends CommonPresenter {
     private static final int SDK_ALI_PAY_FLAG = 11;
+    private Context context;
 
     public void pay(Context context, IWXAPI api, BeanTourOrderPay data) {
         try {
@@ -76,6 +77,7 @@ public class MemberPresenter extends CommonPresenter {
     }
 
     public void aliPay(final MemberCenterActivity memberCenterActivity, final BeanTourOrderAliPay bean) {
+        context = memberCenterActivity;
         Runnable payRunnable = new Runnable() {
             @Override
             public void run() {
@@ -108,8 +110,10 @@ public class MemberPresenter extends CommonPresenter {
                     String resultStatus = payResult.getResultStatus();
                     // 判断resultStatus 为9000则代表支付成功
                     if (TextUtils.equals(resultStatus, "9000")) {
+                        ToastView.getInstance(context).showToastContent("支付成功！", Toast.LENGTH_SHORT);
                         RxBus.post(new PaymentSuccessfulEvent());
                     } else if ("6001".equals(resultStatus)) {
+                        ToastView.getInstance(context).showToastContent("支付取消！", Toast.LENGTH_SHORT);
                         RxBus.post(new PaymentFailedEvent());
                     } else {
                         // 该笔订单真实的支付结果，需要依赖服务端的异步通知。