客服和 订单支付页面

app/src/main/java/com/yihucha/hbyhc/presentation/order/OrderDetailsDaifukuanActivity.java

@@ -527,7 +527,17 @@ public class OrderDetailsDaifukuanActivity extends BaseActivity
                 map.put("uid", obligationBeanList.getUid());
                 map.put("user_address", obligationBeanList.getUser_address());
                 map.put("user_phone", obligationBeanList.getUser_phone());
-                PayActivity.launch(context, "1", JSON.toJSONString(map), obligationBeanList.getGroup_order_id(), obligationBeanList.getPay_price());
+
+                if (EmptyCheckUtils.isNotEmpty(obligationBeanList.getType())){
+                    map.put("type",obligationBeanList.getType().getType());
+                    map.put("note",obligationBeanList.getType().getNote());
+                    map.put("price",obligationBeanList.getType().getPrice());
+                    if (obligationBeanList.getType().getOther()>0){
+                        map.put("other",obligationBeanList.getType().getOther());
+                    }
+                }
+                PayActivity.launch(context, "1", JSON.toJSONString(map), obligationBeanList.getGroup_order_id(), obligationBeanList.getPay_price(),2,obligationBeanList);
+//                PayActivity.launch(mContext,"1", JSON.toJSONString(map), item.getGroup_order_id(), item.getPay_price(),2,item);
             }
         } else if (v == mViewBinding.tvCancellationOfOrder) {
             if (status.equals("-2")) {

app/src/main/java/com/yihucha/hbyhc/presentation/pay/PayActivity.java

@@ -6,6 +6,7 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.view.View;
 
+import androidx.annotation.VisibleForTesting;
 import androidx.lifecycle.ViewModelProvider;
 
 import com.alibaba.fastjson.JSON;
@@ -24,6 +25,8 @@ import com.yihucha.hbyhc.presentation.order.OrderActivity;
 import com.yihucha.hbyhc.presentation.order.OrderDetailsDaifukuanActivity;
 import com.yihucha.hbyhc.presentation.order.model.OrderListObligationBean;
 import com.yihucha.hbyhc.presentation.pay.view_model.PayViewModel;
+import com.yihucha.hbyhc.utils.DoubleFormatTool;
+import com.yihucha.hbyhc.utils.EmptyCheckUtils;
 import com.yihucha.hbyhc.utils.LogUtil;
 import com.yihucha.hbyhc.utils.MVUtils;
 import com.yihucha.hbyhc.view.CustomDialog;
@@ -134,7 +137,25 @@ public class PayActivity extends ViewBindingTitleBaseActivity<ActivityPayBinding
     }
 
     private void initView() {
-        mViewBinding.btvPrice.setText(price);
+        if (EmptyCheckUtils.isNotEmpty(bean)){
+            if (EmptyCheckUtils.isNotEmpty(bean.getType())){
+//                String type = bean.getType().getType();
+//                String  note = bean.getType().getNote();
+                double price = bean.getType().getPrice();
+                double other = bean.getType().getOther();
+                StringBuffer sb = new StringBuffer("");
+                sb.append(DoubleFormatTool.getRoundHalfUpDouble(price));
+                if (bean.getType().getOther()>0){
+                    sb.append("+");
+                    sb.append(DoubleFormatTool.getRoundHalfUpDouble(other));
+                }
+                mViewBinding.btvPrice.setText(sb.toString());
+
+            }
+        }
+        else {
+            mViewBinding.btvPrice.setText(price);
+        }
     }
 
     @Override

app/src/main/java/com/yihucha/hbyhc/presentation/pyyx/activity/PyyxProductDetailActivity.kt

@@ -807,11 +807,21 @@ class PyyxProductDetailActivity : ViewBindingBaseActivity<ActivityPyyxProductDet
             val appId = Constants.WX_APP_ID
             val wxapi = WXAPIFactory.createWXAPI(this, appId)
             if (wxapi.wxAppSupportAPI >= com.tencent.mm.opensdk.constants.Build.SUPPORT_OPEN_CUSTOMER_SERVICE_CHAT) {
-                val req = WXOpenCustomerServiceChat.Req()
-                req.corpId = "wwaeb55681929a37ae"
-                req.url = "https://work.weixin.qq.com/kfid/kfc8bd3f11a28aa81db"
+                val req = WXOpenCustomerServiceChat.Req().apply {
+                    corpId = "wwaeb55681929a37ae" // Replace with your actual corpId
+                    url = "https://work.weixin.qq.com/kfid/kfcb5641d3744471601" // Replace with your actual URL
+                }
                 wxapi.sendReq(req)
+            } else {
+                Toast.makeText(this, "当前微信版本不支持客服功能", Toast.LENGTH_SHORT).show()
             }
+
+//            if (wxapi.wxAppSupportAPI >= com.tencent.mm.opensdk.constants.Build.SUPPORT_OPEN_CUSTOMER_SERVICE_CHAT) {
+//                val req = WXOpenCustomerServiceChat.Req()
+//                req.corpId = "wwaeb55681929a37ae"
+//                req.url = "https://work.weixin.qq.com/kfid/kfcb5641d3744471601"
+//                wxapi.sendReq(req)
+//            }
         } else if (view === mViewBinding.llShopping) {
             if (LoginUtils.isLogin(context)) {
                 //购物车

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

@@ -458,7 +458,7 @@ class PyyxMineFragment : NewBaseFragment<FragmentPyyxMineBinding>(), View.OnClic
             if (wxapi.wxAppSupportAPI >= Build.SUPPORT_OPEN_CUSTOMER_SERVICE_CHAT) {
                 val req = WXOpenCustomerServiceChat.Req()
                 req.corpId = "wwaeb55681929a37ae"
-                req.url = "https://work.weixin.qq.com/kfid/kfc8bd3f11a28aa81db"
+                req.url = "https://work.weixin.qq.com/kfid/kfcb5641d3744471601"
                 wxapi.sendReq(req)
             }
         } else if (view === binding.llBangzhuzhongxin) {

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

@@ -470,14 +470,15 @@
                     android:orientation="horizontal"
                     android:layout_marginTop="15dp"
                     >
+
                     <LinearLayout
                         android:id="@+id/ll_connect_us"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:gravity="center"
-                        android:visibility="gone"
-                        android:orientation="vertical">
+                        android:orientation="vertical"
+                        android:visibility="visible">
 
                         <ImageView
                             android:layout_width="wrap_content"