微信支付成功

TOP_Pay/app/src/main/java/com/ifavine/pay/adapter/LocalRecordReportAdapter.java

+package com.ifavine.pay.adapter;
+
+import android.content.Context;
+import android.widget.TextView;
+
+import com.ifavine.pay.R;
+import com.ifavine.pay.ui.base.ListBaseAdapter;
+import com.ifavine.pay.ui.base.SuperViewHolder;
+import com.ifavine.pay.vo.LocalRecordReport;
+import com.ifavine.pay.vo.MonthRecordReport;
+
+/**
+ * Created by Administrator on 2018/10/25.
+ */
+
+public class LocalRecordReportAdapter extends ListBaseAdapter<LocalRecordReport> {
+
+
+    public LocalRecordReportAdapter(Context context) {
+        super(context);
+    }
+
+
+    @Override
+    public int getLayoutId() {
+        return R.layout.item_local_report;
+    }
+
+    @Override
+    public void onBindItemHolder(SuperViewHolder holder, final int position) {
+        LocalRecordReport q = mDataList.get(position);
+
+        TextView V_no = holder.getView(R.id.V_no);
+        TextView V_AllowanceAmount = holder.getView(R.id.V_AllowanceAmount);
+        TextView V_CanteenName = holder.getView(R.id.V_CanteenName);
+        TextView V_Consumption = holder.getView(R.id.V_Consumption);
+        TextView V_ConsumptionDate = holder.getView(R.id.V_ConsumptionDate);
+        TextView V_Department = holder.getView(R.id.V_Department);
+        TextView V_DinnerAmount = holder.getView(R.id.V_DinnerAmount);
+        TextView V_DinnerType = holder.getView(R.id.V_DinnerType);
+        TextView V_EmpName = holder.getView(R.id.V_EmpName);
+        TextView V_EmpNo = holder.getView(R.id.V_EmpNo);
+        TextView V_Post = holder.getView(R.id.V_Post);
+        TextView V_Remark = holder.getView(R.id.V_Remark);
+        TextView V_TransactionNo = holder.getView(R.id.V_TransactionNo);
+        TextView V_WindowName = holder.getView(R.id.V_WindowName);
+        V_no.setText((position + 1) + "");
+        V_AllowanceAmount.setText(q.AllowanceAmount);
+        V_CanteenName.setText(q.CanteenName);
+        V_Consumption.setText(q.Consumption);
+        V_ConsumptionDate.setText(q.ConsumptionDate);
+        V_Department.setText(q.Department);
+        V_DinnerAmount.setText(q.DinnerAmount);
+        V_DinnerType.setText(q.DinnerType);
+        V_EmpName.setText(q.EmpName);
+        V_EmpNo.setText(q.EmpNo);
+        V_Post.setText(q.Post);
+        V_Remark.setText(q.Remark);
+        V_TransactionNo.setText(q.TransactionNo);
+        V_WindowName.setText(q.WindowName);
+    }
+}

TOP_Pay/app/src/main/java/com/ifavine/pay/api/APIService.java

@@ -4,6 +4,8 @@ package com.ifavine.pay.api;
 import com.ifavine.pay.vo.CanteenWindow;
 import com.ifavine.pay.vo.CommonListResponse;
 import com.ifavine.pay.vo.CommonResponse;
+import com.ifavine.pay.vo.LocalRecordReport;
+import com.ifavine.pay.vo.MonthRecordReport;
 import com.ifavine.pay.vo.User;
 import com.ifavine.pay.vo.WindowCostAmount;
 
@@ -32,11 +34,11 @@ public abstract interface APIService {
 
 
     @POST("WebChat/GetLocalRecordReport")
-    Call<CommonResponse<String>> GetLocalRecordReport(@Body RequestBody info);
+    Call<CommonListResponse<LocalRecordReport>> GetLocalRecordReport(@Body RequestBody info);
 
 
     @POST("WebChat/GetMonthRecordReport")
-    Call<CommonResponse<String>> GetMonthRecordReport(@Body RequestBody info);
+    Call<CommonListResponse<MonthRecordReport>> GetMonthRecordReport(@Body RequestBody info);
 
 
     @POST("WebChat/GetConsumRecordReport")

TOP_Pay/app/src/main/java/com/ifavine/pay/api/APIWrapper.java

 package com.ifavine.pay.api;
 
 
+import android.text.TextUtils;
+
 import com.ifavine.pay.vo.CanteenWindow;
 import com.ifavine.pay.vo.CommonListResponse;
 
 import com.ifavine.pay.vo.CommonResponse;
+import com.ifavine.pay.vo.LocalRecordReport;
+import com.ifavine.pay.vo.MonthRecordReport;
 import com.ifavine.pay.vo.User;
 import com.ifavine.pay.vo.WindowCostAmount;
 
@@ -115,10 +119,10 @@ public class APIWrapper extends RetrofitUtil {
      * @param PageSize
      * @return
      */
-    public Call<CommonResponse<String>> GetLocalRecordReport(String CanteenName, String WindowName,
-                                                             String sDate, String eDate,
-                                                             String dinnerType, String PageIndex,
-                                                             String PageSize) {
+    public Call<CommonListResponse<LocalRecordReport>> GetLocalRecordReport(String CanteenName, String WindowName,
+                                                                            String sDate, String eDate,
+                                                                            String dinnerType, String record, String PageIndex,
+                                                                            String PageSize) {
         // "CanteenName": "第二食堂",
         // "WindowName": "7号",
         // "sDate": "2018-02-10 16:14:54.000",
@@ -132,7 +136,12 @@ public class APIWrapper extends RetrofitUtil {
             obj.put("WindowName", WindowName);
             obj.put("sDate", sDate);
             obj.put("eDate", eDate);
-            obj.put("dinnerType", dinnerType);
+            if (!TextUtils.isEmpty(dinnerType)) {
+                obj.put("dinnerType", dinnerType);
+            }
+            if (!TextUtils.isEmpty(record)) {
+                obj.put("record", record);
+            }
             obj.put("PageIndex", PageIndex);
             obj.put("PageSize", PageSize);
         } catch (Exception e) {
@@ -143,13 +152,14 @@ public class APIWrapper extends RetrofitUtil {
     }
 
     /**
-     * @param CanteenName
-     * @param WindowName
+     * @param WinName
+     * @param CanteenNo
      * @param sDate
      * @param eDate
      * @param dinnerType
      * @param PageIndex
      * @param PageSize
+     * @param record
      * @return
      */
     public Call<CommonResponse<String>> GetConsumRecordReport(String WinName, String CanteenNo,
@@ -187,7 +197,7 @@ public class APIWrapper extends RetrofitUtil {
      *
      * @return
      */
-    public Call<CommonResponse<String>> GetMonthRecordReport(String Year, String Month) {
+    public Call<CommonListResponse<MonthRecordReport>> GetMonthRecordReport(String Year, String Month) {
         // "CanteenName": "第二食堂",
         // "WindowName": "7号",
         // "sDate": "2018-02-10 16:14:54.000",

TOP_Pay/app/src/main/java/com/ifavine/pay/api/JsonResponseBodyConverter.java

@@ -46,7 +46,7 @@ public class JsonResponseBodyConverter<T> implements Converter<ResponseBody, T>
         String data = null;
         try {
             //数据解密
-            String d = responseBody.string().replaceAll("\\\\", "");
+            String d = responseBody.string().replaceAll("\\\\r\\\\n", "").replaceAll("\\\\", "");
             data = d.substring(1, d.length() - 1);
             Log.i("aaaaa", "response data：" + data);
         } catch (Exception e) {

TOP_Pay/app/src/main/java/com/ifavine/pay/common/Constants.java

@@ -11,7 +11,7 @@ public class Constants {
     public static String LANG = "zn-cn";
 
     public static String PREF_NAME = "pref_manage";
-    public static int PAGE_SIZE = 10;
+    public static int PAGE_SIZE = 20;
     public static String CONTACT_PAGE_SIZE = "20";
     public static final String IMAGE_TEMP = "topoa/image_temp";
     public static final String IMAGE_DOWNLOAD = "topoa/image_dowload";

TOP_Pay/app/src/main/java/com/ifavine/pay/ui/activity/MainActivity.java

@@ -281,18 +281,18 @@ public class MainActivity extends BaseActivity {
                 new PopWindowMainReport(mContext, new PopWindowMainReport.CallBackPosition() {
                     @Override
                     public void selectIndex(final int index) {
-                        DialogUtil.showInputDialog(mContext, null, "请输入管理员密码", "请输入管理员密码", "确定", "取消", new View.OnClickListener() {
-                            @Override
-                            public void onClick(View view) {
-                                if (index == 0) {
-                                    DialogMainSetUtils.showReportLocalDialog(mContext, "本机消费记录查询", null, true);
-                                } else if (index == 1) {
-                                    DialogMainSetUtils.showReportRecordDialog(mContext, "消费记录查询", null, true);
-                                } else if (index == 2) {
+                        if (index == 0) {
+                            DialogMainSetUtils.showReportLocalDialog(mContext, "本机消费记录查询", null, true);
+                        } else if (index == 1) {
+                            DialogMainSetUtils.showReportRecordDialog(mContext, "消费记录查询", null, true);
+                        } else if (index == 2) {
+                            DialogUtil.showInputDialog(mContext, null, "请输入管理员密码", "请输入管理员密码", "确定", "取消", new View.OnClickListener() {
+                                @Override
+                                public void onClick(View view) {
                                     DialogMainSetUtils.showReportSumDialog(mContext, "每月消费汇总查询", null, true);
                                 }
-                            }
-                        }, null, true);
+                            }, null, true);
+                        }
                     }
                 }).showAtBottom(tv_table);
                 break;

TOP_Pay/app/src/main/java/com/ifavine/pay/vo/CommonListResponse.java

@@ -14,6 +14,10 @@ public class CommonListResponse<T> extends Entity {
     public List<T> ModelJson;
     public int Status;
     public String Message;
+    public String TotalDinnerAmount;
+    public String TotalAllowanceAmount;
+    public String TotalConsumption;
+    public int Total;
 
     public class Data<T> {
         public List<T> list;

TOP_Pay/app/src/main/java/com/ifavine/pay/vo/LocalRecordReport.java

@@ -5,4 +5,18 @@ package com.ifavine.pay.vo;
  */
 
 public class LocalRecordReport {
+    public String CanteenName;
+    public String WindowName;
+    public String ConsumptionDate;
+    public String EmpNo;
+    public String EmpName;
+    public String Department;
+    public String Post;
+    public String DinnerType;
+    public String DinnerAmount;
+    public String AllowanceAmount;
+    public String Consumption;
+    public String TransactionNo;
+    public String Remark;
+
 }

TOP_Pay/app/src/main/res/layout/dialog_report_sum.xml

@@ -215,12 +215,12 @@
 
 
             <TextView
+                android:id="@+id/tv_TotalDinnerAmount"
                 android:layout_width="wrap_content"
                 android:layout_height="50dp"
                 android:layout_marginTop="10dp"
                 android:gravity="center"
                 android:paddingRight="10dp"
-                android:text="100"
                 android:textColor="@color/red"
                 android:textSize="23dp" />
 
@@ -235,12 +235,12 @@
                 android:textSize="23dp" />
 
             <TextView
+                android:id="@+id/tv_TotalAllowanceAmount"
                 android:layout_width="wrap_content"
                 android:layout_height="50dp"
                 android:layout_marginTop="10dp"
                 android:gravity="center"
                 android:paddingRight="10dp"
-                android:text="100"
                 android:textColor="@color/red"
                 android:textSize="23dp" />
 
@@ -255,12 +255,12 @@
                 android:textSize="23dp" />
 
             <TextView
+                android:id="@+id/tv_TotalConsumption"
                 android:layout_width="wrap_content"
                 android:layout_height="50dp"
                 android:layout_marginTop="10dp"
                 android:gravity="center"
                 android:paddingRight="10dp"
-                android:text="100"
                 android:textColor="@color/red"
                 android:textSize="23dp" />
 

TOP_Pay/app/src/main/res/layout/item_local_report.xml

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="60dp"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="60dp"
+        android:gravity="center"
+        android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/V_no"
+            android:layout_width="100dp"
+            android:layout_height="60dp"
+            android:gravity="center"
+            android:text="序号"
+            android:textColor="@color/font_black_20"
+            android:textSize="25dp" />
+
+        <TextView
+            android:id="@+id/V_CanteenName"
+            android:layout_width="160dp"
+            android:layout_height="60dp"
+            android:gravity="center"
+            android:text="食堂"
+            android:textColor="@color/font_black_20"
+            android:textSize="25dp" />
+
+        <TextView
+            android:id="@+id/V_WindowName"
+            android:layout_width="160dp"
+            android:layout_height="60dp"
+            android:gravity="center"
+            android:text="窗口"
+            android:textColor="@color/font_black_20"
+            android:textSize="25dp" />
+
+        <TextView
+            android:id="@+id/V_ConsumptionDate"
+            android:layout_width="250dp"
+            android:layout_height="60dp"
+            android:gravity="center"
+            android:text="日期"
+            android:textColor="@color/font_black_20"
+            android:textSize="20dp" />
+
+        <TextView
+            android:id="@+id/V_EmpNo"
+            android:layout_width="160dp"
+            android:layout_height="60dp"
+            android:gravity="center"
+            android:text="工号"
+            android:textColor="@color/font_black_20"
+            android:textSize="25dp" />
+
+        <TextView
+            android:id="@+id/V_EmpName"
+            android:layout_width="160dp"
+            android:layout_height="60dp"
+            android:gravity="center"
+            android:text="姓名"
+            android:textColor="@color/font_black_20"
+            android:textSize="25dp" />
+
+        <TextView
+            android:id="@+id/V_Department"
+            android:layout_width="200dp"
+            android:layout_height="60dp"
+            android:gravity="center"
+            android:text="部门"
+            android:textColor="@color/font_black_20"
+            android:textSize="25dp" />
+
+        <TextView
+            android:id="@+id/V_Post"
+            android:layout_width="160dp"
+            android:layout_height="60dp"
+            android:gravity="center"
+            android:text="职务"
+            android:textColor="@color/font_black_20"
+            android:textSize="25dp" />
+
+        <TextView
+            android:id="@+id/V_DinnerType"
+            android:layout_width="160dp"
+            android:layout_height="60dp"
+            android:gravity="center"
+            android:text="用餐类型"
+            android:textColor="@color/font_black_20"
+            android:textSize="25dp" />
+
+
+        <TextView
+            android:id="@+id/V_DinnerAmount"
+            android:layout_width="160dp"
+            android:layout_height="60dp"
+            android:gravity="center"
+            android:text="消费金额"
+            android:textColor="@color/font_black_20"
+            android:textSize="25dp" />
+
+        <TextView
+            android:id="@+id/V_AllowanceAmount"
+            android:layout_width="160dp"
+            android:layout_height="60dp"
+            android:gravity="center"
+            android:text="公司补助"
+            android:textColor="@color/font_black_20"
+            android:textSize="25dp" />
+
+        <TextView
+            android:id="@+id/V_Consumption"
+            android:layout_width="160dp"
+            android:layout_height="60dp"
+            android:gravity="center"
+            android:text="个人消费"
+            android:textColor="@color/font_black_20"
+            android:textSize="25dp" />
+
+        <TextView
+            android:id="@+id/V_TransactionNo"
+            android:layout_width="320dp"
+            android:layout_height="60dp"
+            android:gravity="center"
+            android:text="商户单号"
+            android:textColor="@color/font_black_20"
+            android:textSize="20dp" />
+
+        <TextView
+            android:id="@+id/V_Remark"
+            android:layout_width="300dp"
+            android:layout_height="60dp"
+            android:gravity="center"
+            android:text="备注"
+            android:textColor="@color/font_black_20"
+            android:textSize="25dp" />
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file