畅游通核销app: 1.修复全检的上传数量 2.身份证和扫二维码检票数据显示问题

杜方
1 parent efb28bd0
Showing 3 changed files with 54 additions and 18 deletions
src/com/ectrip/cyt/center/CenterHandle.java
src/com/ectrip/cyt/ui/IDOrderListActivity.java
src/com/ectrip/cyt/ui/QRCodeOrderListActivity.java
@@ -114,6 +114,7 @@ public class CenterHandle {
      * @param pwd
      * @param verifyPassword
      */
+    String allQuantity;
     public void allTicket(int position, String pwd, String verifyPassword) {
         isAll = true;
         getConsumedSeq(position);
@@ -122,13 +123,14 @@ public class CenterHandle {
         productOfConsumeOrders = new ArrayList<>();
         for (int i = 0; i < products.size(); i++) {
             Integer base = new Integer(products.get(i).getBaseQuantity()) * totle;
+            allQuantity = products.get(i).getQuantity();
             ProductOfConsumeOrder consumeOrder = new ProductOfConsumeOrder(products.get(i).getProductId(), base);
             productOfConsumeOrders.add(consumeOrder);
         }
         HttpHelper.getInstance(context).consumeOrder(
                 orderInfos.get(position).getOrderId(),
-                orderInfos.get(position).getOrderAmount(), pwd, verifyPassword,
+                allQuantity, pwd, verifyPassword,
                 consumedSeq, productOfConsumeOrders,
                 new CenterConsumeCallback(position, true, 0));
     }
@@ -369,7 +371,7 @@ public class CenterHandle {
                 if (isAll) {
                     HttpHelper.getInstance(context).consumeOrder(
                             orderInfos.get(position).getOrderId(),
-                            orderInfos.get(position).getOrderAmount(), password, verifyPassword,
+                            allQuantity, password, verifyPassword,
                             consumedSeq, productOfConsumeOrders,
                             new CenterConsumeCallback(position, true, 0));
                 } else {
@@ -432,7 +434,7 @@ public class CenterHandle {
                     if (isAll) {
                         HttpHelper.getInstance(context).consumeOrder(
                                 orderInfos.get(position).getOrderId(),
-                                orderInfos.get(position).getOrderAmount(), password, verifyPassword,
+                                allQuantity, password, verifyPassword,
                                 consumedSeq, productOfConsumeOrders,
                                 new CenterConsumeCallback(position, true, 0));
                     } else {
@@ -36,6 +36,7 @@ import com.ectrip.cyt.constant.DeviceType;
 import com.ectrip.cyt.constant.OrderCode;
 import com.ectrip.cyt.constant.SelectAction;
 import com.ectrip.cyt.response.PassengerInfosBean;
+import com.ectrip.cyt.response.ProductInfoQuery;
 import com.ectrip.cyt.response.QueryOrderResponse;
 import com.ectrip.cyt.utils.LogUtil;
 import com.ectrip.cyt.utils.SharedPreferences2Obj;
@@ -441,20 +442,38 @@ public class IDOrderListActivity extends BaseActivity implements
 //				String[] str = list.toArray(new String[0]);
 //				centerHandle.showDialog(str);
 				LogUtil.d("IDOrderListActivity","idcardNumber = "+idcardNumber);
-				List<PassengerInfosBean> passengerInfosBeans = orderInfos.get(position).getProducts().get(position).getPassengerInfos();
-				for (PassengerInfosBean bean : passengerInfosBeans){
-					if(idcardNumber.equals(bean.getCredentials())){
-						LogUtil.d("IDOrderListActivity","getCredentials1 = "+bean.getCredentials());
-						if("ID_CARD".equals(bean.getCredentialsType())){
-							LogUtil.d("IDOrderListActivity","getCredentialsType = "+bean.getCredentialsType());
-							centerHandle.partTicket(position, pwd, "TRUE",bean.getCredentials(),true);
-						}else{
-							centerHandle.partTicket(position, pwd, "TRUE",bean.getVoucher(),false);
-						}
+				List<ProductInfoQuery> products = orderInfos.get(position).getProducts();
+				for (int i = 0; i < products.size(); i++) {
+					List<PassengerInfosBean> passengerInfosBeans = products.get(i).getPassengerInfos();
+					for (PassengerInfosBean bean : passengerInfosBeans){
+						if(idcardNumber.equals(bean.getCredentials())){
+							LogUtil.d("IDOrderListActivity","getCredentials1 = "+bean.getCredentials());
+							if("ID_CARD".equals(bean.getCredentialsType())){
+								LogUtil.d("IDOrderListActivity","getCredentialsType = "+bean.getCredentialsType());
+								centerHandle.partTicket(position, pwd, "TRUE",bean.getCredentials(),true);
+							}else{
+								centerHandle.partTicket(position, pwd, "TRUE",bean.getVoucher(),false);
+							}
+
+						}
 					}
 				}
+//				List<PassengerInfosBean> passengerInfosBeans = orderInfos.get(position).getProducts().get(position).getPassengerInfos();
+//				for (PassengerInfosBean bean : passengerInfosBeans){
+//					if(idcardNumber.equals(bean.getCredentials())){
+//						LogUtil.d("IDOrderListActivity","getCredentials1 = "+bean.getCredentials());
+//						if("ID_CARD".equals(bean.getCredentialsType())){
+//							LogUtil.d("IDOrderListActivity","getCredentialsType = "+bean.getCredentialsType());
+//							centerHandle.partTicket(position, pwd, "TRUE",bean.getCredentials(),true);
+//						}else{
+//							centerHandle.partTicket(position, pwd, "TRUE",bean.getVoucher(),false);
+//						}
+//
+//					}
+//				}
+
 			} catch (NumberFormatException e) {
 				e.printStackTrace();
 			}
@@ -29,6 +29,7 @@ import com.ectrip.cyt.constant.DeviceType;
 import com.ectrip.cyt.constant.OrderCode;
 import com.ectrip.cyt.constant.SelectAction;
 import com.ectrip.cyt.response.PassengerInfosBean;
+import com.ectrip.cyt.response.ProductInfoQuery;
 import com.ectrip.cyt.response.QueryOrderResponse;
 import com.ectrip.cyt.utils.LogUtil;
 import com.ectrip.cyt.utils.SharedPreferences2Obj;
@@ -274,13 +275,27 @@ public class QRCodeOrderListActivity extends BaseActivity implements ListOnclick
                             "FALSE", QRCodeOrderListActivity.this);
                 }
 //				centerHandle.dialog(Integer.parseInt(orderInfos.get(position).getOrderAmount()), position);
-                List<PassengerInfosBean> passengerInfosBeans = orderInfos.get(position).getProducts().get(position).getPassengerInfos();
-                for (PassengerInfosBean bean : passengerInfosBeans) {
-                    if (orid.equals(bean.getVoucher())) {
-                        LogUtil.d("IDOrderListActivity", "getVoucher = " + bean.getVoucher());
-                        centerHandle.partTicket(position, "", "TRUE", bean.getVoucher(), false);
+
+
+                List<ProductInfoQuery> products = orderInfos.get(position).getProducts();
+                for (int i = 0; i < products.size(); i++) {
+                    List<PassengerInfosBean> passengerInfosBeans = products.get(i).getPassengerInfos();
+                    for (PassengerInfosBean bean : passengerInfosBeans){
+                        if (orid.equals(bean.getVoucher())) {
+                            LogUtil.d(TAG, "getVoucher = " + bean.getVoucher());
+                            centerHandle.partTicket(position, "", "TRUE", bean.getVoucher(), false);
+                        }
                     }
                 }
+
+
+//                List<PassengerInfosBean> passengerInfosBeans = orderInfos.get(position).getProducts().get(position).getPassengerInfos();
+//                for (PassengerInfosBean bean : passengerInfosBeans) {
+//                    if (orid.equals(bean.getVoucher())) {
+//                        LogUtil.d("IDOrderListActivity", "getVoucher = " + bean.getVoucher());
+//                        centerHandle.partTicket(position, "", "TRUE", bean.getVoucher(), false);
+//                    }
+//                }
             } catch (NumberFormatException e) {
                 e.printStackTrace();
             }