提交代码;

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

@@ -405,8 +405,10 @@ public class C {
             private static final String ROOT_URL = PKG + "scsku/";
 
             public static final String query = ROOT_URL + "query";
+            public static final String queryAndSpu = ROOT_URL + "queryAndSpu";
         }
 
+
         public final class VER {
             //检测版本
             public static final String getLastVer = PKG + "ver/getLastVer";

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

@@ -443,7 +443,7 @@ interface ApiService {
     Observable<HttpMessage<Mscard>> addMscard(@Body Mscard m);
 
 
-    @POST(C.URL.SCSKU.query)
+    @POST(C.URL.SCSKU.queryAndSpu)
     Observable<HttpMessage<Pager<Sssku>>> queryScsku(@Query("spuBarcode") String barcode);
 
 

app/src/main/java/com/xingdata/zzdpos/base/BaseActivity.java

@@ -62,12 +62,15 @@ public abstract class BaseActivity<P extends BasePresenter, B extends ViewDataBi
     }
 
     protected void initPresenter() {
-        if (this instanceof BaseView && this.getClass().getGenericSuperclass() instanceof ParameterizedType
-                && ((ParameterizedType) (this.getClass().getGenericSuperclass())).getActualTypeArguments().length > 0) {
-            Class mPresenterClass = (Class) ((ParameterizedType) (this.getClass().getGenericSuperclass())).getActualTypeArguments()[0];
-            mPresenter = InstanceUtil.getInstance(mPresenterClass);
-            mPresenter.setIntent(getIntent()).setView(this).build();
+        if (!(this instanceof BaseView)) {
+            throw new RuntimeException(getClass().getSimpleName() + "需要实现继承自BaseView的行为接口");
         }
+        if (!(this.getClass().getGenericSuperclass() instanceof ParameterizedType && ((ParameterizedType) (this.getClass().getGenericSuperclass())).getActualTypeArguments().length > 0)) {
+            throw new RuntimeException(getClass().getSimpleName() + "在继承时,需要注明泛型类");
+        }
+        Class mPresenterClass = (Class) ((ParameterizedType) (this.getClass().getGenericSuperclass())).getActualTypeArguments()[0];
+        mPresenter = InstanceUtil.getInstance(mPresenterClass);
+        mPresenter.setIntent(getIntent()).setView(this).build();
     }
 
     @Override

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

@@ -83,6 +83,7 @@ public class DBFactory {
 
         /**
          * 分页查询商品
+         * .
          *
          * @param pageNum 页面
          * @param keyword 关键字
@@ -115,7 +116,6 @@ public class DBFactory {
         public static Observable<Pager<Ussku>> queryUSku() {
             RealmQuery<Ussku> query = DB.getInstance().get(MainPresenter.class).where(Ussku.class);
             query.equalTo("skuStatus", 0);
-
             return Observable.just(query.findAll())
                     .flatMap(usskus -> {
                         Pager<Ussku> usskuPager = new Pager<>();