Merge branch 'master' of http://113.105.137.151:22280/lify/rvapp into dev-member-john

module_discovery/src/main/java/com/xxfc/discovery/api/DiscoveryApi.java

@@ -11,7 +11,7 @@ public interface DiscoveryApi extends RvFrameConfig {
     String DISCOVERY_IMQUESTION_ADD = HOST + "/api/im/imQuestion/add";
 
     //获取推荐消息列表
-    String DISCOVERY_HOTMSG_LIST = HOST + "/api/im/app/unauth/hotMsg/list";
+    String DISCOVERY_HOTMSG_LIST = HOST + "/api/im/msg/app/unauth/hotMsg/list";
 
     //获取拍拍、短视频请求列表
     String DISCOVERY_UNAUTH_LIST = HOST + "/api/im/msg/app/unauth/list";

module_discovery/src/main/java/com/xxfc/discovery/fragment/PatFragment.java

@@ -93,7 +93,6 @@ public class PatFragment extends BaseFragment<DiscoveryPresenter> implements Sim
         mAdapter.setEnableLoadMore(true);
         mAdapter.disableLoadMoreIfNotFullPage();
 
-
         mAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {

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

@@ -513,10 +513,13 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
             return;
         }
 
+        payType = 1;
+
         new PaymentTypeSelection(mActivity) {
             @Override
             public void helper(final ViewHolder helper) {
                 super.helper(helper);
+
                 helper.setText(R.id.tv_amount, tvPayMoney.getText().toString());
                 helper.setOnClickListener(new View.OnClickListener() {
                     @Override

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

@@ -480,6 +480,7 @@ public class TravelerConfirmOrderActivity extends BaseStatusActivity<TourismPres
             return;
         }
 
+        payType = 1;
         new PaymentTypeSelection(mActivity) {
             @Override
             public void helper(final ViewHolder helper) {