佣金添加结算时间 养老金添加结算状态

.idea/misc.xml

@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK" />

app/src/main/java/com/yihucha/hbyhc/network/service/OrderService.java

@@ -222,8 +222,10 @@ public interface OrderService {
      * @return
      */
     @GET("api/user/third_order_bill")
-    Observable<DataResponse<ThirdOrderBean>> getThirdOrder(@QueryMap Map<String, Object> request);
+    Observable<DataResponse<ThirdOrderBean>> getThirdOrderBill(@QueryMap Map<String, Object> request);
 
+    @GET("api/user/third_order")
+    Observable<DataResponse<ThirdOrderBean>> getThirdOrder(@QueryMap Map<String, Object> request);
     /**
      * app全部订单接口（整合第三方）
      *

app/src/main/java/com/yihucha/hbyhc/presentation/annuity/PensionRecordsListActivity.java

@@ -92,7 +92,8 @@ public class PensionRecordsListActivity extends ViewBindingTitleBaseActivity<Act
             });
         }else {
 
-            mMineViewModel.getThirdOrder(type,mPage);
+//            mMineViewModel.getThirdOrder(type,mPage);
+            mMineViewModel.getThirdOrderBill(type,mPage);
             mMineViewModel.mThirdOrderData.observe(this, new Observer<ThirdOrderBean>() {
                 @Override
                 public void onChanged(ThirdOrderBean thirdOrderBean) {
@@ -150,7 +151,8 @@ public class PensionRecordsListActivity extends ViewBindingTitleBaseActivity<Act
                             //线上
                             mMineViewModel.getYanglaojinLog("0", mPage);
                         }else {
-                            mMineViewModel.getThirdOrder(type,mPage);
+//                            mMineViewModel.getThirdOrder(type,mPage);
+                            mMineViewModel.getThirdOrderBill(type,mPage);
                         }
                     }
                 }, 2000);

app/src/main/java/com/yihucha/hbyhc/presentation/annuity/adapter/ThirdOrderAdapter.java

@@ -40,9 +40,11 @@ public class ThirdOrderAdapter extends BaseQuickAdapter<ThirdOrderBean.ThirdOrde
 
         helper.setText(R.id.btv_mer_name, item.getGoods_name());
         helper.setText(R.id.tv_number, "获得养老金：" + item.getYanglao());
-        helper.setText(R.id.tv_order_sn, item.getOrder_sn());
+        helper.setText(R.id.tv_status_name,item.getStatus_name());
+        helper.setText(R.id.tv_order_sn,"订单号："+ item.getOrder_sn());
         helper.setText(R.id.tv_create_time, "下单时间：" + item.getCreate_time());
         if ("10".equals(type)){
+//            helper.setText(R.id.tv_order_sn,"订单号：" + item.getOrder_sn());
             helper.setText(R.id.tv_mark, "养老金来源：话费充值");
             Glide.with(context).load(R.mipmap.icon_recharge).into(riv_mer_avatar);
         }else {

app/src/main/java/com/yihucha/hbyhc/presentation/annuity/adapter/YanglaojinLogXSAdapter.java

@@ -35,6 +35,10 @@ public class YanglaojinLogXSAdapter extends BaseQuickAdapter<YanglaojinLogXSBean
 
         helper.setText(R.id.btv_mer_name,item.getMer_name());
         helper.setText(R.id.tv_number,"获得养老金："+item.getNumber());
+        // Hide the tv_status_name view
+        View tvStatusName = helper.getView(R.id.tv_status_name);
+        tvStatusName.setVisibility(View.GONE);
+//        helper.setText(R.id.tv_status_name,item.get);
         helper.setText(R.id.tv_order_sn,"订单号："+item.getOrder_sn());
         helper.setText(R.id.tv_create_time,"下单时间："+item.getCreate_time());
         helper.setText(R.id.tv_mark,"养老金来源：购买商品");

app/src/main/java/com/yihucha/hbyhc/presentation/login/LoginActivity.java

@@ -111,7 +111,7 @@ public class LoginActivity extends ViewBindingTitleBaseActivity<ActivityLoginPho
             MVUtils.put(Constants.NICK_NAME, loginModel.getUser().getNickname());
 
 //                MainActivity.launch(LoginActivity.this);
-
+            mViewBinding.tvLogin.setEnabled(true);
             List<String> activityList = new ArrayList<>();
             activityList.add(LoginHomeActivity.class.getSimpleName());
             ActivityStack.getScreenManager().finishArrayActivity(activityList);
@@ -129,6 +129,7 @@ public class LoginActivity extends ViewBindingTitleBaseActivity<ActivityLoginPho
         loginViewModel.failed.observe(LoginActivity.this, msg -> {
             //如果返回了400 表示需要填写邀请人信息，弹窗进行绑定
             ToastUtils.showShort(msg);
+            mViewBinding.tvLogin.setEnabled(true);
         });
     }
 
@@ -274,8 +275,10 @@ public class LoginActivity extends ViewBindingTitleBaseActivity<ActivityLoginPho
             if (TextUtils.isEmpty(mOpenId)) {
                 if (loginType == 0){
                     loginViewModel.getPhonePasswordLogin(mAccount,mPwd);
+                    mViewBinding.tvLogin.setEnabled(false);
                 }else {
                     loginViewModel.getLogin(LoginActivity.this, mCode);
+                    mViewBinding.tvLogin.setEnabled(false);
                 }
             } else {
                 //微信绑定手机号

app/src/main/java/com/yihucha/hbyhc/presentation/login/view_model/LoginViewModel.java

@@ -167,6 +167,7 @@ public class LoginViewModel extends BaseViewModel {
                 } else if (loginModelDataResponse.responseCode == 400) {
                     failed.postValue(loginModelDataResponse.responseError);
                 } else {
+                    failed.postValue(loginModelDataResponse.responseError);
                     MyToast.makeText(context, loginModelDataResponse.responseError, Toast.LENGTH_LONG).show();
                 }
 

app/src/main/java/com/yihucha/hbyhc/presentation/mine/ThirdPartyBindingActivity.java

@@ -153,8 +153,6 @@ public class ThirdPartyBindingActivity extends ViewBindingTitleBaseActivity<Acti
 //                        mViewBinding.llAlipayAuthorization.setEnabled(false);
 //                        mViewBinding.llAlipayAuthorization.setClickable(false);
                         String imageUrl = alipayBean.getAvater(); // Replace with your actual IP address and image path
-//                        GlideUtils.loadImage(ThirdPartyBindingActivity.this, imageUrl, mViewBinding.llWechatProfile);
-
                         Glide.with(ThirdPartyBindingActivity.this)
                                 .load(imageUrl)
                                 .apply(RequestOptions.circleCropTransform()) // Apply circular crop

app/src/main/java/com/yihucha/hbyhc/presentation/mine/adapter/CommissionDetailAdapter.java

@@ -97,6 +97,13 @@ public class CommissionDetailAdapter extends BaseAdapter {
             if (i > 0) tvTitle.setText(typeArr.get(i));
         }*/
         tvTitle.setText(item.getMark()+"");
+        if (item.getSettTime() != null && !item.getSettTime().isEmpty()) {
+            holder.tvSettTime.setText("结算时间：" + item.getSettTime());
+            holder.tvSettTime.setVisibility(View.VISIBLE); // 显示结算时间
+        } else {
+            holder.tvSettTime.setVisibility(View.GONE); // 隐藏结算时间
+        }
+
         if ("0".equals(item.getStatus())) {
             //未结算
             tvStatus.setText("未结算");
@@ -105,7 +112,8 @@ public class CommissionDetailAdapter extends BaseAdapter {
             //已结算
             tvStatus.setText("已结算");
             tvStatus.setTextColor(ContextCompat.getColor(context, R.color.black_333333));
-            holder.tvTime.setText("结算时间："+item.getCreateTime());
+//            holder.tvTime.setText("结算时间："+item.getCreateTime());
+            holder.tvSettTime.setText("结算时间："+item.getSettTime());
         }else if ("-1".equals(item.getStatus())){
             //已失效
             tvStatus.setText("已失效");
@@ -118,6 +126,7 @@ public class CommissionDetailAdapter extends BaseAdapter {
     static class TXRecordHolder {
         public TextView tvName;
         public TextView tvTime;
+        public TextView tvSettTime;
         public TextView tvMoney;
         public TextView tvStatus;
         public TextView tvTitle;
@@ -125,6 +134,7 @@ public class CommissionDetailAdapter extends BaseAdapter {
         public TXRecordHolder(View itemView) {
             tvName = itemView.findViewById(R.id.tv_name);
             tvTime = itemView.findViewById(R.id.t_time);
+            tvSettTime = itemView.findViewById(R.id.t_sett_time);
             tvMoney = itemView.findViewById(R.id.tv_money);
             tvStatus = itemView.findViewById(R.id.tv_status);
             tvTitle = itemView.findViewById(R.id.tv_title);

app/src/main/java/com/yihucha/hbyhc/presentation/mine/model/CommissionBean.java

@@ -88,6 +88,12 @@ public class CommissionBean {
             @SerializedName("mark")
             private String mark;
 
+            @SerializedName("status_name")
+            private String statusName;
+
+            @SerializedName("sett_time")
+            private String settTime;
+
             public String getMark() {
                 return mark;
             }
@@ -168,6 +174,16 @@ public class CommissionBean {
                 this.status = status;
             }
 
+            public void setSettTime(String settTime){ this.settTime = settTime ; }
+
+            public String getSettTime() {
+                return settTime;
+            }
+            public void  setStatusName(String statusName){this.statusName = statusName;}
+            public String getStatusName(){
+                return  statusName ;
+            }
+
             public String getOrderSn() {
                 return orderSn;
             }

app/src/main/java/com/yihucha/hbyhc/presentation/mine/view_model/MineViewModel.java

@@ -453,6 +453,35 @@ public class MineViewModel extends BaseViewModel {
     }
 
     /**
+     * 养老金
+     *
+     * @param type
+     * @param page
+     */
+    @SuppressLint("CheckResult")
+    public void getThirdOrderBill(String type, int page) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("type", type);
+        map.put("page", page);
+        map.put("limit", 10);
+        OrderService orderService = NetworkApi.createService(OrderService.class);
+        orderService.getThirdOrderBill(map).compose(NetworkApi.applySchedulers(new BaseObserver<DataResponse<ThirdOrderBean>>() {
+            @Override
+            public void onSuccess(DataResponse<ThirdOrderBean> thirdOrderBeanDataResponse) {
+                if (thirdOrderBeanDataResponse.responseCode == 200) {
+                    mThirdOrderData.postValue(thirdOrderBeanDataResponse.getData());
+                } else {
+                    ToastUtils.showLong(thirdOrderBeanDataResponse.responseError);
+                }
+            }
+
+            @Override
+            public void onFailure(Throwable e) {
+//                failed.postValue(getString(R.string.failed_string));
+            }
+        }));
+    }
+    /**
      * 签到信息
      */
     public void getSignInInfo() {

app/src/main/java/com/yihucha/hbyhc/presentation/order/view_model/OrderViewModel.java

@@ -513,6 +513,35 @@ public class OrderViewModel extends BaseViewModel {
     }
 
     /**
+     * 养老金
+     *
+     * @param type
+     * @param page
+     */
+    @SuppressLint("CheckResult")
+    public void getThirdOrderBill(String type, int page) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("type", type);
+        map.put("page", page);
+        map.put("limit", 10);
+        OrderService orderService = NetworkApi.createService(OrderService.class);
+        orderService.getThirdOrderBill(map).compose(NetworkApi.applySchedulers(new BaseObserver<DataResponse<ThirdOrderBean>>() {
+            @Override
+            public void onSuccess(DataResponse<ThirdOrderBean> thirdOrderBeanDataResponse) {
+                if (thirdOrderBeanDataResponse.responseCode == 200) {
+                    mThirdOrderData.postValue(thirdOrderBeanDataResponse.getData());
+                } else {
+                    ToastUtils.showLong(thirdOrderBeanDataResponse.responseError);
+                }
+            }
+
+            @Override
+            public void onFailure(Throwable e) {
+//                failed.postValue(getString(R.string.failed_string));
+            }
+        }));
+    }
+    /**
      * app全部订单接口（整合第三方）
      *
      * @param page

app/src/main/java/com/yihucha/hbyhc/presentation/pyyx/bean/MineKingKongBean.kt

@@ -35,5 +35,6 @@ enum class ServerType {
     GOUWUJIN,
     HONGBAO,
     FENSI,
-    FGJ
+    FGJ,
+    XFXD
 }

app/src/main/java/com/yihucha/hbyhc/presentation/pyyx/fragment/PyyxHotFragment.kt

@@ -12,6 +12,7 @@ import com.yihucha.hbyhc.presentation.pyyx.activity.ActivityPhoneRecharge
 import com.yihucha.hbyhc.presentation.pyyx.activity.FGQActivity
 import com.yihucha.hbyhc.presentation.pyyx.activity.JCSHActivity
 import com.yihucha.hbyhc.presentation.pyyx.activity.JDActivity
+import com.yihucha.hbyhc.presentation.pyyx.activity.MerActivity
 import com.yihucha.hbyhc.presentation.pyyx.activity.PDDActivity
 import com.yihucha.hbyhc.presentation.pyyx.activity.PyyxProductDetailActivity
 import com.yihucha.hbyhc.presentation.pyyx.activity.SMQActivity
@@ -20,6 +21,7 @@ import com.yihucha.hbyhc.presentation.pyyx.activity.SXYActivity
 import com.yihucha.hbyhc.presentation.pyyx.activity.TBActivity
 import com.yihucha.hbyhc.presentation.pyyx.activity.VIPActivity
 import com.yihucha.hbyhc.presentation.pyyx.adapter.KingKongAdapter
+import com.yihucha.hbyhc.presentation.pyyx.bean.KingKongBean
 import com.yihucha.hbyhc.presentation.pyyx.bean.KingKongKey
 import com.yihucha.hbyhc.presentation.pyyx.viewmodel.PyyxHomeViewModel
 import com.yihucha.hbyhc.presentation.shop.VipAreaActivity
@@ -125,7 +127,11 @@ class PyyxHotFragment : NewBaseFragment<FragmentPyyxHotBinding>() {
                     SXYActivity.lanuch(requireContext())
                 }
                 KingKongKey.XFXD->{
-                    PyyxProductDetailActivity.launch(requireContext(),"3279")
+                    MerActivity.launch(
+                        requireContext(),
+                        "3279",
+                        pyyxHomeViewModel.kingKongPage2.getOrNull(it)?.name ?: "幸福小店"
+                    )
 
                 }
 

app/src/main/java/com/yihucha/hbyhc/presentation/pyyx/fragment/PyyxMineFragment.kt

@@ -158,6 +158,9 @@ class PyyxMineFragment : NewBaseFragment<FragmentPyyxMineBinding>(), View.OnClic
                 ServerType.SHOP_MANAGER -> { //店铺管理
                     ShopManagerActivity.launch(requireContext())
                 }
+                ServerType.XFXD -> {
+                    Toast.makeText(requireContext(), "升级中", Toast.LENGTH_LONG).show()
+                }
 
                 else -> {}
             }

app/src/main/java/com/yihucha/hbyhc/presentation/pyyx/viewmodel/PyyxMineViewModel.kt

@@ -26,6 +26,7 @@ class PyyxMineViewModel:BaseViewModel() {
             MineKingKongBean("邀请好友", icon = R.mipmap.invite_friends_221023, type = ServerType.INVITATE),
 //            MineKingKongBean("商铺入驻", icon = R.mipmap.dianpuruzhu_220620, type = ServerType.RUZHU),
             MineKingKongBean("店铺管理", icon = R.mipmap.icon_dpgl, type = ServerType.SHOP_MANAGER),
+            MineKingKongBean("幸福小店", icon = R.mipmap.icon_rx, type = ServerType.XFXD),
             MineKingKongBean("设置", icon = R.mipmap.mine_setting_220620, type = ServerType.SETTING),
         )
     }

app/src/main/res/layout/activity_third_party_binding.xml

@@ -54,7 +54,7 @@
     <LinearLayout
         android:id="@+id/ll_wechat_info"
         android:layout_width="match_parent"
-        android:layout_height="52dp"
+        android:layout_height="wrap_content"
         android:background="@color/white"
         android:orientation="horizontal"
         android:gravity="center_vertical"
@@ -63,8 +63,8 @@
 
         <ImageView
             android:id="@+id/ll_wechat_profile"
-            android:layout_width="26dp"
-            android:layout_height="26dp"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
             android:src="@mipmap/wx_sf_220908"
             android:scaleType="centerCrop"
             />
@@ -130,7 +130,7 @@
     <LinearLayout
         android:id="@+id/ll_alipay_info"
         android:layout_width="match_parent"
-        android:layout_height="52dp"
+        android:layout_height="wrap_content"
         android:background="@color/white"
         android:gravity="center_vertical"
         android:orientation="horizontal"
@@ -139,8 +139,8 @@
 
         <ImageView
             android:id="@+id/ll_alipay_profile"
-            android:layout_width="25dp"
-            android:layout_height="25dp"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
             android:src="@mipmap/zfb_sf_220908"
             android:scaleType="centerCrop"
             />

app/src/main/res/layout/item_commission_detail.xml

@@ -56,4 +56,14 @@
         android:layout_marginTop="4dp"
         />
 
+    <TextView
+        android:id="@+id/t_sett_time"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/tv_name"
+        android:layout_marginTop="25dp"
+        android:text="2023-08-26 18:30:30"
+        android:textColor="@color/gray_999999"
+        android:textSize="12sp" />
+
 </RelativeLayout>

app/src/main/res/layout/item_pension_records_list.xml

@@ -44,13 +44,30 @@
                     android:textColor="@color/black_333333"
                     android:textSize="14sp" />
 
-                <TextView
-                    android:id="@+id/tv_number"
+                <RelativeLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="8dp"
-                    android:textColor="@color/red_f23f42"
-                    android:textSize="12sp" />
+                    >
+
+                    <TextView
+                        android:id="@+id/tv_number"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textColor="@color/red_f23f42"
+                        android:textSize="12sp" />
+
+                    <TextView
+                        android:id="@+id/tv_status_name"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textColor="@color/red_f83554"
+                        android:text="TextView"
+                        android:layout_marginEnd="8dp"
+                        android:textSize="12sp"
+                        android:layout_alignParentEnd="true"
+                        android:layout_alignParentRight="true"
+                        />
+                </RelativeLayout>
             </LinearLayout>
         </LinearLayout>