修改BUG;

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

@@ -71,7 +71,7 @@ public class App extends Application {
                 .start();
 
         // 初始化异常处理
-        initEx();
+//        initEx();
 
         //初始化Fragment框架
         initFragment();

app/src/main/java/com/xingdata/zzdpos/db/DBFactory.java

@@ -103,8 +103,7 @@ public class DBFactory {
 
             //skuStatus
             query.equalTo("skuStatus", 0);
-            return Observable.just(query.findAll()).flatMap(ssskus -> Observable.just
-                    (getLimitList(ssskus, pageNum, C.PRODUCT.PAGE_SIZE)));
+            return Observable.just(query.findAll()).flatMap(ssskus -> Observable.just(getLimitList(ssskus, pageNum, C.PRODUCT.PAGE_SIZE)));
         }
 
 

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

@@ -169,7 +169,7 @@ public class Saledetail implements BaseModel, BaseBean, BaseGoodPrint {
         saledetail.skuCost = 0L;
         saledetail.detailCnt = 1;
         saledetail.initialDetailAmt = saledetail.skuPrice * saledetail.detailCnt;
-        saledetail.skuOffFlag = 0;
+        saledetail.skuOffFlag = 1;
         saledetail.skuStock = 0L;
         saledetail.status = C.SKU_TYPE.NO_BARCODE;
         saledetail.spuCateId = 0L;
@@ -676,7 +676,7 @@ public class Saledetail implements BaseModel, BaseBean, BaseGoodPrint {
 
 
     public String getSpuImg() {
-        if (spuImg !=null && spuImg.contains("ngoods.png")) return "";
+        if (spuImg != null && spuImg.contains("ngoods.png")) return "";
         return spuImg;
     }
 

app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/MsActivity.java

@@ -127,7 +127,7 @@ public class MsActivity<Sku extends BaseSku> extends BaseActivity<MsPresenter, A
     }
 
     @Override
-    public void loadSkus(List<Sku> skus, boolean isRefresh) {
+    public void loadSkus(Pager<Sku> skus, boolean isRefresh) {
         mSearchFragment.loadSkus(skus, isRefresh);
     }
 

app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/MsContract.java

@@ -102,7 +102,7 @@ interface MsContract {
          * @param skus      商品对象列表
          * @param isRefresh 是否刷新
          */
-        void loadSkus(List<Sku> skus, boolean isRefresh);
+        void loadSkus(Pager<Sku> skus, boolean isRefresh);
 
         /**
          * 加载作为主体的商品信息

app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/MsPresenter.java

@@ -7,6 +7,7 @@ import com.xingdata.zzdpos.api.ApiFactory;
 import com.xingdata.zzdpos.base.BaseSku;
 import com.xingdata.zzdpos.db.DBFactory;
 import com.xingdata.zzdpos.model.Ms;
+import com.xingdata.zzdpos.model.Pager;
 import com.xingdata.zzdpos.ui.login.LoginPresenter;
 import com.xingdata.zzdpos.ui.marketing.ms.model.Area;
 import com.xingdata.zzdpos.ui.marketing.ms.model.Group;
@@ -231,8 +232,8 @@ public class MsPresenter<Sku extends BaseSku> extends MsContract.Presenter<Sku>
         mCompositeDisposable.add(
                 DBFactory.Store.querySku(mSkuPageNum, mSkuKeyword)
                         .doOnSubscribe(subscription -> mView.dismissLoadingDialog())
-                        .subscribe(ssskus -> {
-                            mView.loadSkus((List<Sku>) ssskus, mSkuPageNum == 0);
+                        .subscribe(ssskuPager -> {
+                            mView.loadSkus((Pager<Sku>) ssskuPager, mSkuPageNum == 0);
                         })
         );
     }

app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/fragment/SearchFragment.java

@@ -6,17 +6,15 @@ import android.view.View;
 import android.widget.TextView;
 
 import com.blankj.utilcode.util.StringUtils;
-import com.xingdata.zzdpos.C;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseFragment;
 import com.xingdata.zzdpos.base.BaseSku;
 import com.xingdata.zzdpos.databinding.FragmentMsSearchBinding;
+import com.xingdata.zzdpos.model.Pager;
 import com.xingdata.zzdpos.ui.marketing.ms.MsActivity;
 import com.xingdata.zzdpos.ui.marketing.ms.MsPresenter;
 import com.xingdata.zzdpos.ui.marketing.ms.adapter.SkuAdapter;
 
-import java.util.List;
-
 public class SearchFragment<Sku extends BaseSku> extends BaseFragment<MsPresenter, FragmentMsSearchBinding> {
 
     private int mSearchType;
@@ -66,13 +64,13 @@ public class SearchFragment<Sku extends BaseSku> extends BaseFragment<MsPresente
      * @param skus      商品
      * @param isRefresh 是否刷新
      */
-    public void loadSkus(List<Sku> skus, boolean isRefresh) {
+    public void loadSkus(Pager<Sku> skus, boolean isRefresh) {
         if (isRefresh) {
             mSkuAdapter.isUseEmpty(true);
             mSkuAdapter.setEnableLoadMore(true);
-            mSkuAdapter.setNewData(skus);
-        } else if (skus.size() > 0) mSkuAdapter.addData(skus);
-        if (skus.size() <= C.PRODUCT.PAGE_SIZE) mSkuAdapter.loadMoreEnd(isRefresh);
+            mSkuAdapter.setNewData(skus.getList());
+        } else if (skus.getList().size() > 0) mSkuAdapter.addData(skus.getList());
+        if (skus.isLastPage()) mSkuAdapter.loadMoreEnd(isRefresh);
         else mSkuAdapter.loadMoreComplete();
     }
 

app/src/main/java/com/xingdata/zzdpos/ui/payment/PaymentPresenter.java

@@ -8,7 +8,7 @@ public class PaymentPresenter extends PaymentContract.Presenter {
 
     @Override
     public void clickSettle(Long amt) {
-        if (amt > 99999999999L) {
+        if (amt > 99999999999L || amt <= 0) {
             mView.showMsg("您填写的金额超出范围");
         } else {
             mView.showSettle(amt);