Merge remote-tracking branch 'origin/PYYX_V1.0_20250417' into PYYX_V1.0_20250417

app/src/main/java/com/yihucha/hbyhc/presentation/annuity/model/AnnuityRecordsBean.java

@@ -710,7 +710,7 @@ public class AnnuityRecordsBean {
                 private String dacang_price;
                 private Object gong_sku_id;
                 private String cost;
-                private int bc_extension_one;
+                private double bc_extension_one;
                 private int bc_extension_two;
                 private int seckill;
 
@@ -834,7 +834,7 @@ public class AnnuityRecordsBean {
                     this.cost = cost;
                 }
 
-                public int getBc_extension_one() {
+                public double getBc_extension_one() {
                     return bc_extension_one;
                 }
 

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

@@ -4,6 +4,7 @@ import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.Gravity;
 import android.view.View;
 import android.widget.Toast;
@@ -227,7 +228,8 @@ public class SubmitOrderActivity extends ViewBindingTitleBaseActivity<ActivitySu
                 if (isSmq) cartIdRequest.setIs_commercetrade(1);
                 cartIdRequest.setAddress_id(addressLists.get(0).getAddress_id());
                 orderViewModel.getCheckOrder(cartIdRequest);
-
+//                Log.d(TAG, "initData: ");
+                LogUtil.LogInfo("orderCheckBean-----", JSON.toJSONString(cartIdRequest));
                 mViewBinding.llNoAddress.setVisibility(View.GONE);
                 mViewBinding.llAddress.setVisibility(View.VISIBLE);
                 String dizhi = addressLists.get(0).getProvince() +

app/src/main/java/com/yihucha/hbyhc/presentation/order/model/OrderCheckBean.java

@@ -1217,9 +1217,9 @@ public class OrderCheckBean {
                     @JsonProperty("gong_sku_id")
                     private String gong_sku_id;
                     @JsonProperty("bc_extension_one")
-                    private Integer bc_extension_one;
+                    private double bc_extension_one;
                     @JsonProperty("bc_extension_two")
-                    private Integer bc_extension_two;
+                    private double bc_extension_two;
                     @JsonProperty("seckill")
                     private Integer seckill;
 
@@ -1335,7 +1335,7 @@ public class OrderCheckBean {
                         this.gong_sku_id = gongSkuId;
                     }
 
-                    public Integer getBcExtensionOne() {
+                    public double getBcExtensionOne() {
                         return bc_extension_one;
                     }
 
@@ -1343,7 +1343,7 @@ public class OrderCheckBean {
                         this.bc_extension_one = bcExtensionOne;
                     }
 
-                    public Integer getBcExtensionTwo() {
+                    public double getBcExtensionTwo() {
                         return bc_extension_two;
                     }
 

app/src/main/java/com/yihucha/hbyhc/presentation/order/repository/OrderRepository.java

@@ -2,6 +2,8 @@ package com.yihucha.hbyhc.presentation.order.repository;
 
 import android.annotation.SuppressLint;
 
+import com.alibaba.fastjson.JSON;
+import com.alipay.android.phone.mrpc.core.HttpException;
 import com.yihucha.hbyhc.callback.NormalListener;
 import com.yihucha.hbyhc.network.BaseObserver;
 import com.yihucha.hbyhc.network.DataResponse;
@@ -14,6 +16,8 @@ import com.yihucha.hbyhc.presentation.order.model.OrderCreateBean;
 import com.yihucha.hbyhc.presentation.order.model.OrderCreateShoppingBean;
 import com.yihucha.hbyhc.utils.LogUtil;
 
+import java.io.IOException;
+import java.net.SocketTimeoutException;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -63,6 +67,7 @@ public class OrderRepository {
         orderService.orderCheck(cartIdRequest).compose(NetworkApi.applySchedulers(new BaseObserver<OrderCheckBean>() {
             @Override
             public void onSuccess(OrderCheckBean orderCheckBeanDataResponse) {
+                LogUtil.LogInfo("orderCheckBean----", JSON.toJSONString(orderCheckBeanDataResponse));
                 if (orderCheckBeanDataResponse.getStatus()==200){
                     listener.success(orderCheckBeanDataResponse);
                 }else {