订单详情

app/src/main/java/com/xingdata/zzdpos/C.java

@@ -128,10 +128,7 @@ public class C {
              * 订单查询
              */
             public static final String getSaleOrder = PKG + "saleorder/queryMis";
-            /**
-             * 订单列表查询
-             */
-            public static final String queryOrderList = PKG + "saleorder/query";
+
             /**
              * 销售订单详情查询
              */

app/src/main/java/com/xingdata/zzdpos/api/ApiFactory.java

@@ -256,9 +256,9 @@ public final class ApiFactory {
          * @param pageSize
          * @return
          */
-        public static Observable<Pager<com.xingdata.zzdpos.model.Saleorder>> getSaleOrderList(int pageNulmber, int
+        public static Observable<Pager<com.xingdata.zzdpos.model.Saleorder>> getSaleOrderList(String orderStatus,int pageNulmber, int
                 pageSize, long startDate, long endDate) {
-            return Api.getInstance().service.getSaleOrder(pageNulmber, pageSize, startDate,
+            return Api.getInstance().service.getSaleOrder(orderStatus,pageNulmber, pageSize, startDate,
                     endDate).onErrorReturn(new
                     ErrorFilter<>()).map(new ResultFilter<>()).subscribeOn(Schedulers.io())
                     .observeOn(AndroidSchedulers.mainThread());
@@ -737,6 +737,7 @@ public final class ApiFactory {
     }
 
     public static class Sta {
+        /**
         /**
          * 查询统计详情
          */

app/src/main/java/com/xingdata/zzdpos/api/ApiService.java

@@ -135,8 +135,8 @@ interface ApiService {
                                                            @Query
                                                                    ("wd") String wd);
 
-    @POST(C.URL.ORDER.queryOrderList)
-    Observable<HttpMessage<Pager<Saleorder>>> getSaleOrder(@Query("pageNumber") int pageNum, @Query
+    @POST(C.URL.ORDER.getSaleOrder)
+    Observable<HttpMessage<Pager<Saleorder>>> getSaleOrder(@Query("orderStatus") String orderStatus,@Query("pageNumber") int pageNum, @Query
             ("pageSize") int pageSize, @Query("startDate") long startDate, @Query("endDate") long
                                                                    endDate);
 

app/src/main/java/com/xingdata/zzdpos/model/Saleorder.java

@@ -223,6 +223,8 @@ public class Saleorder extends SectionEntity<MediaStore.Video> implements BaseMo
         public String payAcctNo;
     }
 
+
+    private String firstName;
     /**
      * 订单的总成本
      */
@@ -1030,15 +1032,16 @@ public class Saleorder extends SectionEntity<MediaStore.Video> implements BaseMo
 
     @Override
     public List<BaseGoodPrint> getGoodList() {
-        if (saledetailList!=null){
-        List<BaseGoodPrint> baseGoodPrints = new ArrayList<>();
-        for (Saledetail saledetail : saledetailList) {
-            baseGoodPrints.add(saledetail);
-        }
-        return baseGoodPrints;
-    }else {
+        if (saledetailList != null) {
+            List<BaseGoodPrint> baseGoodPrints = new ArrayList<>();
+            for (Saledetail saledetail : saledetailList) {
+                baseGoodPrints.add(saledetail);
+            }
+            return baseGoodPrints;
+        } else {
             return null;
-        }}
+        }
+    }
 
     @Override
     public String getDRAW_URL() {
@@ -1126,4 +1129,12 @@ public class Saleorder extends SectionEntity<MediaStore.Video> implements BaseMo
             this.money = money;
         }
     }
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
 }
\ No newline at end of file

app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsPresenter.java

@@ -33,7 +33,7 @@ public class StatisticsPresenter extends StatisticsContract.Presenter {
 
     @Override
     public void getOrderList(int pageNumber, int pageSize, long startDate, long endDate, OrderListFragment fragment) {
-        ApiFactory.Test.getSaleOrderList(pageNumber, pageSize, startDate, endDate).doFinally(() -> {
+        ApiFactory.Test.getSaleOrderList("99",pageNumber, pageSize, startDate, endDate).doFinally(() -> {
 
         })
                 .subscribe(orderlist -> {

app/src/main/java/com/xingdata/zzdpos/ui/statistics/adapter/StatisticsAdapter.java

@@ -27,7 +27,12 @@ public class StatisticsAdapter extends BaseAdapter<Saleorder, ItemStatisticsBind
 
     @Override
     protected void convert(ItemStatisticsBinding mViewBinding, Saleorder item) {
-              mViewBinding.tvLeftTop.setText(item.getOrderNo());
+            if (item.getFirstName()!=null){
+                mViewBinding.tvLeftTop.setText(item.getFirstName());
+            }else {
+                mViewBinding.tvLeftTop.setText(item.getOrderNo());
+            }
+
               mViewBinding.tvLeftBottom.setText(TimeUtils.millis2String(item.getCreateTime()));
               switch (item.getPayType()){
                   case C.PAY_CHANNEL.CASH:

app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/order/OrderListFragment.java

@@ -25,10 +25,9 @@ import java.util.List;
 
 public class OrderListFragment extends BaseFragment<StatisticsPresenter, FragmentOrderListBinding> {
     private StatisticsAdapter mStatisticsAdapter;
-    private List<Saleorder> saleorders = new ArrayList<>();
     private Long monthDateStart;
     private Long monthDateEnd;
-    private int pagerNum = 1;
+    private int pagerNum ;
 
     public OrderListFragment setDate(Long end, Long start) {
         monthDateStart = start;
@@ -44,6 +43,7 @@ public class OrderListFragment extends BaseFragment<StatisticsPresenter, Fragmen
 
     @Override
     public void initView() {
+        pagerNum=1;
         Calendar calendar = Calendar.getInstance();
 //获得当前时间的月份，月份从0开始所以结果要加1
         int monthNow = calendar.get(Calendar.MONTH) + 1;
@@ -64,7 +64,7 @@ public class OrderListFragment extends BaseFragment<StatisticsPresenter, Fragmen
         mViewBinding.tvEmpty.setText(R.string.statistics_search_empty);
 
         if (mStatisticsAdapter == null) {
-            mStatisticsAdapter = new StatisticsAdapter(saleorders);
+            mStatisticsAdapter = new StatisticsAdapter(new ArrayList<>());
             mViewBinding.statisticsRecycler.setLayoutManager(new LinearLayoutManager(getActivity()));
             mViewBinding.statisticsRecycler.setAdapter(mStatisticsAdapter);