Merge branch 'master' of 192.168.254.154:w525721508/TangKuPos

.idea/modules.xml

@@ -3,8 +3,8 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/TangKuPos.iml" filepath="$PROJECT_DIR$/TangKuPos.iml" />
-      <module fileurl="file://D:\Work\Android\AndroidProject\XingData\TangKuPos\.idea\TangKuPos.iml" filepath="D:\Work\Android\AndroidProject\XingData\TangKuPos\.idea\TangKuPos.iml" />
       <module fileurl="file://C:\Users\JM_DEV\AndroidStudioProjects\TangKuPos\TangKuPos.iml" filepath="C:\Users\JM_DEV\AndroidStudioProjects\TangKuPos\TangKuPos.iml" />
+      <module fileurl="file://D:\Work\Android\AndroidProject\XingData\TangKuPos\.idea\TangKuPos.iml" filepath="D:\Work\Android\AndroidProject\XingData\TangKuPos\.idea\TangKuPos.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
     </modules>
   </component>

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

@@ -207,6 +207,11 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
         mManagerFragment.updateSku(sssku);
     }
 
+    @Override
+    public void deleteSku(Long skuId) {
+        mManagerFragment.deleteSku(skuId);
+    }
+
     @Override
     public void showLoadingDialog() {
         mLoadingDialog.show(this);

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

@@ -147,6 +147,14 @@ public interface SsskuContract {
          */
         void updateSku(Sssku sssku);
 
+
+        /**
+         * 删除商品
+         *
+         * @param skuId 商品ID
+         */
+        void deleteSku(Long skuId);
+
         /**
          * 显示读取对话框
          */

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

@@ -214,6 +214,8 @@ public class SsskuPresenter extends SsskuContract.Presenter {
                             mView.backToManagerFragment();
                             if (sssku1.getSkuGrpId().longValue() == mSkuGrpId) {
                                 mView.updateSku(sssku1);
+                            } else {
+                                mView.deleteSku(sssku1.getSkuId());
                             }
                         }, throwable -> mView.showMsg(throwable.getMessage()));
                 break;

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

@@ -154,6 +154,20 @@ public class ManagerFragment extends BaseFragment<SsskuPresenter, FragmentSsskuM
         }
     }
 
+    /**
+     * 删除商品
+     *
+     * @param skuId 商品ID
+     */
+    public void deleteSku(Long skuId) {
+        for (int i = 0; i < mSkuAdapter.getData().size(); i++) {
+            if (mSkuAdapter.getData().get(i).getSkuId().longValue() == skuId) {
+                mSkuAdapter.remove(i);
+                return;
+            }
+        }
+    }
+
     /**
      * 刷新商品
      */

app/src/main/java/com/xingdata/zzdpos/ui/settle/fragment/SettleFragment.java

@@ -213,10 +213,11 @@ public class SettleFragment extends BaseFragment<SettlePresenter, FragmentSettle
      * 加载支付方式
      */
     public void loadPays(List<Pay> pays) {
-//        for (int i = 0; i < pays.size(); i++) {
-//            pays.get(i).init();
-//        }
-        mPayAdapter.setNewData(pays);
+        for (int i = 0; i < pays.size(); i++) {
+            pays.get(i).init();
+        }
+        mPays.addAll(pays);
+        mPayAdapter.setNewData(getAvlPays(Vip.createDefault()));
     }