Merge remote-tracking branch 'origin/master'

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

@@ -390,7 +390,9 @@ public class Saleorder extends SectionEntity<MediaStore.Video> implements BaseMo
         this.orderPayAmt -= this.msDisAmt;
 
         //优惠券
-        if (ticket != null && ticket.getTruleOrderAmt() > getOrderPayAmt()) this.ticket = null;
+        if (ticket != null && (ticket.getTruleOrderAmt() > getOrderPayAmt() || ticket.getTicketNo() == -1)) {
+            this.ticket = null;
+        }
         this.ticketId = ticket == null ? -1L : ticket.getId();
         this.ticketAmt = ticket == null ? 0L : ticket.getTicketValAmt();
         this.ticketNum = ticket == null ? (byte) 0 : (byte) 1;
@@ -1009,7 +1011,7 @@ public class Saleorder extends SectionEntity<MediaStore.Video> implements BaseMo
 
     @Override
     public String getDRAW_URL() {
-        return "http://tk.demo.xingdata.com/wx/jump.html?sid=" + LoginPresenter.loginReturnBean.getShopMapId() ;
+        return "http://tk.demo.xingdata.com/wx/jump.html?sid=" + LoginPresenter.loginReturnBean.getShopMapId();
     }
 
     @Override

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

@@ -38,9 +38,7 @@ public class Ticket extends SectionEntity<MediaStore.Video> implements BaseBean
      * @return 默认优惠券
      */
     public static Ticket defualt() {
-        Ticket ticket = new Ticket(-1L);
-        ticket.ticketValAmt = 0L;
-        return ticket;
+        return new Ticket(-1L);
     }
 
     @Deprecated

app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/SsskuPresenter.java

@@ -133,6 +133,7 @@ public class SsskuPresenter extends SsskuContract.Presenter {
                                             mView.showDetailFragment(sssku1);
                                         },
                                         throwable -> {
+                                            mView.showMsg(throwable.getMessage());
                                         })
                 );
                 break;
@@ -172,6 +173,7 @@ public class SsskuPresenter extends SsskuContract.Presenter {
                             mView.dismissAllDialog();
                             this.getSkugrp();
                         }, throwable -> {
+                            mView.showMsg(throwable.getMessage());
                         })
         );
     }
@@ -192,6 +194,7 @@ public class SsskuPresenter extends SsskuContract.Presenter {
                             mView.dismissAllDialog();
                             this.getSkugrp();
                         }, throwable -> {
+                            mView.showMsg(throwable.getMessage());
                         })
         );
     }
@@ -208,6 +211,7 @@ public class SsskuPresenter extends SsskuContract.Presenter {
                             mView.dismissAllDialog();
                             this.getSkugrp();
                         }, throwable -> {
+                            mView.showMsg(throwable.getMessage());
                         })
         );
     }
@@ -305,6 +309,7 @@ public class SsskuPresenter extends SsskuContract.Presenter {
                                 mView.loadSsskuCount(ssskuPager.getTotalRow());
                             mView.loadSkus(ssskuPager, mPageNum == 1);
                         }, throwable -> {
+                            mView.showMsg(throwable.getMessage());
                         })
         );
     }
@@ -318,6 +323,7 @@ public class SsskuPresenter extends SsskuContract.Presenter {
                 ApiFactory.Sssku.querySssku(mSearchPageNum, mKeyword)
                         .doOnSubscribe(subscription -> mView.dismissLoadingDialog())
                         .subscribe(ssskuPager -> mView.loadSearchResult(ssskuPager, mSearchPageNum == 1), throwable -> {
+                            mView.showMsg(throwable.getMessage());
                         })
         );
     }
@@ -330,6 +336,7 @@ public class SsskuPresenter extends SsskuContract.Presenter {
                 ApiFactory.Sskugrp.querySskugrp().subscribe(sskugrpPager -> {
                             mView.loadSkugrps(sskugrpPager.getList());
                         }, throwable -> {
+                            mView.showMsg(throwable.getMessage());
                         }
                 )
         );
@@ -341,6 +348,7 @@ public class SsskuPresenter extends SsskuContract.Presenter {
     private void getReplenish() {
         mCompositeDisposable.add(
                 ApiFactory.Psb.preOrder().subscribe(ssskuPager -> mView.loadReplenishCount(ssskuPager.getTotalRow()), throwable -> {
+                    mView.showMsg(throwable.getMessage());
                 })
         );
     }
@@ -351,6 +359,7 @@ public class SsskuPresenter extends SsskuContract.Presenter {
     private void getCor() {
         mCompositeDisposable.add(
                 ApiFactory.Cor.queryAll().subscribe(cors -> mView.loadCors(cors), throwable -> {
+                    mView.showMsg(throwable.getMessage());
                 })
         );
     }