接口字段变更调试，2023.05.05 19:04

app/debug/output-metadata.json

       "filters": [],
       "versionCode": 10,
       "versionName": "1.0.8",
-      "outputFile": "KyushuETC1.0_v1.0.8_debug.apk"
+      "outputFile": "jz_app_v1.0.8_debug.apk"
     }
   ]
 }

app/src/main/java/com/huntersun/vkyes/etcopencard/project/api/MyRetrofit.java

     private final String FileUrl = "http://" + Url + ":19003/ifzt/api/"; //文件服务
 
     public static final String URL_DOWNLOAD_FILE = "http://" + Url + ":19002/user-export-excel/";//通行流水下载路径前缀
-    public static final String URL_APP_IMG = "http://" + Url + ":19002/default-bucket/app/";//APP图标路径前缀
+    public static final String URL_APP_IMG = "http://" + Url +("192.168.100.63".equals(Url) ? ":8087" : ":19002")+ "/default-bucket/app/";//APP图标路径前缀
+//    public static final String URL_APP_IMG = "http://" + Url +":19002/default-bucket/app/";//APP图标路径前缀
     public final static String SM4_KEY = "5dc11f854ceca147";
     private final String appId = "admin001";
     private final String IFCODE = "";

app/src/main/java/com/huntersun/vkyes/etcopencard/project/api/bean/IFCode.java

     public static final String IFCODE_TRANSFER_CONFIRM = "b1e66d22fb6f400f915458f5c50c7118"; //操作接口
 
     public static final String IFCODE914 = "914";   //下单-订单产品选择
+    public static final String IFCODE_PRODUCT_COMMIT = "198172b1858d474fa8e35225d65014d7";   //下单-订单产品选择
     public static final String IFCODE1032 = "1032"; //返回工作台菜单列表
     public static final String IFCODE1004 = "1004"; //统一门户账号密码登录
     public static final String IFCODE1005 = "1005"; //统一门户手机号验证码登录
     public static final String IFCODE_AUDITING = "40dd538017164e7fbcfd3c410ae61726";//8.2.39.订单人工审核
     public static final String IFCODE_KNOWLEDGE = "c5a4e35d11594ccabd46e6b66c0a75fb";//知识库
     public static final String IFCODE_JGQUANYI = "074017442f7d40c4bb63da780c253b55";//加购权益列表
+    public static final String IFCODE_JGOUCHOOSE = "10414819633f46db98158fc7b4e8475e";//加购权益产品选择提交
 }

app/src/main/java/com/huntersun/vkyes/etcopencard/project/api/bean/ResultBean.java

     * \"validityFormat\":1
     * */
     public static class BizContent<T> {
+        public String promoteId;
+        public String productIntro;
+        private String isSign;
+        public String promoteName;
         public long discountPrice;
         public String problemName;
         public String problemType;
         private ObuDetailInfoBean.UserPromiseCBBean userPromiseCBBean;
         private ObuDetailInfoBean.QueryCarInfoCBBean queryCarInfoCBBean;
 
+        public String getIsSign() {
+            return isSign;
+        }
+
+        public void setIsSign(String isSign) {
+            this.isSign = isSign;
+        }
+
         public List<BizContent> getChildren() {
             return children;
         }

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/AddPurchaseChooseActivity.java

 
     @Override
     protected void initView() {
-        ResultBean.BizContent bizContent =
-                JSON.parseObject(getIntent().getStringExtra("bizContent"), ResultBean.BizContent.class);
-        Log.e("id!!!!!!!!!",bizContent.getId());
+        if ("0".equals(getIntent().getStringExtra("isSign"))){
+            binding.lyQiany.setVisibility(View.GONE);
+        }else {
+            binding.lyQiany.setVisibility(View.VISIBLE);
+        }
         binding.tvSkip.getHelper().setBackgroundColorNormalArray(this.getResources().getIntArray(R.array.green_bg_arr));
         binding.tvSkip.setOnClickListener(new View.OnClickListener() {
             @Override
                 Intent intent = new Intent();
                 intent.putExtra("orderId",getIntent().getStringExtra("orderId"));
                 intent.putExtra("bizContent",getIntent().getStringExtra("bizContent"));
-                intent.putExtra("isValueCard",getIntent().getStringExtra("isValueCard"));
+                intent.putExtra("isSign",getIntent().getStringExtra("isSign"));
                 if (list.size()>0){
                     intent.putExtra("purchase", JSON.toJSONString(list));
                 }

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/ContractActivity.java

         Bundle bundle = new Bundle();
         bundle.putString("bizContent", getIntent().getStringExtra("bizContent"));
         bundle.putString("orderId", getIntent().getStringExtra("orderId"));
-        bundle.putString("isValueCard",getIntent().getStringExtra("isValueCard"));
+        bundle.putString("isSign",getIntent().getStringExtra("isSign"));
         jumpToPage(AddPurchaseChooseActivity.class,bundle);
         finish();
         if (true){
                     Bundle bundle = new Bundle();
                     bundle.putString("bizContent", getIntent().getStringExtra("bizContent"));
                     bundle.putString("orderId", getIntent().getStringExtra("orderId"));
-                    bundle.putString("isValueCard",getIntent().getStringExtra("isValueCard"));
+                    bundle.putString("isSign",getIntent().getStringExtra("isSign"));
                     jumpToPage(AddPurchaseChooseActivity.class,bundle);
                     finish();
                 } else if ("OVERDUE".equals(bizContent1.getUserState())) {

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/ETCHandleActivity.java

 //                        JSONArray.parseArray(resultBean.getBizContent() + "", ResultBean.BizContent.class);
                 try {
                     LinkedTreeMap<String, Object> result = JSONObject.parseObject(resultBean.getBizContent().toString(), LinkedTreeMap.class);
-                    List<ResultBean.BizContent> list = JSONArray.parseArray(result.get("csmsnProducts").toString(), ResultBean.BizContent.class);
+                    List<ResultBean.BizContent> list = JSONArray.parseArray(result.get("csmsnPromoteDistPro").toString(), ResultBean.BizContent.class);
                     if (list.size() == 0) {
                         showEmpty();
                     } else {
         @SuppressLint("UseCompatLoadingForDrawables")
         @Override
         protected void convert(BaseViewHolder helper, ResultBean.BizContent items) {
-            helper.setText(R.id.text1, items.getName()); // 产品名称
-            helper.setText(R.id.text2, items.getProductMsg()); // 产品介绍
+            helper.setText(R.id.text1, items.promoteName); // 产品名称
+            helper.setText(R.id.text2, "1".equals(items.cardType) ? "记账卡" : "储值卡"); // 产品介绍
             helper.setText(R.id.text3, items.getFee() * 0.01 + ""); // 金额
             LinearLayout layout = helper.getView(R.id.layout);
             if (helper.getPosition() == 1) {
                 @Override
                 @SingleClick
                 public void onClick(View v) {
-                    if (TextUtils.isEmpty(items.getIsValueCard())) {
+                    if (TextUtils.isEmpty(items.getIsSign())) {
                         toast("无法获取卡类型");
                         return;
                     }
             ResultBean.BizContent biz = JSON.parseObject(getIntent().getStringExtra("bizContent"), ResultBean.BizContent.class);
             Map<String, String> params = new HashMap<>();
             params.put("orderId", getIntent().getStringExtra("orderId"));
-            params.put("productId", items.getId());
+            params.put("promoteId", items.promoteId);
             MyRetrofit.newInstance(IFCode.IFCODE914, params, new MyRetrofit.ReturnResult(){
                 @Override
                 public void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {
                     switch (Integer.parseInt(biz.getOrderStep())){
                         case Constants.ORDER_STATUS_BASE://完成填写基本信息
                             biz.setProductId(items.getProductId());
-                            biz.setIsValueCard(items.getIsValueCard());
+                            biz.setIsSign(items.getIsSign());
                             Intent intent = new Intent();
                             intent.putExtra("vehiclePlate", biz.getVehiclePlate()); //车牌号
                             intent.putExtra("vehiclePlateColor", biz.getVehiclePlateColor() + ""); //车牌颜色
                             intent.putExtra("type", biz.getType()); //根据不同的车牌类型进行传参(车型) 0 客车 1 货车
                             intent.putExtra("orderId", biz.getOrderId() + ""); //订单号
-                            intent.putExtra("isValueCard",items.getIsValueCard());//1记账卡 2储值卡
+                            intent.putExtra("isSign",items.getIsSign());//是否需要签约0不需要 1需要
                             intent.putExtra("id",biz.getId());//订单Id
                             intent.putExtra("bizContent",JSON.toJSONString(biz));
                             intent.setClass(ETCHandleActivity.this, IdentityInformationUploadActivity.class);
                             break;
                         case Constants.ORDER_STATUS_INFO://完成个人/单位信息上传
                             biz.setProductId(items.getProductId());
-                            biz.setIsValueCard(items.getIsValueCard());
+                            biz.setIsSign(items.getIsSign());
                             Intent intent1 = new Intent();
                             intent1.putExtra("vehiclePlate", biz.getVehiclePlate()); //车牌号
                             intent1.putExtra("vehiclePlateColor", biz.getVehiclePlateColor() + ""); //车牌颜色
                             intent1.putExtra("type", biz.getType()); //根据不同的车牌类型进行传参(车型) 0 客车 1 货车
                             intent1.putExtra("orderId", biz.getOrderId() + ""); //订单号
-                            intent1.putExtra("isValueCard",items.getIsValueCard());//1记账卡 2储值卡
+                            intent1.putExtra("isSign",items.getIsSign());//1记账卡 2储值卡
                             intent1.putExtra("id",biz.getId());//订单Id
                             intent1.putExtra("bizContent",JSON.toJSONString(biz));
                             intent1.setClass(ETCHandleActivity.this, VehicleInformationActivity.class);
                             break;
                         case Constants.ORDER_STATUS_CAR://完成车辆信息上传
                             biz.setProductId(items.getProductId());
-                            biz.setIsValueCard(items.getIsValueCard());
+                            biz.setIsSign(items.getIsSign());
                             Intent intent2 = new Intent();
                             intent2.putExtra("type",biz.getType());
                             intent2.putExtra("orderId",biz.getOrderId());
                             intent2.putExtra("bizContent",JSON.toJSONString(biz));
-                            intent2.putExtra("isValueCard",biz.getIsValueCard());
+                            intent2.putExtra("isSign",biz.getIsSign());
                             intent2.putExtra("id",biz.getId());
                             intent2.setClass(ETCHandleActivity.this,InformationConfirmedActivity.class);
                             ETCHandleActivity.this.startActivity(intent2);
         }else {
             Bundle bundle = new Bundle();
             bundle.putString("bizContent", JSON.toJSONString(items));
-            bundle.putString("isValueCard",items.getIsValueCard());
+            bundle.putString("isSign",items.getIsSign());
             bundle.putString("type",getIntent().getStringExtra("type"));
 //        bundle.putString("orderId", orderId);
             jumpToPage(FillOutMessage.class,bundle);

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/ETCHandleSonActivity.java

 
 import android.annotation.SuppressLint;
 import android.content.Intent;
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
 import com.huntersun.vkyes.etcopencard.R;
 import com.huntersun.vkyes.etcopencard.databinding.ActivityEtchandleSonBinding;
 import com.huntersun.vkyes.etcopencard.project.api.MyRetrofit;
+import com.huntersun.vkyes.etcopencard.project.api.Result;
 import com.huntersun.vkyes.etcopencard.project.api.bean.EquityBean;
 import com.huntersun.vkyes.etcopencard.project.api.bean.IFCode;
 import com.huntersun.vkyes.etcopencard.project.api.bean.ResultBean;
+import com.huntersun.vkyes.etcopencard.project.tool.MyShared;
 import com.huntersun.vkyes.etcopencard.project.ui.adapter.EquityChooseAdapter;
 import com.huntersun.vkyes.etcopencard.project.utils.FunHelper;
 import com.huntersun.vkyes.etcopencard.project.view.CommonItemDecoration;
 import java.util.List;
 import java.util.Map;
 
+import retrofit2.Response;
+
 /**
  * 订单支付确认页
  *
     private ActivityEtchandleSonBinding binding;
     private EquityChooseAdapter adapter;
     private ArrayList<ResultBean.BizContent> list = new ArrayList<>();
+    private ArrayList<String> equityList = new ArrayList<>();
+    private long totalAmountFee = 0;
+
 
     @Override
     protected View getLayoutView() {
     protected void initView() {
         setTitle("订单支付");
         initRecyclerview();
+        if ("1".equals(getIntent().getStringExtra("isPay"))){
+            binding.tvAddPurchase.setVisibility(View.INVISIBLE);
+        }else {
+            binding.tvAddPurchase.setVisibility(View.VISIBLE);
+        }
         binding.rrelative.getHelper().setBackgroundColorNormalArray(this.getResources().getIntArray(R.array.green_bg_arr));
 
         ResultBean.BizContent biz =
                 JSON.parseObject(getIntent().getStringExtra("bizContent"), ResultBean.BizContent.class);
 
-        if("2".equals(getIntent().getStringExtra("isValueCard"))){//储值卡不签约
+        if("0".equals(getIntent().getStringExtra("isSign"))){//0不签约
             binding.lyQiany.setVisibility(View.GONE);
-        }else {//记账卡签约
+        }else {//1签约
             binding.lyQiany.setVisibility(View.VISIBLE);
         }
 
             public void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {
                 binding.text1.setText(bizContent.getProductName());
 //        binding.text2.setText("基础服务");
+                totalAmountFee += bizContent.product.fee;
                 binding.text3.setText(bizContent.product.productMsg);
                 binding.text4.setText(bizContent.product.fee * 0.01 + "");
-                binding.text6.setText("￥" + bizContent.product.fee * 0.01);
+                binding.text6.setText("￥" + totalAmountFee * 0.01);
                 binding.text5.setText("￥" + bizContent.product.fee * 0.01);
             }
 
                 Intent intent = new Intent();
                 intent.putExtra("orderId",getIntent().getStringExtra("orderId"));
                 intent.putExtra("bizContent",getIntent().getStringExtra("bizContent"));
-                intent.putExtra("isValueCard",getIntent().getStringExtra("isValueCard"));
+                intent.putExtra("isSign",getIntent().getStringExtra("isSign"));
                 if (list.size()>0){
                   intent.putExtra("purchase", JSON.toJSONString(list));
                 }
             @Override
             @SingleClick
             public void onClick(View v) {
-                Intent intent = new Intent();
-                intent.putExtra("orderId", getIntent().getStringExtra("orderId"));
-                intent.putExtra("id", biz.getId() + "");
-                intent.setClass(ETCHandleSonActivity.this, DefrayActivity.class);
-                startActivity(intent);
-                finish();
+                if (equityList.size()>0){
+                    HashMap<String,String> params = new HashMap<>();
+                    params.put("orderId", getIntent().getStringExtra("orderId"));
+                    params.put("openId",(String) MyShared.getInstance().get(MyShared.OPENID,""));
+                    params.put("equityId", TextUtils.join(",",equityList));
+                    params.put("totalAmount",totalAmountFee+"");
+                    params.put("isRepeatPurchase","0");
+                    MyRetrofit.newInstance(IFCode.IFCODE_JGOUCHOOSE, params, new MyRetrofit.ReturnResult() {
+                        @Override
+                        public void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {
+                            Intent intent = new Intent();
+                            intent.putExtra("orderId", getIntent().getStringExtra("orderId"));
+                            intent.putExtra("id", biz.getId() + "");
+                            intent.setClass(ETCHandleSonActivity.this, DefrayActivity.class);
+                            startActivity(intent);
+                            ETCHandleSonActivity.this.finish();
+                        }
+
+                        @Override
+                        public void onError(Response<Result> resp) {
+                            MyRetrofit.ReturnResult.super.onError(resp);
+                        }
+                    });
+                }else {
+                    Intent intent = new Intent();
+                    intent.putExtra("orderId", getIntent().getStringExtra("orderId"));
+                    intent.putExtra("id", biz.getId() + "");
+                    intent.setClass(ETCHandleSonActivity.this, DefrayActivity.class);
+                    startActivity(intent);
+                    ETCHandleSonActivity.this.finish();
+                }
             }
         });
     }
     @Override
     protected void onResume() {
         super.onResume();
-        Log.e("resume","resume1111111111");
-        getData();
     }
 
     private void initRecyclerview() {
         adapter = new EquityChooseAdapter(this, R.layout.item_euqity_2, new EquityChooseAdapter.OnDelClickListener() {
             @Override
             public void onDelClick(View view, int position) {
+                equityList.remove(list.get(position).equityId);
+                totalAmountFee -= list.get(position).discountPrice;
+                binding.text6.setText("￥" + totalAmountFee * 0.01);
                 adapter.remove(position);
                 list.remove(position);
             }
 
     @Override
     protected void initData() {
-        HashMap<String,String> map = new HashMap<>();
         getData();
     }
 
         if (null!=getIntent().getStringExtra("purchase")){
             list.addAll(JSONObject.parseArray(getIntent().getStringExtra("purchase"), ResultBean.BizContent.class));
             Log.e("listSize",list.size()+"");
+            for (ResultBean.BizContent biz : list){
+                totalAmountFee += biz.discountPrice;
+                equityList.add(biz.equityId);
+            }
             adapter.replaceData(list);
         }
     }

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/FillOutMessage.java

                 JSON.parseObject(getIntent().getStringExtra("bizContent"), ResultBean.BizContent.class);
         Map<String, String> params = new HashMap<>();
         params.put("orderId", bizContent1.getOrderId());
-        params.put("productId", bizContent2.getId());
-        MyRetrofit.newInstance(IFCode.IFCODE914, params, new MyRetrofit.ReturnResult() {
+        params.put("promoteId", bizContent2.promoteId);
+        MyRetrofit.newInstance(IFCode.IFCODE_PRODUCT_COMMIT, params, new MyRetrofit.ReturnResult() {
             @Override
             public void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {
                 hideDialog();

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/IdentityInformationUploadActivity.java

     @Permissions({Permission.READ_EXTERNAL_STORAGE, Permission.WRITE_EXTERNAL_STORAGE})
     protected void initView() {
         setTitle("身份证信息上传");
-        if ("2".equals(getIntent().getStringExtra("isValueCard"))){
+        if ("0".equals(getIntent().getStringExtra("isSign"))){
             binding.lyQiany.setVisibility(View.GONE);
         }else {
             binding.lyQiany.setVisibility(View.VISIBLE);
                             intent.putExtra("orderId", getIntent().getStringExtra("orderId")); //车牌号
                             intent.putExtra("vehiclePlateColor", getIntent().getStringExtra("vehiclePlateColor")); //车牌颜色
                             intent.putExtra("type",getIntent().getStringExtra("type"));//车辆类型 1货车 0客车
-                            intent.putExtra("isValueCard",getIntent().getStringExtra("isValueCard"));
+                            intent.putExtra("isSign",getIntent().getStringExtra("isSign"));
                             intent.putExtra("id",getIntent().getStringExtra("id"));
                             intent.putExtra("bizContent",getIntent().getStringExtra("bizContent"));
                             intent.setClass(IdentityInformationUploadActivity.this, VehicleInformationActivity.class);

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/InformationConfirmedActivity.java

                 Bundle bundle = new Bundle();
                 bundle.putString("orderId", getIntent().getStringExtra("orderId"));
                 bundle.putString("bizContent",getIntent().getStringExtra("bizContent"));
-                bundle.putString("isValueCard",getIntent().getStringExtra("isValueCard"));
-                if ("2".equals(getIntent().getStringExtra("isValueCard"))){//储值卡不签约
+                bundle.putString("isSign",getIntent().getStringExtra("isSign"));
+                if ("0".equals(getIntent().getStringExtra("isSign"))){//0不签约 1签约
                     jumpToPage(AddPurchaseChooseActivity.class,bundle);
                     finish();
                 }else {//1记账卡签约

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/SignUpActivity.java

 import com.huntersun.vkyes.etcopencard.project.api.bean.ResultBean;
 import com.huntersun.vkyes.etcopencard.project.view.CommonItemDecoration;
 import com.huntersun.vkyes.etcopencard.src.app.AppActivity;
+import com.ruffian.library.widget.RRelativeLayout;
 
 import java.util.ArrayList;
 import java.util.List;
                     Bundle bundle = new Bundle();
                     bundle.putString("orderId", getIntent().getStringExtra("orderId"));
                     bundle.putString("bizContent",getIntent().getStringExtra("bizContent"));
-                    bundle.putString("isValueCard",getIntent().getStringExtra("isValueCard"));
+                    bundle.putString("isSign",getIntent().getStringExtra("isSign"));
                     jumpToPage(ContractActivity.class,bundle);
                     finish();
                 }
     BaseQuickAdapter<EquityBean, BaseViewHolder> adapter = new BaseQuickAdapter<EquityBean, BaseViewHolder>(R.layout.item_sign_up_bank) {
         @Override
         protected void convert(@NonNull BaseViewHolder holder, EquityBean equityBean) {
+            RRelativeLayout rly = holder.getView(R.id.rly_pay);
+            rly.getHelper().setBackgroundColorNormalArray(SignUpActivity.this.getResources().getIntArray(R.array.green_bg_arr));
             holder.addOnClickListener(R.id.btn_sign);
         }
     };

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/VehicleInformationActivity.java

     @Override
     protected void initView() {
         setTitle("车辆信息上传");
-        if ("2".equals(getIntent().getStringExtra("isValueCard"))){
+        if ("0".equals(getIntent().getStringExtra("isSign"))){
             binding.lyQiany.setVisibility(View.GONE);
         }else {
             binding.lyQiany.setVisibility(View.VISIBLE);
             intent.putExtra("orderId", getIntent().getStringExtra("orderId"));
             intent.putExtra("type",getIntent().getStringExtra("type"));
             intent.putExtra("id",getIntent().getStringExtra("id"));
-            intent.putExtra("isValueCard",getIntent().getStringExtra("isValueCard"));//2是储值卡1记账卡
+            intent.putExtra("isSign",getIntent().getStringExtra("isSign"));//0不需要 1需要签约
             intent.putExtra("bizContent",getIntent().getStringExtra("bizContent"));
             intent.setClass(VehicleInformationActivity.this, InformationConfirmedActivity.class);
             startActivity(intent);

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/order/OrderUtils.java

 import com.huntersun.vkyes.etcopencard.project.copapply.ObuActivateRequester;
 import com.huntersun.vkyes.etcopencard.project.copapply.ObuActivation;
 import com.huntersun.vkyes.etcopencard.project.dialog.ConfirmDialog;
+import com.huntersun.vkyes.etcopencard.project.ui.activity.DefrayActivity;
 import com.huntersun.vkyes.etcopencard.project.ui.activity.ETCHandleActivity;
 import com.huntersun.vkyes.etcopencard.project.ui.activity.ETCHandleSonActivity;
 import com.huntersun.vkyes.etcopencard.project.ui.activity.FillOutMessage;
                     btnCancelOrder.setVisibility(View.VISIBLE);
                     btnConfirmInfo.setVisibility(View.VISIBLE);
                     break;
-                case Constants.ORDER_STATUS_WAIT_PAY://完成签约。待支付
+//                case Constants.ORDER_STATUS_WAIT_PAY://完成签约。待支付
+//                    LLBtns.setVisibility(View.VISIBLE);
+//                    btnPay.setVisibility(View.VISIBLE);
+//                    btnCancelOrder.setVisibility(View.VISIBLE);
+//                    break;
+                case Constants.ORDER_STATUS_ALREADY_CODE://生成二维码。待支付
                     LLBtns.setVisibility(View.VISIBLE);
                     btnPay.setVisibility(View.VISIBLE);
                     btnCancelOrder.setVisibility(View.VISIBLE);
                 intent.putExtra("vehiclePlateColor", orderData.getVehiclePlateColor() + ""); //车牌颜色
                 intent.putExtra("type", orderData.getType()); //根据不同的车牌类型进行传参(车型) 0 客车 1 货车
                 intent.putExtra("orderId", orderData.getOrderId() + ""); //订单号
-                intent.putExtra("isValueCard",orderData.getIsValueCard());//1记账卡 2储值卡
+                intent.putExtra("isSign",orderData.getIsSign());//1记账卡 2储值卡
                 intent.putExtra("id",orderData.getId());//订单Id
                 intent.putExtra("bizContent",JSON.toJSONString(orderData));
                 if (null==orderData.getProductId()||"".equals(orderData.getProductId())){//未绑定成功订单，重新跳转绑定
                 intent.putExtra("vehiclePlateColor", orderData.getVehiclePlateColor() + ""); //车牌颜色
                 intent.putExtra("type", orderData.getType()); //根据不同的车牌类型进行传参(车型) 0 客车 1 货车
                 intent.putExtra("orderId", orderData.getOrderId() + ""); //订单号
-                intent.putExtra("isValueCard",orderData.getIsValueCard());//1记账卡 2储值卡
+                intent.putExtra("isSign",orderData.getIsSign());//1记账卡 2储值卡
                 intent.putExtra("id",orderData.getId());//订单Id
                 intent.putExtra("bizContent",JSON.toJSONString(orderData));
                 if (null==orderData.getProductId()||"".equals(orderData.getProductId())){//未绑定成功订单，重新跳转绑定
                 intent.putExtra("type",orderData.getType());
                 intent.putExtra("orderId",orderData.getOrderId());
                 intent.putExtra("bizContent",JSON.toJSONString(orderData));
-                intent.putExtra("isValueCard",orderData.getIsValueCard());
+                intent.putExtra("isSign",orderData.getIsSign());
                 intent.putExtra("id",orderData.getId());
                 Log.e("biz~~~~~~~~~~~~",orderData.getId());
                 if (null==orderData.getProductId()||"".equals(orderData.getProductId())){//未绑定成功订单，重新跳转绑定
                 if (orderData.product != null) {
                     productBean.setProductMsg(orderData.product.productMsg);
                     productBean.setFee(orderData.product.fee);
-                    productBean.setIsValueCard(orderData.getIsValueCard());
+                    productBean.setIsSign(orderData.getIsSign());
                 }
                 Bundle bundle = new Bundle();
                 bundle.putString("bizContent", JSON.toJSONString(productBean));
                 bundle.putString("orderId", orderData.getOrderId());
-
+                bundle.putString("id", orderData.getId() + "");
+                bundle.putString("isPay","1");
                 Intent intent = new Intent();
                 if (null==orderData.getProductId()||"".equals(orderData.getProductId())){//未绑定成功订单，重新跳转绑定
                     intent.setClass(context,ETCHandleActivity.class);
         bundle.putString("cardId", FunHelper.isEmpty(orderData.getCardId()) ? "" : orderData.getCardId());
         bundle.putString("obuId", FunHelper.isEmpty(orderData.getObuId()) ? "" : orderData.getObuId());
         bundle.putString("type", FunHelper.isEmpty(orderData.getTowing()) ? "" : orderData.getTowing());
-        bundle.putString("isValueCard", FunHelper.isEmpty(orderData.getIsValueCard()) ? "" : orderData.getIsValueCard());
+        bundle.putString("isSign", FunHelper.isEmpty(orderData.getIsSign()) ? "" : orderData.getIsSign());
 
         Intent intent = new Intent();
         intent.setClass(context, activityClass);

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/adapter/EquityChooseAdapter.java

 
 import android.app.Activity;
 import android.content.Context;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CompoundButton;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
     protected void convert(@NonNull BaseViewHolder helper, ResultBean.BizContent item) {
         helper.setText(R.id.equity_title, item.getProductName());//权益
         helper.setText(R.id.tv_money_num, item.discountPrice * 0.01 + "");//金额
+        helper.setText(R.id.tv_productIntro,item.productIntro);
         RecyclerView recyclerView = helper.getView(R.id.recycler);
+        ImageView img = helper.getView(R.id.img1);
         if (null != item.getChildren()) {
+            img.setVisibility(View.VISIBLE);
             LinearLayout ly = helper.getView(R.id.ly_tb);
             LinearLayoutManager layoutManager = new LinearLayoutManager(context, RecyclerView.VERTICAL, false) {
                 @Override
                 @Override
                 public void onClick(View view) {
                     if (recyclerView.getVisibility() == View.VISIBLE) {
+                        img.setImageResource(R.mipmap.icon_down_grey);
                         recyclerView.setVisibility(View.GONE);
                     } else {
+                        img.setImageResource(R.mipmap.icon_up_grey);
                         recyclerView.setVisibility(View.VISIBLE);
                     }
                 }
             });
+        }else {
+            img.setVisibility(View.INVISIBLE);
         }
         RCheckBox rcb = helper.getView(R.id.cb_equity);
         TextView tvDelete = helper.getView(R.id.tv_delete);
 
         //点击事件处理
         if (null != tvDelete && null != leftSlideView && null != lyContent) {
+//            leftSlideView.setOnTouchListener(new View.OnTouchListener() {
+//                @Override
+//                public boolean onTouch(View view, MotionEvent motionEvent) {
+//                    return true;
+//                }
+//            });
             RelativeLayout relativeLayout = (RelativeLayout) leftSlideView.findViewById(R.id.rly_relative);
             RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) relativeLayout.getLayoutParams();
             params.width = (int) (getScreenWidth() - dpToPx(30f, context));

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/adapter/MenuListAdapter.java

         mRecycleView.setNestedScrollingEnabled(false);
         mRecycleView.setLayoutManager(new GridLayoutManager(mContext,5));
         mRecycleView.setAdapter(itemAdapter);
-        itemAdapter.replaceData(bizContent.subMenus);
+        itemAdapter.replaceData(bizContent.getChildren());
     }
 }

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/fragment/FragmentHomeTow.java

 
 import android.os.Build;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import com.huntersun.vkyes.etcopencard.R;
 import com.huntersun.vkyes.etcopencard.databinding.FragmentHomeFiveBinding;
 import com.huntersun.vkyes.etcopencard.project.api.MyRetrofit;
+import com.huntersun.vkyes.etcopencard.project.api.Result;
 import com.huntersun.vkyes.etcopencard.project.api.bean.IFCode;
 import com.huntersun.vkyes.etcopencard.project.api.bean.ResultBean;
 import com.huntersun.vkyes.etcopencard.project.api.bean.TestBean;
 
 import androidx.annotation.RequiresApi;
 
+import retrofit2.Response;
+
 /**
  * 工作台管理
  * 路由定义详见 项目 -> README.md -> 页面路由
         MyRetrofit.newInstance(IFCode.IFCODE1032, params, new MyRetrofit.ReturnResult() {
             @Override
             public void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent1) {
+                Log.e("11111111111111111111",resultBean.toString());
                 dataJson = JSON.toJSONString(bizContent1);
                 menuList = bizContent1.menuList;
                 setData(menuList);
             }
+
+            @Override
+            public void onError(Response<Result> resp) {
+                MyRetrofit.ReturnResult.super.onError(resp);
+                Log.e("2222222222",resp.toString());
+            }
         });
     }
 

app/src/main/java/com/huntersun/vkyes/etcopencard/project/utils/Constants.java

     public static final int ORDER_STATUS_RETURN_MONEY_SUCCESS = 16; //退款成功
     public static final int ORDER_STATUS_RETURN_GOODS_SUCCESS = 17; //退货成功
     public static final int ORDER_STATUS_EX_RECOVER = 18; //换货-设备已回收
+    public static final int ORDER_STATUS_ALREADY_CODE = 26; //已经生成二维码但未支付
 
 
     //******************************欠费补缴类型********************************//

app/src/main/res/drawable-v2/shape_g3_b2_bg.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape android:shape="rectangle" xmlns:android="http://schemas.android.com/apk/res/android">
+  <gradient android:type="linear" android:startColor="@color/green03" android:endColor="@color/blue02" android:centerX="0.5"/>
+    <corners android:radius="@dimen/dp_10"/>
+</shape>

app/src/main/res/layout-v5/item_equity_1.xml

 <com.ruffian.library.widget.RRelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    app:background_normal="@color/green04"
+    app:background_normal="@color/white"
     app:corner_radius="@dimen/dp_10"
     android:layout_height="wrap_content">
     <RelativeLayout
         <com.ruffian.library.widget.RLinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:background_normal="@color/green05"
             android:padding="@dimen/dp_8"
             android:layout_marginRight="@dimen/dp_15"
             android:layout_marginLeft="@dimen/dp_15"
             android:layout_marginBottom="@dimen/dp_15"
+            android:layout_marginTop="@dimen/dp_5"
+            android:gravity="center"
             android:layout_alignTop="@+id/equity_title"
             android:id="@+id/ly_tb"
             app:corner_radius="@dimen/dp_20"
             android:orientation="vertical">
             <ImageView
-                android:layout_width="@dimen/dp_24"
-                android:layout_height="@dimen/dp_24"
+                android:layout_width="@dimen/dp_14"
+                android:layout_height="@dimen/dp_14"
                 android:id="@+id/img1"
-                android:src="@mipmap/ic_car_stopping"/>
+                android:visibility="invisible"
+                android:src="@mipmap/icon_down_grey"/>
         </com.ruffian.library.widget.RLinearLayout>
         <ImageView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="64停车卷"
             android:textSize="@dimen/sp_13"
+            android:textColor="@color/black"
             android:layout_toRightOf="@+id/img_dash"
             android:layout_marginLeft="@dimen/dp_15"
             android:layout_marginTop="@dimen/dp_15"
             android:layout_marginTop="@dimen/dp_5"
             android:layout_below="@+id/equity_title"
             android:textSize="@dimen/sp_16"
+            android:textColor="@color/black"
             android:id="@+id/tv_money_icon"
             android:text="￥"/>
         <TextView
             android:layout_toRightOf="@+id/tv_money_icon"
             android:layout_alignTop="@+id/tv_money_icon"
             android:textSize="@dimen/sp_16"
+            android:textColor="@color/black"
             android:id="@+id/tv_money_num"
             android:text="44.00"/>
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_toRightOf="@+id/tv_money_num"
+            android:layout_alignBaseline="@+id/tv_money_num"
+            android:textSize="@dimen/sp_14"
+            android:layout_marginLeft="@dimen/dp_10"
+            android:singleLine="true"
+            android:ellipsize="end"
+            android:maxEms="7"
+            android:textColor="@color/black"
+            android:id="@+id/tv_productIntro"
+            android:text="44.00"/>
         <com.ruffian.library.widget.RCheckBox
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/cb_equity"
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
-            app:background_normal="@color/green04"
+            app:background_normal="@color/transparent"
             app:icon_normal_left="@drawable/compound_normal_ic"
             app:icon_checked_left="@drawable/checkbox_checked_ic"
             android:layout_marginRight="@dimen/dp_15"/>

app/src/main/res/layout-v5/item_equity_child_1.xml

     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/dp_90"
+        android:layout_marginLeft="@dimen/dp_80"
         android:text="名称"
+        android:textColor="@color/black"
         android:textSize="@dimen/sp_12"
         android:id="@+id/tv_child_product_name"/>
     <TextView
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/dp_5"
         android:text="30"
+        android:textColor="@color/black"
         android:textSize="@dimen/sp_12"
         android:id="@+id/tv_child_product_price"/>
 </LinearLayout>

app/src/main/res/layout-v5/item_euqity_2.xml

     android:layout_height="wrap_content">
 <com.ruffian.library.widget.RRelativeLayout
     android:layout_width="match_parent"
-    app:background_normal="@color/green04"
+    app:background_normal="@color/white"
     app:corner_radius="@dimen/dp_10"
     android:layout_height="wrap_content">
     <com.ruffian.library.widget.RTextView
             <com.ruffian.library.widget.RLinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                app:background_normal="@color/green05"
                 android:padding="@dimen/dp_8"
                 android:layout_marginRight="@dimen/dp_15"
                 android:layout_marginLeft="@dimen/dp_15"
                 android:layout_marginBottom="@dimen/dp_15"
+                android:layout_marginTop="@dimen/dp_5"
+                android:gravity="center"
                 android:layout_alignTop="@+id/equity_title"
                 android:id="@+id/ly_tb"
                 app:corner_radius="@dimen/dp_20"
                 android:orientation="vertical">
                 <ImageView
-                    android:layout_width="@dimen/dp_24"
-                    android:layout_height="@dimen/dp_24"
+                    android:layout_width="@dimen/dp_14"
+                    android:layout_height="@dimen/dp_14"
                     android:id="@+id/img1"
-                    android:src="@mipmap/ic_car_stopping"/>
+                    android:visibility="invisible"
+                    android:src="@mipmap/icon_down_grey"/>
             </com.ruffian.library.widget.RLinearLayout>
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="64停车卷"
+                android:textColor="@color/black"
                 android:textSize="@dimen/sp_13"
                 android:layout_toRightOf="@+id/img_dash"
                 android:layout_marginLeft="@dimen/dp_15"
                 android:layout_marginTop="@dimen/dp_5"
                 android:layout_below="@+id/equity_title"
                 android:textSize="@dimen/sp_16"
+                android:textColor="@color/black"
                 android:id="@+id/tv_money_icon"
                 android:text="￥"/>
             <TextView
                 android:layout_alignTop="@+id/tv_money_icon"
                 android:textSize="@dimen/sp_16"
                 android:id="@+id/tv_money_num"
+                android:textColor="@color/black"
+                android:text="44.00"/>
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_toRightOf="@+id/tv_money_num"
+                android:layout_alignBaseline="@+id/tv_money_num"
+                android:textSize="@dimen/sp_14"
+                android:layout_marginLeft="@dimen/dp_10"
+                android:singleLine="true"
+                android:ellipsize="end"
+                android:maxEms="7"
+                android:textColor="@color/black"
+                android:id="@+id/tv_productIntro"
                 android:text="44.00"/>
             <com.ruffian.library.widget.RCheckBox
                 android:layout_width="wrap_content"

app/src/main/res/layout-v5/item_sign_up_bank.xml

     xmlns:app="http://schemas.android.com/apk/res-auto"
     app:corner_radius="@dimen/dp_10"
     xmlns:tools="http://schemas.android.com/tools"
-    app:background_normal="@color/blue02"
+    android:id="@+id/rly_pay"
+    app:gradient_type="linear"
+    app:gradient_orientation="LEFT_RIGHT"
+    app:gradient_centerX="0.5"
+    app:gradient_radius="@dimen/dp_10"
     android:layout_height="wrap_content">
     <ImageView
         android:layout_width="@dimen/dp_50"
         android:layout_height="@dimen/dp_50"
-        android:background="@color/white"
+        android:src="@mipmap/we_chat"
         android:layout_marginLeft="@dimen/dp_12"
         android:layout_centerVertical="true"
         android:id="@+id/img_sign"/>
         android:layout_below="@+id/tv_sign_info"
         tools:text="微信代付"
         android:text="微信代付"
-        app:background_normal="@color/blue"
+        app:background_normal="@color/green02"
         android:id="@+id/tv_sign_name"
         app:corner_radius="@dimen/dp_3"
         android:padding="@dimen/dp_3"
         tools:text="微信便捷支付"
         android:text="微信便捷支付"
         app:corner_radius="@dimen/dp_3"
-        app:background_normal="@color/blue"
+        app:background_normal="@color/green02"
         android:id="@+id/tv_sign_remark"
         android:padding="@dimen/dp_3"
         android:layout_marginLeft="@dimen/dp_5"

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

     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/background_color"
     android:orientation="vertical">
 
     <com.hjq.bar.TitleBar
         android:layout_height="wrap_content"
         android:background="@drawable/video_ball_bg12"
         android:id="@+id/title"
+        app:title="选择加购权益"
         app:leftIcon="@mipmap/back_three"
         app:lineVisible="false"
         app:titleColor="#FFFFFF" />

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

     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/background_color"
     android:orientation="vertical">
 
     <com.hjq.bar.TitleBar
                     android:textColor="@color/white"
                     android:layout_marginLeft="@dimen/dp_7"
                     android:id="@+id/text1"/>
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignLeft="@+id/text1"
-                    android:text="先通行后付费！"
-                    android:textColor="@color/white"
-                    android:layout_marginTop="@dimen/dp_5"
-                    android:id="@+id/tv_xtx"
-                    android:layout_below="@+id/text1"
-                    android:textSize="@dimen/sp_10"/>
+<!--                <TextView-->
+<!--                    android:layout_width="wrap_content"-->
+<!--                    android:layout_height="wrap_content"-->
+<!--                    android:layout_alignLeft="@+id/text1"-->
+<!--                    android:text="先通行后付费！"-->
+<!--                    android:textColor="@color/white"-->
+<!--                    android:layout_marginTop="@dimen/dp_5"-->
+<!--                    android:id="@+id/tv_xtx"-->
+<!--                    android:layout_below="@+id/text1"-->
+<!--                    android:textSize="@dimen/sp_10"/>-->
                 <TextView
                     android:id="@+id/text3"
                     android:textColor="@color/white"
                     android:textSize="@dimen/sp_10"
-                    android:layout_below="@id/tv_xtx"
-                    android:layout_alignLeft="@+id/tv_xtx"
+                    android:layout_below="@id/text1"
+                    android:layout_alignLeft="@+id/text1"
                     android:layout_marginTop="@dimen/dp_5"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"