From a44c47bc7f37245612635866adaddf5c98d41747 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 16 八月 2024 11:03:49 +0800
Subject: [PATCH] 添加补打逻辑 联调修复bug

---
 qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/NewCardActivity.java |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/NewCardActivity.java b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/NewCardActivity.java
index dd324a9..0eec837 100644
--- a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/NewCardActivity.java
+++ b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/NewCardActivity.java
@@ -74,7 +74,7 @@
     }
 
     private void initView() {
-        newCardBinding.newCardName.setFilters(new InputFilter[]{new ChineseInputFilter()});
+//        newCardBinding.newCardName.setFilters(new InputFilter[]{new ChineseInputFilter()});
         newCardBinding.newCardId.setFilters(new InputFilter[]{new AlphaNumericXFilter(), new InputFilter.LengthFilter(18)});
         //韬唤璇佽瘑鍒�
         newCardBinding.newCardScanBtn.setOnClickListener(new View.OnClickListener() {
@@ -94,7 +94,7 @@
             if (!TextUtils.isEmpty(userName)
                     && !TextUtils.isEmpty(phone) && !TextUtils.isEmpty(userID)
             ) {
-                if (userName.length() <= 1 || !validateName(userName)) {
+                if (userName.length() <= 1) {
                     TipUtil.show(NewCardActivity.this, "璇疯緭鍏ユ纭鍚�");
                 } else if (phone.length() < 11 || !isValidPhoneNumber(phone)) {
                     TipUtil.show(NewCardActivity.this, "璇疯緭鍏ユ纭墜鏈哄彿");
@@ -311,7 +311,7 @@
         data.put("peasantIdNumber", peasantIdNumber);
         data.put("current", 1);
         data.put("pageSize", 10);
-        ApiManager.getInstance().requestPostLoading(this, "api/sjgg/base/peasant/pagePeasantVo", UserListResult.class, data, new SubscriberListener<BaseResponse<UserListResult>>() {
+        ApiManager.getInstance().requestPostLoading(this, "base/peasant/pagePeasantVo", UserListResult.class, data, new SubscriberListener<BaseResponse<UserListResult>>() {
             @Override
             public void onNext(BaseResponse<UserListResult> t) {
                 if (t.isSuccess()) {
@@ -320,9 +320,9 @@
                             addUser(peasantIdNumber, peasantPhone, peasantName, QHOnLineApplication.getInstance().planId, morny);
                         }
                     } else {
-                        startNFCWreatActivity(peasantIdNumber, peasantPhone, peasantName, t.getData().getRecords().get(0).getPeasantId(), morny);
+                        startNFCWreatActivity(peasantIdNumber, t.getData().getRecords().get(0).getPeasantPhone(), t.getData().getRecords().get(0).getPeasantName(), t.getData().getRecords().get(0).getPeasantId(), morny);
                     }
-                }else {
+                } else {
                     ToastUtil.show(t.getMsg());
                 }
             }
@@ -339,7 +339,7 @@
         userCard.setSurplusElecticity(0);
         userCard.setTotalMorny(0);
         userCard.setRechargeDate(Calendar.getInstance());
-
+        userCard.setElectricPrice(Float.valueOf(QHOnLineApplication.getInstance().electriclePriceStr));
         UserCardBean userCardBean = new UserCardBean();
 
         userCardBean.setUserName(peasantName);
@@ -379,12 +379,12 @@
         data.put("peasantCode", "");
         data.put("peasantName", peasantName);
         data.put("peasantPhone", peasantPhone);
-        ApiManager.getInstance().requestPostLoading(this, "api/sjgg/base/peasant/savePeasant", AddUserResult.class, data, new SubscriberListener<BaseResponse<AddUserResult>>() {
+        ApiManager.getInstance().requestPostLoading(this, "base/peasant/savePeasant", AddUserResult.class, data, new SubscriberListener<BaseResponse<AddUserResult>>() {
             @Override
             public void onNext(BaseResponse<AddUserResult> t) {
                 if (t.isSuccess()) {
-                    startNFCWreatActivity(peasantIdNumber, peasantPhone, peasantName, t.getData().getPeasantId(), morny);
-                }else {
+                    startNFCWreatActivity(peasantIdNumber, t.getData().getPeasantPhone(), t.getData().getPeasantName(), t.getData().getPeasantId(), morny);
+                } else {
                     ToastUtil.show(t.getMsg());
                 }
             }

--
Gitblit v1.8.0