10.13 修復了一些打印BUG

Signed-off-by: Wyh <1239658231>

base-module/build.gradle

@@ -99,7 +99,6 @@ dependencies {
     implementation rootProject.ext.dependencies["progressmanager"]
     implementation rootProject.ext.dependencies["autosize"]
     // test
-    testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
     implementation 'com.android.support:design:28.0.0'
@@ -124,10 +123,11 @@ dependencies {
     implementation 'cn.bingoogolapple:bga-baseadapter:1.2.9@aar'
     implementation 'cn.bingoogolapple:bga-flowlayout:1.0.0@aar'
 
-
     api 'androidx.core:core-ktx:+'
+
     implementation 'org.projectlombok:lombok:1.18.8'
     annotationProcessor 'org.projectlombok:lombok:1.18.8'
+
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     api 'com.github.huangyanbin:SmartTable:2.2.0'
     api rootProject.ext.dependencies["permissionx"]

base-module/src/main/res/values/dimens.xml

@@ -31,7 +31,7 @@
     <dimen name="button_size">16sp</dimen>
 
     <!-- 输入框 -->
-    <dimen name="edit_padding">15dp</dimen>
+    <dimen name="edit_padding">10dp</dimen>
 
     <!-- 间距 -->
     <dimen name="normal_space">10dp</dimen>

coldchain-module/src/main/java/com/gingersoft/coldchain_module/mvp/presenter/ColdChainMainPresenter.java

@@ -73,23 +73,29 @@ public class ColdChainMainPresenter extends BasePresenter<ColdChainMainContract.
                 .build();
         mModel.getNumByOrderType(requestBody)
                 .subscribeOn(Schedulers.io())
-                .doOnSubscribe(disposable -> mRootView.showLoading("獲取餐廳配置信息..."))
+                .doOnSubscribe(disposable -> {
+                })
                 .subscribeOn(AndroidSchedulers.mainThread())
                 .observeOn(AndroidSchedulers.mainThread())
-                .doAfterTerminate(() -> mRootView.hideLoading())
+                .doAfterTerminate(() -> {
+                })
                 .compose(RxLifecycleUtils.bindToLifecycle(mRootView))
                 .subscribe(new ErrorHandleSubscriber<SupplementInfoBean>(mErrorHandler) {
 
                     @Override
                     public void onNext(@NonNull SupplementInfoBean info) {
                         if (info != null && info.isSuccess()) {
-//                            mRootView.loadNumber(info);
-                            try {
+                            //                            mRootView.loadNumber(info);
+//                            try {
                                 method.setAccessible(true);
+                            try {
                                 method.invoke(object, info);
                             } catch (IllegalAccessException | InvocationTargetException e) {
                                 e.printStackTrace();
                             }
+//                            } catch (IllegalAccessException | InvocationTargetException e) {
+//                                e.printStackTrace();
+//                            }
                         }
                     }
                 });
@@ -234,10 +240,12 @@ public class ColdChainMainPresenter extends BasePresenter<ColdChainMainContract.
                 .build();
         mModel.getOrderList(requestBody)
                 .subscribeOn(Schedulers.io())
-                .doOnSubscribe(disposable -> mRootView.showLoading(""))
+                .doOnSubscribe(disposable -> {
+                })
                 .subscribeOn(AndroidSchedulers.mainThread())
                 .observeOn(AndroidSchedulers.mainThread())
-                .doAfterTerminate(() -> mRootView.hideLoading())
+                .doAfterTerminate(() -> {
+                })
                 .compose(RxLifecycleUtils.bindToLifecycle(mRootView))
                 .subscribe(new ErrorHandleSubscriber<OrderList>(mErrorHandler) {
 

coldchain-module/src/main/java/com/gingersoft/coldchain_module/mvp/ui/activity/ColdChainMainActivity.java

@@ -427,11 +427,12 @@ public class ColdChainMainActivity extends BaseFragmentActivity<ColdChainMainPre
 
     @Override
     public void showLoading(String message) {
-        if (message != null)
+        if (message != null) {
             LoadingDialog.showDialogForLoading(this, message, true);
-        else
+        } else {
             LoadingDialog.showDialogForLoading(this);
         }
+    }
 
     @Override
     public void hideLoading() {

coldchain-module/src/main/java/com/gingersoft/coldchain_module/mvp/ui/activity/OrderDetailsActivity.java

@@ -114,6 +114,7 @@ public class OrderDetailsActivity extends BaseActivity<OrderDetailsPresenter> im
     private int orderStatus;
 
     private boolean printPdf = false;
+
     @Override
     public void setupActivityComponent(@NonNull AppComponent appComponent) {
         DaggerOrderDetailsComponent //如找不到该类,请编译一下项目
@@ -200,7 +201,7 @@ public class OrderDetailsActivity extends BaseActivity<OrderDetailsPresenter> im
         Intent intent = new Intent();
         intent.putExtra("position", position);
         intent.putExtra("orderStatus", orderStatus);
-        if(printPdf){
+        if (printPdf) {
             intent.putExtra("printPdf", true);
         }
         setResult(1001, intent);
@@ -270,6 +271,7 @@ public class OrderDetailsActivity extends BaseActivity<OrderDetailsPresenter> im
             btnBeans.add(btnBuilder.getCancelBtn());
         } else {
             btnBeans.add(btnBuilder.getPrintBtn());
+            btnBeans.add(btnBuilder.getCancelBtn());
         }
 
         if (btnBeans.size() > 1 && btnBeans.size() < 4) {
@@ -344,6 +346,7 @@ public class OrderDetailsActivity extends BaseActivity<OrderDetailsPresenter> im
         String jobName = getString(R.string.app_name) + "Document";
         // Start a print job, passing in a PrintDocumentAdapter implementation 启动打印作业，传入printdocumentadapter实现
         // to handle the generation of a print document处理打印文档的生成
+        if (!isFinishing()) {
             printManager.print(jobName, new MyPrintDocumentAdapter(mContext, file, (code, msg) -> {
                 hideLoading();
                 if (code != 0) {
@@ -352,6 +355,7 @@ public class OrderDetailsActivity extends BaseActivity<OrderDetailsPresenter> im
                 killMyself();
             }), null);
         }
+    }
 
     private void requestPermissions(RequestCallback requestCallback) {
         PermissionX.init(this)

coldchain-module/src/main/java/com/gingersoft/coldchain_module/mvp/ui/fragment/OrderListFragment.java

@@ -7,11 +7,13 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
+
 import com.gingersoft.coldchain_module.R;
 import com.gingersoft.coldchain_module.R2;
 import com.gingersoft.coldchain_module.di.component.DaggerOrderListComponent;
@@ -97,6 +99,12 @@ public class OrderListFragment extends BaseFragment<OrderListPresenter> implemen
         });
     }
 
+    @Override
+    public void onResume() {
+        super.onResume();
+        onRefreshData();
+    }
+
     public void onRefreshData() {
         page = 1;
         mRefreshLayout.setEnableLoadMore(true);
@@ -201,7 +209,8 @@ public class OrderListFragment extends BaseFragment<OrderListPresenter> implemen
                     intent.putExtra("orderId", data.get(position).getId());
                     intent.putExtra("isRead", data.get(position).getIsRead());
                     intent.putExtra("position", position);
-                    startActivityForResult(intent, 1001);
+//                    startActivityForResult(intent, 1001);
+                    startActivity(intent);
                 });
                 mRvOrderList.setAdapter(adapter);
             } else {
@@ -266,18 +275,20 @@ public class OrderListFragment extends BaseFragment<OrderListPresenter> implemen
         }
     }
 
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        if (resultCode == 1001 && data != null && mPresenter != null) {
-            int position = data.getIntExtra("position", -1);
-            boolean isPrint = data.getBooleanExtra("printPdf", false);
-            if (isPrint) {
-                mPresenter.notifyDataPrintStateByPosition(position, true);
-            } else {
-                int orderStatus = data.getIntExtra("orderStatus", 0);
-                mPresenter.notifyDataByPosition(position, orderStatus);
-            }
-        }
-    }
+//    @Override
+//    public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+//        super.onActivityResult(requestCode, resultCode, data);
+//        if (resultCode == 1001 && data != null && mPresenter != null) {
+//            int position = data.getIntExtra("position", -1);
+//            boolean isPrint = data.getBooleanExtra("printPdf", false);
+//            Log.e("eee", "Position：" + position + "----isPrint：" + isPrint);
+//            if (isPrint) {
+//                mPresenter.notifyDataPrintStateByPosition(position, true);
+//            } else {
+//                int orderStatus = data.getIntExtra("orderStatus", 0);
+//                Log.e("eee", "訂單狀態：" + orderStatus);
+//                mPresenter.notifyDataByPosition(position, orderStatus);
+//            }
+//        }
+//    }
 }

delivery_pick_module/build.gradle

@@ -48,24 +48,24 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.2.0'
+    kapt rootProject.ext.dependencies["dagger2-compiler"]
+    kapt rootProject.ext.dependencies["butterknife-compiler"]
+//    implementation 'androidx.core:core-ktx:1.2.0'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
     // alternatively, just LiveData
     implementation "android.arch.lifecycle:livedata:1.1.1"
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.0-alpha01"
 
     //协程
-//    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.1'
-//    implementation 'org.jetbrains.kotlinx:kotlinx-cor outines-android:1.1.1'
     implementation 'com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter:0.9.2'
     //gson和scalars轉換器
     implementation 'com.squareup.retrofit2:converter-gson:2.3.0'
     implementation 'com.squareup.retrofit2:converter-scalars:2.5.0'
 
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test:runner:1.2.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+//    testImplementation 'junit:junit:4.12'
+//    androidTestImplementation 'androidx.test:runner:1.2.0'
+//    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
     implementation 'com.ethanhua:skeleton:1.1.2'
     implementation 'io.supercharge:shimmerlayout:2.1.0'
     if (project.ext.runAsApp) {

delivery_pick_module/src/main/debug/AndroidManifest.xml

@@ -13,10 +13,10 @@
         android:networkSecurityConfig="@xml/network_android"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name="com.gingersoft.gsa.delivery_pick_mode.ui.activity.LogActivity"/>
-        <activity android:name="com.gingersoft.gsa.delivery_pick_mode.ui.activity.OrderDetailsActivity" />
+        <activity android:name=".ui.activity.LogActivity" />
+        <activity android:name=".ui.activity.OrderDetailsActivity" />
         <activity
-            android:name="com.gingersoft.gsa.delivery_pick_mode.ui.activity.DeliveryOrderMainActivity"
+            android:name=".mvp.ui.activity.SendOrderActivity"
             android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -32,7 +32,7 @@
             android:name="com.gingersoft.gsa.cloud.globalconfig.GlobalConfiguration"
             android:value="ConfigModule" />
 
-        <activity android:name="com.gingersoft.gsa.delivery_pick_mode.ui.activity.HistoryOrderActivity" />
+        <activity android:name=".ui.activity.HistoryOrderActivity" />
     </application>
 
 </manifest>
\ No newline at end of file

delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/di/component/SendOrderComponent.java

+package com.gingersoft.gsa.delivery_pick_mode.di.component;
+
+import com.gingersoft.gsa.delivery_pick_mode.di.module.SendOrderModule;
+import com.gingersoft.gsa.delivery_pick_mode.mvp.contract.SendOrderContract;
+import com.gingersoft.gsa.delivery_pick_mode.mvp.ui.activity.SendOrderActivity;
+import com.jess.arms.di.component.AppComponent;
+import com.jess.arms.di.scope.ActivityScope;
+
+import dagger.BindsInstance;
+import dagger.Component;
+
+
+/**
+ * ================================================
+ * Description:
+ * <p>
+ * Created by MVPArmsTemplate on 10/10/2020 14:40
+ * <a href="mailto:jess.yan.effort@gmail.com">Contact me</a>
+ * <a href="https://github.com/JessYanCoding">Follow me</a>
+ * <a href="https://github.com/JessYanCoding/MVPArms">Star me</a>
+ * <a href="https://github.com/JessYanCoding/MVPArms/wiki">See me</a>
+ * <a href="https://github.com/JessYanCoding/MVPArmsTemplate">模版请保持更新</a>
+ * ================================================
+ */
+@ActivityScope
+@Component(modules = SendOrderModule.class, dependencies = AppComponent.class)
+public interface SendOrderComponent {
+    void inject(SendOrderActivity activity);
+
+    @Component.Builder
+    interface Builder {
+        @BindsInstance
+        SendOrderComponent.Builder view(SendOrderContract.View view);
+
+        SendOrderComponent.Builder appComponent(AppComponent appComponent);
+
+        SendOrderComponent build();
+    }
+}
\ No newline at end of file

delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/di/module/SendOrderModule.java

+package com.gingersoft.gsa.delivery_pick_mode.di.module;
+
+import com.jess.arms.di.scope.ActivityScope;
+
+import dagger.Binds;
+import dagger.Module;
+import dagger.Provides;
+
+import com.gingersoft.gsa.delivery_pick_mode.mvp.contract.SendOrderContract;
+import com.gingersoft.gsa.delivery_pick_mode.mvp.model.SendOrderModel;
+
+
+/**
+ * ================================================
+ * Description:
+ * <p>
+ * Created by MVPArmsTemplate on 10/10/2020 14:40
+ * <a href="mailto:jess.yan.effort@gmail.com">Contact me</a>
+ * <a href="https://github.com/JessYanCoding">Follow me</a>
+ * <a href="https://github.com/JessYanCoding/MVPArms">Star me</a>
+ * <a href="https://github.com/JessYanCoding/MVPArms/wiki">See me</a>
+ * <a href="https://github.com/JessYanCoding/MVPArmsTemplate">模版请保持更新</a>
+ * ================================================
+ */
+@Module
+public abstract class SendOrderModule {
+
+    @Binds
+    abstract SendOrderContract.Model bindSendOrderModel(SendOrderModel model);
+}
\ No newline at end of file

delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/mvp/contract/SendOrderContract.java

+package com.gingersoft.gsa.delivery_pick_mode.mvp.contract;
+
+import com.jess.arms.mvp.IModel;
+import com.jess.arms.mvp.IView;
+
+import java.util.Map;
+
+import io.reactivex.Observable;
+
+
+/**
+ * ================================================
+ * Description:
+ * <p>
+ * Created by MVPArmsTemplate on 10/10/2020 14:40
+ * <a href="mailto:jess.yan.effort@gmail.com">Contact me</a>
+ * <a href="https://github.com/JessYanCoding">Follow me</a>
+ * <a href="https://github.com/JessYanCoding/MVPArms">Star me</a>
+ * <a href="https://github.com/JessYanCoding/MVPArms/wiki">See me</a>
+ * <a href="https://github.com/JessYanCoding/MVPArmsTemplate">模版请保持更新</a>
+ * ================================================
+ */
+public interface SendOrderContract {
+    interface View extends IView {
+
+    }
+
+    interface Model extends IModel {
+        /**
+         * 獲取配送信息
+         */
+        Observable<String> getConfirmTakeawayOrderData(Map<String, Object> map);
+    }
+}

delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/mvp/model/SendOrderModel.java

+package com.gingersoft.gsa.delivery_pick_mode.mvp.model;
+
+import android.app.Application;
+
+import com.gingersoft.gsa.delivery_pick_mode.mvp.contract.SendOrderContract;
+import com.gingersoft.gsa.delivery_pick_mode.mvp.server.SendOrderServer;
+import com.google.gson.Gson;
+import com.jess.arms.di.scope.ActivityScope;
+import com.jess.arms.integration.IRepositoryManager;
+import com.jess.arms.mvp.BaseModel;
+
+import java.util.Map;
+
+import javax.inject.Inject;
+
+import io.reactivex.Observable;
+
+
+/**
+ * ================================================
+ * Description:
+ * <p>
+ * Created by MVPArmsTemplate on 10/10/2020 14:40
+ * <a href="mailto:jess.yan.effort@gmail.com">Contact me</a>
+ * <a href="https://github.com/JessYanCoding">Follow me</a>
+ * <a href="https://github.com/JessYanCoding/MVPArms">Star me</a>
+ * <a href="https://github.com/JessYanCoding/MVPArms/wiki">See me</a>
+ * <a href="https://github.com/JessYanCoding/MVPArmsTemplate">模版请保持更新</a>
+ * ================================================
+ */
+@ActivityScope
+public class SendOrderModel extends BaseModel implements SendOrderContract.Model {
+    @Inject
+    Gson mGson;
+    @Inject
+    Application mApplication;
+
+    @Inject
+    public SendOrderModel(IRepositoryManager repositoryManager) {
+        super(repositoryManager);
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        this.mGson = null;
+        this.mApplication = null;
+    }
+
+
+    @Override
+    public Observable<String> getConfirmTakeawayOrderData(Map<String, Object> map) {
+        return mRepositoryManager.obtainRetrofitService(SendOrderServer.class).getConfirmTakeawayOrderData(map);
+    }
+}
\ No newline at end of file

delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/mvp/presenter/SendOrderPresenter.java

+package com.gingersoft.gsa.delivery_pick_mode.mvp.presenter;
+
+import android.app.Application;
+
+import com.gingersoft.gsa.delivery_pick_mode.mvp.contract.SendOrderContract;
+import com.jess.arms.di.scope.ActivityScope;
+import com.jess.arms.http.imageloader.ImageLoader;
+import com.jess.arms.integration.AppManager;
+import com.jess.arms.mvp.BasePresenter;
+import com.jess.arms.utils.RxLifecycleUtils;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.inject.Inject;
+
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
+import me.jessyan.rxerrorhandler.core.RxErrorHandler;
+import me.jessyan.rxerrorhandler.handler.ErrorHandleSubscriber;
+
+
+/**
+ * ================================================
+ * Description:
+ * <p>
+ * Created by MVPArmsTemplate on 10/10/2020 14:40
+ * <a href="mailto:jess.yan.effort@gmail.com">Contact me</a>
+ * <a href="https://github.com/JessYanCoding">Follow me</a>
+ * <a href="https://github.com/JessYanCoding/MVPArms">Star me</a>
+ * <a href="https://github.com/JessYanCoding/MVPArms/wiki">See me</a>
+ * <a href="https://github.com/JessYanCoding/MVPArmsTemplate">模版请保持更新</a>
+ * ================================================
+ */
+@ActivityScope
+public class SendOrderPresenter extends BasePresenter<SendOrderContract.Model, SendOrderContract.View> {
+    @Inject
+    RxErrorHandler mErrorHandler;
+    @Inject
+    Application mApplication;
+    @Inject
+    ImageLoader mImageLoader;
+    @Inject
+    AppManager mAppManager;
+
+    @Inject
+    public SendOrderPresenter(SendOrderContract.Model model, SendOrderContract.View rootView) {
+        super(model, rootView);
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        this.mErrorHandler = null;
+        this.mAppManager = null;
+        this.mImageLoader = null;
+        this.mApplication = null;
+    }
+
+    public void getConfirmTakeawayOrderData() {
+        Map<String, Object> map = new HashMap<>(6);
+        map.put("memberId", 515);
+        map.put("shopId", 26);
+        map.put("price", 0);
+        map.put("pageIndex", 1);
+        map.put("isdefault", 1);
+        map.put("pageSize", 15);
+        mModel.getConfirmTakeawayOrderData(map)
+                .subscribeOn(Schedulers.io())
+                .doOnSubscribe(disposable -> {
+                })
+                .subscribeOn(AndroidSchedulers.mainThread())
+                .observeOn(AndroidSchedulers.mainThread())
+                .doAfterTerminate(() -> {
+                })
+                .compose(RxLifecycleUtils.bindToLifecycle(mRootView))
+                .subscribe(new ErrorHandleSubscriber<String>(mErrorHandler) {
+                    @Override
+                    public void onNext(String s) {
+//                        https://hktest.ricepon.com:64377/member-web/api/member/getAddressAndResSetting?&pageSize=15&shopId=26&isdefault=1&pageIndex=1&price=0&memberId=515
+                    }
+                });
+    }
+
+}

delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/mvp/server/SendOrderServer.java

+package com.gingersoft.gsa.delivery_pick_mode.mvp.server;
+
+import java.util.Map;
+
+import io.reactivex.Observable;
+import me.jessyan.retrofiturlmanager.RetrofitUrlManager;
+import retrofit2.http.GET;
+import retrofit2.http.Headers;
+import retrofit2.http.QueryMap;
+
+public interface SendOrderServer {
+
+    @Headers({"Domain-Name: member-web"})
+    @GET("member/getAddressAndResSetting?" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
+    Observable<String> getConfirmTakeawayOrderData(@QueryMap Map<String, Object> map);
+
+}

delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/mvp/ui/activity/SendOrderActivity.java

+package com.gingersoft.gsa.delivery_pick_mode.mvp.ui.activity;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.gingersoft.gsa.cloud.ui.widget.dialog.LoadingDialog;
+import com.gingersoft.gsa.delivery_pick_mode.R;
+import com.gingersoft.gsa.delivery_pick_mode.R2;
+import com.gingersoft.gsa.delivery_pick_mode.di.component.DaggerSendOrderComponent;
+import com.gingersoft.gsa.delivery_pick_mode.mvp.contract.SendOrderContract;
+import com.gingersoft.gsa.delivery_pick_mode.mvp.presenter.SendOrderPresenter;
+import com.gingersoft.gsa.delivery_pick_mode.ui.adapter.DeliveryAdapter;
+import com.jess.arms.base.BaseActivity;
+import com.jess.arms.di.component.AppComponent;
+import com.jess.arms.utils.ArmsUtils;
+import com.qmuiteam.qmui.widget.QMUITopBar;
+
+import java.util.Arrays;
+import java.util.List;
+
+import butterknife.BindView;
+import butterknife.OnClick;
+
+import static com.jess.arms.utils.Preconditions.checkNotNull;
+
+/**
+ * @author admin
+ */
+public class SendOrderActivity extends BaseActivity<SendOrderPresenter> implements SendOrderContract.View, View.OnClickListener {
+
+    @BindView(R2.id.send_order_top_bar)
+    QMUITopBar topBar;
+    @BindView(R2.id.rv_send_order_foods)
+    RecyclerView rvSendOrderFoods;
+    @BindView(R2.id.rv_send_order_bills)
+    RecyclerView rvSendOrderBills;
+    @BindView(R2.id.tv_send_order_name_text)
+    TextView tvSendOrderNameText;
+    @BindView(R2.id.ed_send_order_name)
+    EditText edSendOrderName;
+    @BindView(R2.id.iv_select_member_arrow)
+    ImageView ivSelectMemberArrow;
+    @BindView(R2.id.tv_send_order_phone_text)
+    TextView tvSendOrderPhoneText;
+    @BindView(R2.id.ed_send_order_phone)
+    EditText edSendOrderPhone;
+    @BindView(R2.id.tv_send_order_address_text)
+    TextView tvSendOrderAddressText;
+    @BindView(R2.id.ed_send_order_address)
+    EditText edSendOrderAddress;
+    @BindView(R2.id.iv_select_address_arrow)
+    ImageView ivSelectAddressArrow;
+    @BindView(R2.id.tv_send_order_label_text)
+    TextView tvSendOrderLabelText;
+    @BindView(R2.id.rv_send_order_label)
+    RecyclerView rvSendOrderLabel;
+    @BindView(R2.id.tv_send_order_distribution_mode_text)
+    TextView tvSendOrderDistributionModeText;
+    @BindView(R2.id.rv_send_order_distribution_mode)
+    RecyclerView rvSendOrderDistributionMode;
+    @BindView(R2.id.tv_send_order_pay_mode_text)
+    TextView tvSendOrderPayModeText;
+    @BindView(R2.id.rv_send_order_pay_mode)
+    RecyclerView rvSendOrderPayMode;
+    @BindView(R2.id.tv_send_order_delivery_time_text)
+    TextView tvSendOrderDeliveryTimeText;
+    @BindView(R2.id.tv_delivery_time_type)
+    TextView tvDeliveryTimeType;
+    @BindView(R2.id.tv_continue_add_food)
+    TextView tvContinueAddFood;
+    @BindView(R2.id.tv_confirm_order)
+    TextView tvConfirmOrder;
+
+    private List<String> labelStrings = Arrays.asList("家", "公司", "學校", "醫院");
+    private List<String> distributionModes = Arrays.asList("本店配送", "物流配送");
+    private List<String> payTypes = Arrays.asList("貨到付款", "立即支付");
+
+    @Override
+    public void setupActivityComponent(@NonNull AppComponent appComponent) {
+        DaggerSendOrderComponent //如找不到该类,请编译一下项目
+                .builder()
+                .appComponent(appComponent)
+                .view(this)
+                .build()
+                .inject(this);
+    }
+
+    @Override
+    public int initView(@Nullable Bundle savedInstanceState) {
+        return R.layout.other_order_activity_send_order;
+    }
+
+    @Override
+    public void initData(@Nullable Bundle savedInstanceState) {
+        mPresenter.getConfirmTakeawayOrderData();
+
+        DeliveryAdapter deliveryAdapter = new DeliveryAdapter(labelStrings);
+        rvSendOrderLabel.setLayoutManager(new GridLayoutManager(mContext, 4));
+        rvSendOrderLabel.setAdapter(deliveryAdapter);
+
+        rvSendOrderDistributionMode.setLayoutManager(new GridLayoutManager(mContext, 3));
+        rvSendOrderDistributionMode.setAdapter(new DeliveryAdapter(distributionModes));
+
+        rvSendOrderPayMode.setLayoutManager(new GridLayoutManager(mContext, 3));
+        rvSendOrderPayMode.setAdapter(new DeliveryAdapter(payTypes));
+    }
+
+    @Override
+    public void initIntent() {
+
+    }
+
+    @Override
+    public void initTopBar() {
+        topBar.setTitle("送單信息");
+        topBar.setBackgroundColor(ContextCompat.getColor(this, R.color.theme_color));
+        topBar.addLeftImageButton(R.drawable.icon_return, R.id.iv_left_back).setOnClickListener(v -> killMyself());
+    }
+
+    @Override
+    public void initLanguage() {
+
+    }
+
+    @Override
+    public void initLayoutParams() {
+
+    }
+
+    @Override
+    public void initLayoutVisible() {
+
+    }
+
+    @Override
+    public void showLoading(String message) {
+        if (message != null) {
+            LoadingDialog.showDialogForLoading(this, message, true);
+        } else {
+            LoadingDialog.showDialogForLoading(this);
+        }
+    }
+
+    @Override
+    public void hideLoading() {
+        LoadingDialog.cancelDialogForLoading();
+    }
+
+    @Override
+    public void showMessage(@NonNull String message) {
+        checkNotNull(message);
+        ArmsUtils.makeText(this, message);
+    }
+
+    @Override
+    public void launchActivity(@NonNull Intent intent) {
+        checkNotNull(intent);
+        ArmsUtils.startActivity(intent);
+    }
+
+    @Override
+    public void killMyself() {
+        finish();
+    }
+
+    @OnClick()
+    @Override
+    public void onClick(View v) {
+        int viewId = v.getId();
+        switch (viewId){
+        }
+    }
+
+}

delivery_pick_module/src/main/res/layout/popup_delivery_time.xml

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="@dimen/dp_5"
+    android:orientation="vertical">
+    <TextView
+        android:id="@+id/tv_delivery_now_time"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:text="現在送出" />
+
+    <TextView
+        android:id="@+id/tv_delivery_other_time"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:layout_marginTop="@dimen/dp_10"
+        android:text="其他時間" />
+</LinearLayout>

delivery_pick_module/src/main/res/values/strings.xml

 <resources>
     <string name="app_name">外送/自取</string>
+    <string name="customer_name">顧客姓名：</string>
+    <string name="please_input_name_or_select_members">請輸入名稱或選擇會員</string>
+
+
+    <string name="customer_phone">顧客電話：</string>
+    <string name="please_input_phone">請輸入電話</string>
+    <string name="delivery_address">送餐地址：</string>
+    <string name="please_input_details_address">請輸入詳細地址 例：5號602室</string>
+    <string name="label">標籤：</string>
+    <string name="distribution_mode">配送方式：</string>
+    <string name="pay_mode">支付類型：</string>
+    <string name="delivery_time">配送時間：</string>
+
 </resources>

delivery_pick_module/src/main/res/values/styles.xml

@@ -45,4 +45,11 @@
         <item name="android:textStyle">bold</item>
     </style>
 
+
+    <style name="otherOrderSendOrder_textStyle">
+        <item name="android:textSize">@dimen/dp_16</item>
+        <item name="android:textColor">@color/theme_333_color</item>
+        <item name="android:textColorHint">@color/color_ccc</item>
+    </style>
+
 </resources>

gradle.properties

@@ -27,4 +27,3 @@ POM_GIT_URL=https://github.com/Tencent/QMUI_Android/
 POM_SITE_URL=https://qmuiteam.com/android
 android.injected.testOnly=false
 BUILD_TYPE = release
\ No newline at end of file
-

lombok.config

+lombok.anyConstructor.suppressConstructorProperties=true
+config.stopBubbling=true
+lombok.equalsAndHashCode.callSuper=call
\ No newline at end of file

order-base/src/main/java/com/gingersoft/gsa/cloud/base/order/adapter/print/FoodAdapter.java

@@ -4,6 +4,8 @@ import android.graphics.Typeface;
 import android.view.View;
 import android.widget.TextView;
 
+import androidx.annotation.Nullable;
+
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.viewholder.BaseViewHolder;
 import com.gingersoft.gsa.cloud.base.R;
@@ -12,8 +14,6 @@ import com.gingersoft.gsa.cloud.database.bean.PrinterDeviceBean;
 
 import java.util.List;
 
-import androidx.annotation.Nullable;
-
 
 /**
  * Created by Wyh on 2020/1/9.
@@ -33,7 +33,7 @@ public class FoodAdapter extends BaseQuickAdapter<OrderDetail, BaseViewHolder> {
     public FoodAdapter(@Nullable List<OrderDetail> data, PrinterDeviceBean deviceBean, boolean showPrice) {
         super(R.layout.print_item_food, data);
         try {
-            this.foodFontSize = Integer.parseInt(deviceBean.getFoodFont()) * 2;
+            this.foodFontSize = Integer.parseInt(deviceBean.getFoodFont()) * 2;//36
             this.modifierFontSize = Integer.parseInt(deviceBean.getModifierFont()) * 2;
         } catch (NumberFormatException e) {
             e.printStackTrace();

order-base/src/main/java/com/gingersoft/gsa/cloud/base/order/bean/BillOrderMoney.java

@@ -61,6 +61,97 @@ public class BillOrderMoney {
         this.money = money;
     }
 
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public double getMoney() {
+        return money;
+    }
+
+    public void setMoney(double money) {
+        this.money = money;
+    }
+
+    public int getTextSize() {
+        return textSize;
+    }
+
+    public void setTextSize(int textSize) {
+        this.textSize = textSize;
+    }
+
+    public int getTextColor() {
+        return textColor;
+    }
+
+    public void setTextColor(int textColor) {
+        this.textColor = textColor;
+    }
+
+    public int getBgColor() {
+        return bgColor;
+    }
+
+    public void setBgColor(int bgColor) {
+        this.bgColor = bgColor;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public static byte getBillItemNoOrderStatus() {
+        return BILL_ITEM_NO_ORDER_STATUS;
+    }
+
+    public static byte getBillItemOrderSentStatus() {
+        return BILL_ITEM_ORDER_SENT_STATUS;
+    }
+
+    public byte getType() {
+        return type;
+    }
+
+    public void setType(byte type) {
+        this.type = type;
+    }
+
+    public static byte getOrderDiscountType() {
+        return ORDER_DISCOUNT_TYPE;
+    }
+
+    public static byte getMemberDiscountType() {
+        return MEMBER_DISCOUNT_TYPE;
+    }
+
+    public static byte getCouponDiscountType() {
+        return COUPON_DISCOUNT_TYPE;
+    }
+
+    public static byte getServerchargeType() {
+        return SERVERCHARGE_TYPE;
+    }
+
+    public static byte getRoundingType() {
+        return ROUNDING_TYPE;
+    }
+
+    public Discount getDiscount() {
+        return discount;
+    }
+
+    public void setDiscount(Discount discount) {
+        this.discount = discount;
+    }
 }
 
 

order-base/src/main/java/com/gingersoft/gsa/cloud/base/order/bean/DeleteOrderRequest.java

@@ -10,6 +10,7 @@ import lombok.Data;
  * 创建日期：2020-02-22
  * 修订历史：2020-02-22
  * 描述：
+ * @author admin
  */
 @Data
 public class DeleteOrderRequest {
@@ -26,5 +27,68 @@ public class DeleteOrderRequest {
         private long id;
         private int number;
 
+        public long getId() {
+            return id;
+        }
+
+        public void setId(long id) {
+            this.id = id;
+        }
+
+        public int getNumber() {
+            return number;
+        }
+
+        public void setNumber(int number) {
+            this.number = number;
+        }
+    }
+
+    public List<DeleteBean> getMapsDelete() {
+        return mapsDelete;
+    }
+
+    public void setMapsDelete(List<DeleteBean> mapsDelete) {
+        this.mapsDelete = mapsDelete;
+    }
+
+    public long getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(long orderId) {
+        this.orderId = orderId;
+    }
+
+    public long getTableId() {
+        return tableId;
+    }
+
+    public void setTableId(long tableId) {
+        this.tableId = tableId;
+    }
+
+    public String getTableNumber() {
+        return tableNumber;
+    }
+
+    public void setTableNumber(String tableNumber) {
+        this.tableNumber = tableNumber;
+    }
+
+    public byte getType() {
+        return type;
+    }
+
+    public void setType(byte type) {
+        this.type = type;
+    }
+
+    public long getReasonId() {
+        return reasonId;
+    }
+
+    public void setReasonId(long reasonId) {
+        this.reasonId = reasonId;
     }
 }

order-base/src/main/java/com/gingersoft/gsa/cloud/base/order/bean/OrderBean.java

@@ -50,6 +50,86 @@ public class OrderBean {
         this.createTime = orderBean.createTime;
     }
 
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public int getPerson() {
+        return person;
+    }
+
+    public void setPerson(int person) {
+        this.person = person;
+    }
+
+    public double getTotalAmount() {
+        return totalAmount;
+    }
+
+    public void setTotalAmount(double totalAmount) {
+        this.totalAmount = totalAmount;
+    }
+
+    public double getTotalPoints() {
+        return totalPoints;
+    }
+
+    public void setTotalPoints(double totalPoints) {
+        this.totalPoints = totalPoints;
+    }
+
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    public MemberInfo getMemberInfo() {
+        return memberInfo;
+    }
+
+    public void setMemberInfo(MemberInfo memberInfo) {
+        this.memberInfo = memberInfo;
+    }
+
+    public List<OrderDiscount.Respose> getDiscountDetails() {
+        return discountDetails;
+    }
+
+    public void setDiscountDetails(List<OrderDiscount.Respose> discountDetails) {
+        this.discountDetails = discountDetails;
+    }
+
+    public List<OrderDetailsBean> getOrderDetails() {
+        return orderDetails;
+    }
+
+    public void setOrderDetails(List<OrderDetailsBean> orderDetails) {
+        this.orderDetails = orderDetails;
+    }
+
     @Data
     public static class OrderDetailsBean implements Serializable {
         /**
@@ -137,6 +217,206 @@ public class OrderBean {
         public OrderDetailsBean() {
         }
 
+        public Long getId() {
+            return id;
+        }
+
+        public void setId(Long id) {
+            this.id = id;
+        }
+
+        public String getProductName() {
+            return productName;
+        }
+
+        public void setProductName(String productName) {
+            this.productName = productName;
+        }
+
+        public long getProductId() {
+            return productId;
+        }
+
+        public void setProductId(long productId) {
+            this.productId = productId;
+        }
+
+        public double getPrice() {
+            return price;
+        }
+
+        public void setPrice(double price) {
+            this.price = price;
+        }
+
+        public double getLunchboxPrice() {
+            return lunchboxPrice;
+        }
+
+        public void setLunchboxPrice(double lunchboxPrice) {
+            this.lunchboxPrice = lunchboxPrice;
+        }
+
+        public int getNumber() {
+            return number;
+        }
+
+        public void setNumber(int number) {
+            this.number = number;
+        }
+
+        public String getCreateTime() {
+            return createTime;
+        }
+
+        public void setCreateTime(String createTime) {
+            this.createTime = createTime;
+        }
+
+        public int getStatus() {
+            return status;
+        }
+
+        public void setStatus(int status) {
+            this.status = status;
+        }
+
+        public byte getType() {
+            return type;
+        }
+
+        public void setType(byte type) {
+            this.type = type;
+        }
+
+        public long getParentId() {
+            return parentId;
+        }
+
+        public void setParentId(long parentId) {
+            this.parentId = parentId;
+        }
+
+        public long getOrderId() {
+            return orderId;
+        }
+
+        public void setOrderId(long orderId) {
+            this.orderId = orderId;
+        }
+
+        public String getPrintSetIng() {
+            return printSetIng;
+        }
+
+        public void setPrintSetIng(String printSetIng) {
+            this.printSetIng = printSetIng;
+        }
+
+        public long getKtPrintMainItem() {
+            return ktPrintMainItem;
+        }
+
+        public void setKtPrintMainItem(long ktPrintMainItem) {
+            this.ktPrintMainItem = ktPrintMainItem;
+        }
+
+        public long getAblediscount() {
+            return ablediscount;
+        }
+
+        public void setAblediscount(long ablediscount) {
+            this.ablediscount = ablediscount;
+        }
+
+        public Long getDiscountId() {
+            return discountId;
+        }
+
+        public void setDiscountId(Long discountId) {
+            this.discountId = discountId;
+        }
+
+        public RestaurantDiscountVO getRestaurantDiscountVO() {
+            return restaurantDiscountVO;
+        }
+
+        public void setRestaurantDiscountVO(RestaurantDiscountVO restaurantDiscountVO) {
+            this.restaurantDiscountVO = restaurantDiscountVO;
+        }
+
+        public byte getScAble() {
+            return scAble;
+        }
+
+        public void setScAble(byte scAble) {
+            this.scAble = scAble;
+        }
+
+        public double getPointsAdd() {
+            return pointsAdd;
+        }
+
+        public void setPointsAdd(double pointsAdd) {
+            this.pointsAdd = pointsAdd;
+        }
+
+        public double getPointsRedeem() {
+            return pointsRedeem;
+        }
+
+        public void setPointsRedeem(double pointsRedeem) {
+            this.pointsRedeem = pointsRedeem;
+        }
+
+        public long getPrintFont() {
+            return printFont;
+        }
+
+        public void setPrintFont(long printFont) {
+            this.printFont = printFont;
+        }
+
+        public long getPrintToBill() {
+            return printToBill;
+        }
+
+        public void setPrintToBill(long printToBill) {
+            this.printToBill = printToBill;
+        }
+
+        public long getPrintTo() {
+            return printTo;
+        }
+
+        public void setPrintTo(long printTo) {
+            this.printTo = printTo;
+        }
+
+        public long getKtShowPrice() {
+            return ktShowPrice;
+        }
+
+        public void setKtShowPrice(long ktShowPrice) {
+            this.ktShowPrice = ktShowPrice;
+        }
+
+        public long getTopId() {
+            return topId;
+        }
+
+        public void setTopId(long topId) {
+            this.topId = topId;
+        }
+
+        public long getMemberId() {
+            return memberId;
+        }
+
+        public void setMemberId(long memberId) {
+            this.memberId = memberId;
+        }
+
         @Override
         public String toString() {
             return "OrderDetailsBean{" +
@@ -176,6 +456,45 @@ public class OrderBean {
             private String remark;
             private double discountAmount;
 
+            public long getId() {
+                return id;
+            }
+
+            public void setId(long id) {
+                this.id = id;
+            }
+
+            public int getType() {
+                return type;
+            }
+
+            public void setType(int type) {
+                this.type = type;
+            }
+
+            public float getDiscountValue() {
+                return discountValue;
+            }
+
+            public void setDiscountValue(float discountValue) {
+                this.discountValue = discountValue;
+            }
+
+            public String getRemark() {
+                return remark;
+            }
+
+            public void setRemark(String remark) {
+                this.remark = remark;
+            }
+
+            public double getDiscountAmount() {
+                return discountAmount;
+            }
+
+            public void setDiscountAmount(double discountAmount) {
+                this.discountAmount = discountAmount;
+            }
         }
     }
 

order-base/src/main/java/com/gingersoft/gsa/cloud/base/order/bean/OrderDetail.java

@@ -255,6 +255,12 @@ public class OrderDetail implements Serializable {
     public OrderDetail() {
     }
 
+    public OrderDetail(String productName, double price, int number) {
+        this.productName = productName;
+        this.price = price;
+        this.number = number;
+    }
+
     public OrderDetail(OrderDetail orderDetail) {
         this.selected = orderDetail.selected;
         this.isIsfood = orderDetail.isIsfood;
@@ -311,6 +317,114 @@ public class OrderDetail implements Serializable {
         this.cancelNumber = orderDetail.cancelNumber;
     }
 
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public void setModify(boolean modify) {
+        isModify = modify;
+    }
+
+    public int getModifyBeforeNumber() {
+        return modifyBeforeNumber;
+    }
+
+    public void setModifyBeforeNumber(int modifyBeforeNumber) {
+        this.modifyBeforeNumber = modifyBeforeNumber;
+    }
+
+    public String getCancelReason() {
+        return cancelReason;
+    }
+
+    public void setCancelReason(String cancelReason) {
+        this.cancelReason = cancelReason;
+    }
+
+    public int getReasonId() {
+        return reasonId;
+    }
+
+    public void setReasonId(int reasonId) {
+        this.reasonId = reasonId;
+    }
+
+    public int getCancelNumber() {
+        return cancelNumber;
+    }
+
+    public void setCancelNumber(int cancelNumber) {
+        this.cancelNumber = cancelNumber;
+    }
+
+    public static byte getFoodProp() {
+        return FOOD_PROP;
+    }
+
+    public static byte getComboProp() {
+        return COMBO_PROP;
+    }
+
+    public static byte getModifierProp() {
+        return MODIFIER_PROP;
+    }
+
+    public static byte getDiscountProp() {
+        return DISCOUNT_PROP;
+    }
+
+    public String getPrintSeting() {
+        return printSeting;
+    }
+
+    public void setPrintSeting(String printSeting) {
+        this.printSeting = printSeting;
+    }
+
+    public byte getScAble() {
+        return scAble;
+    }
+
+    public void setScAble(byte scAble) {
+        this.scAble = scAble;
+    }
+
+    public double getPointsAdd() {
+        return pointsAdd;
+    }
+
+    public void setPointsAdd(double pointsAdd) {
+        this.pointsAdd = pointsAdd;
+    }
+
+    public double getPointsRedeem() {
+        return pointsRedeem;
+    }
+
+    public void setPointsRedeem(double pointsRedeem) {
+        this.pointsRedeem = pointsRedeem;
+    }
+
+    public static byte getStatusNormal() {
+        return STATUS_NORMAL;
+    }
+
+    public static byte getStatusDelete() {
+        return STATUS_DELETE;
+    }
+
+    public static byte getFoodType() {
+        return FOOD_TYPE;
+    }
+
+    public static byte getModifierType() {
+        return MODIFIER_TYPE;
+    }
+
+    public static byte getDiscountType() {
+        return DISCOUNT_TYPE;
+    }
+
     public boolean isModify() {
         if (!isNew &&  modifyBeforeNumber != 0 && number != modifyBeforeNumber) {
             isModify = true;

order-base/src/main/java/com/gingersoft/gsa/cloud/base/order/bean/OrderPayRequest.java

@@ -39,7 +39,125 @@ public class OrderPayRequest {
         private double tipsPrice;
         /**積分支付 所消費的積分*/
         private Double consumptionPoints;
+
+        public int getPayType() {
+            return payType;
+        }
+
+        public void setPayType(int payType) {
+            this.payType = payType;
+        }
+
+        public double getAmount() {
+            return amount;
+        }
+
+        public void setAmount(double amount) {
+            this.amount = amount;
+        }
+
+        public double getTipsPrice() {
+            return tipsPrice;
+        }
+
+        public void setTipsPrice(double tipsPrice) {
+            this.tipsPrice = tipsPrice;
+        }
+
+        public Double getConsumptionPoints() {
+            return consumptionPoints;
+        }
+
+        public void setConsumptionPoints(Double consumptionPoints) {
+            this.consumptionPoints = consumptionPoints;
+        }
+    }
+
+    public long getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(long orderId) {
+        this.orderId = orderId;
+    }
+
+    public int getLinePayType() {
+        return linePayType;
+    }
+
+    public void setLinePayType(int linePayType) {
+        this.linePayType = linePayType;
+    }
+
+    public int getOrderPayType() {
+        return orderPayType;
+    }
+
+    public void setOrderPayType(int orderPayType) {
+        this.orderPayType = orderPayType;
+    }
+
+    public int getTableId() {
+        return tableId;
+    }
+
+    public void setTableId(int tableId) {
+        this.tableId = tableId;
+    }
+
+    public String getTableNumber() {
+        return tableNumber;
+    }
+
+    public void setTableNumber(String tableNumber) {
+        this.tableNumber = tableNumber;
     }
 
+    public Long getMemberId() {
+        return memberId;
+    }
 
+    public void setMemberId(Long memberId) {
+        this.memberId = memberId;
+    }
+
+    public Long getCouponId() {
+        return couponId;
+    }
+
+    public void setCouponId(Long couponId) {
+        this.couponId = couponId;
+    }
+
+    public Double getPointsAdd() {
+        return pointsAdd;
+    }
+
+    public void setPointsAdd(Double pointsAdd) {
+        this.pointsAdd = pointsAdd;
+    }
+
+    public Double getPointsUse() {
+        return pointsUse;
+    }
+
+    public void setPointsUse(Double pointsUse) {
+        this.pointsUse = pointsUse;
+    }
+
+    public int getWhetherFreeService() {
+        return whetherFreeService;
+    }
+
+    public void setWhetherFreeService(int whetherFreeService) {
+        this.whetherFreeService = whetherFreeService;
+    }
+
+    public List<OrderPay> getOrderPays() {
+        return orderPays;
+    }
+
+    public void setOrderPays(List<OrderPay> orderPays) {
+        this.orderPays = orderPays;
+    }
 }

order-base/src/main/java/com/gingersoft/gsa/cloud/base/order/bean/discount/CouponDiscountBean.java

@@ -101,4 +101,204 @@ public class CouponDiscountBean {
         }
         return -MoneyUtil.get_ItemDecimals_money(Math.abs(discountPrice));
     }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getRestaurantId() {
+        return restaurantId;
+    }
+
+    public void setRestaurantId(Long restaurantId) {
+        this.restaurantId = restaurantId;
+    }
+
+    public Long getBrandId() {
+        return brandId;
+    }
+
+    public void setBrandId(Long brandId) {
+        this.brandId = brandId;
+    }
+
+    public String getCouponTypeName1() {
+        return couponTypeName1;
+    }
+
+    public void setCouponTypeName1(String couponTypeName1) {
+        this.couponTypeName1 = couponTypeName1;
+    }
+
+    public String getCouponTypeName2() {
+        return couponTypeName2;
+    }
+
+    public void setCouponTypeName2(String couponTypeName2) {
+        this.couponTypeName2 = couponTypeName2;
+    }
+
+    public String getCouponTypeName3() {
+        return couponTypeName3;
+    }
+
+    public void setCouponTypeName3(String couponTypeName3) {
+        this.couponTypeName3 = couponTypeName3;
+    }
+
+    public String getBeginDate() {
+        return beginDate;
+    }
+
+    public void setBeginDate(String beginDate) {
+        this.beginDate = beginDate;
+    }
+
+    public String getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(String endDate) {
+        this.endDate = endDate;
+    }
+
+    public Integer getPeriodDays() {
+        return periodDays;
+    }
+
+    public void setPeriodDays(Integer periodDays) {
+        this.periodDays = periodDays;
+    }
+
+    public String getPeriodDate() {
+        return periodDate;
+    }
+
+    public void setPeriodDate(String periodDate) {
+        this.periodDate = periodDate;
+    }
+
+    public Integer getUpperLimitTimes() {
+        return upperLimitTimes;
+    }
+
+    public void setUpperLimitTimes(Integer upperLimitTimes) {
+        this.upperLimitTimes = upperLimitTimes;
+    }
+
+    public Byte getCouponType() {
+        return couponType;
+    }
+
+    public void setCouponType(Byte couponType) {
+        this.couponType = couponType;
+    }
+
+    public Byte getStatus() {
+        return status;
+    }
+
+    public void setStatus(Byte status) {
+        this.status = status;
+    }
+
+    public Double getBillMinAmount() {
+        return billMinAmount;
+    }
+
+    public void setBillMinAmount(Double billMinAmount) {
+        this.billMinAmount = billMinAmount;
+    }
+
+    public Integer getSamebillLimitTimes() {
+        return samebillLimitTimes;
+    }
+
+    public void setSamebillLimitTimes(Integer samebillLimitTimes) {
+        this.samebillLimitTimes = samebillLimitTimes;
+    }
+
+    public Byte getExclusive() {
+        return exclusive;
+    }
+
+    public void setExclusive(Byte exclusive) {
+        this.exclusive = exclusive;
+    }
+
+    public Byte getxSc() {
+        return xSc;
+    }
+
+    public void setxSc(Byte xSc) {
+        this.xSc = xSc;
+    }
+
+    public double getAmount() {
+        return amount;
+    }
+
+    public void setAmount(double amount) {
+        this.amount = amount;
+    }
+
+    public int getDiscount() {
+        return discount;
+    }
+
+    public void setDiscount(int discount) {
+        this.discount = discount;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public Byte getxPoints() {
+        return xPoints;
+    }
+
+    public void setxPoints(Byte xPoints) {
+        this.xPoints = xPoints;
+    }
+
+    public Byte getUsageType() {
+        return usageType;
+    }
+
+    public void setUsageType(Byte usageType) {
+        this.usageType = usageType;
+    }
+
+    public Byte getIsType() {
+        return isType;
+    }
+
+    public void setIsType(Byte isType) {
+        this.isType = isType;
+    }
+
+    public Double getSpend() {
+        return spend;
+    }
+
+    public void setSpend(Double spend) {
+        this.spend = spend;
+    }
+
+    public Byte getAccumulate() {
+        return accumulate;
+    }
+
+    public void setAccumulate(Byte accumulate) {
+        this.accumulate = accumulate;
+    }
 }

order-base/src/main/java/com/gingersoft/gsa/cloud/base/order/bean/discount/CouponDiscountResult.java

@@ -30,4 +30,32 @@ public class CouponDiscountResult {
     public static final String ERROR_CODE_0002 = "MEMBER.0002";
     /**掃了其他會員的優惠券碼*/
     public static final String ERROR_CODE_0003 = "MEMBER.0003";
+
+    public CouponDiscountBean getCouponBean() {
+        return couponBean;
+    }
+
+    public void setCouponBean(CouponDiscountBean couponBean) {
+        this.couponBean = couponBean;
+    }
+
+    public MemberInfo getMemberInfo() {
+        return memberInfo;
+    }
+
+    public void setMemberInfo(MemberInfo memberInfo) {
+        this.memberInfo = memberInfo;
+    }
+
+    public static String getErrorCode0001() {
+        return ERROR_CODE_0001;
+    }
+
+    public static String getErrorCode0002() {
+        return ERROR_CODE_0002;
+    }
+
+    public static String getErrorCode0003() {
+        return ERROR_CODE_0003;
+    }
 }

order-base/src/main/java/com/gingersoft/gsa/cloud/base/order/bean/discount/OrderDiscount.java

@@ -49,6 +49,54 @@ public class OrderDiscount {
          */
         private int scAble;
 
+        public int getType() {
+            return type;
+        }
+
+        public void setType(int type) {
+            this.type = type;
+        }
+
+        public Long getDiscountId() {
+            return discountId;
+        }
+
+        public void setDiscountId(Long discountId) {
+            this.discountId = discountId;
+        }
+
+        public Long getMemberId() {
+            return memberId;
+        }
+
+        public void setMemberId(Long memberId) {
+            this.memberId = memberId;
+        }
+
+        public Integer getMemberDiscountRate() {
+            return memberDiscountRate;
+        }
+
+        public void setMemberDiscountRate(Integer memberDiscountRate) {
+            this.memberDiscountRate = memberDiscountRate;
+        }
+
+        public double getDiscountAmount() {
+            return discountAmount;
+        }
+
+        public void setDiscountAmount(double discountAmount) {
+            this.discountAmount = discountAmount;
+        }
+
+        public int getScAble() {
+            return scAble;
+        }
+
+        public void setScAble(int scAble) {
+            this.scAble = scAble;
+        }
+
         public static Request orderDiscountTransRequest(BillOrderMoney discount) {
             Request request = new Request();
             request.setType(ORDER_DISCOUNT);
@@ -124,7 +172,73 @@ public class OrderDiscount {
             return remark;
         }
 
+        public Long getDiscountId() {
+            return discountId;
+        }
+
+        public void setDiscountId(Long discountId) {
+            this.discountId = discountId;
+        }
+
+        public double getDiscountAmount() {
+            return discountAmount;
+        }
+
+        public void setDiscountAmount(double discountAmount) {
+            this.discountAmount = discountAmount;
+        }
+
+        public int getDiscountValue() {
+            return discountValue;
+        }
+
+        public void setDiscountValue(int discountValue) {
+            this.discountValue = discountValue;
+        }
+
+        public int getType() {
+            return type;
+        }
+
+        public void setType(int type) {
+            this.type = type;
+        }
+
+        public void setRemark(String remark) {
+            this.remark = remark;
+        }
+
+        public String getRemark2() {
+            return remark2;
+        }
+
+        public void setRemark2(String remark2) {
+            this.remark2 = remark2;
+        }
+
+        public String getRemark3() {
+            return remark3;
+        }
+
+        public void setRemark3(String remark3) {
+            this.remark3 = remark3;
+        }
 
+        public Double getSpend() {
+            return spend;
+        }
+
+        public void setSpend(Double spend) {
+            this.spend = spend;
+        }
+
+        public Byte getAccumulate() {
+            return accumulate;
+        }
+
+        public void setAccumulate(Byte accumulate) {
+            this.accumulate = accumulate;
+        }
     }
 
 }

order-base/src/main/java/com/gingersoft/gsa/cloud/base/order/bean/mealManger/OpenTableManage.java

@@ -43,4 +43,59 @@ public class OpenTableManage {
         splitNo = "";
     }
 
+    public String getTAG() {
+        return TAG;
+    }
+
+    public void setTAG(String TAG) {
+        this.TAG = TAG;
+    }
+
+    public static OpenTableManage getsDefaultOpenTableManage() {
+        return sDefaultOpenTableManage;
+    }
+
+    public static void setsDefaultOpenTableManage(OpenTableManage sDefaultOpenTableManage) {
+        OpenTableManage.sDefaultOpenTableManage = sDefaultOpenTableManage;
+    }
+
+    public TableBean.DataBean getTableBean() {
+        return tableBean;
+    }
+
+    public void setTableBean(TableBean.DataBean tableBean) {
+        this.tableBean = tableBean;
+    }
+
+    public int getUseStatus() {
+        return useStatus;
+    }
+
+    public void setUseStatus(int useStatus) {
+        this.useStatus = useStatus;
+    }
+
+    public int getPeopleNumber() {
+        return peopleNumber;
+    }
+
+    public void setPeopleNumber(int peopleNumber) {
+        this.peopleNumber = peopleNumber;
+    }
+
+    public boolean isSplite() {
+        return isSplite;
+    }
+
+    public void setSplite(boolean splite) {
+        isSplite = splite;
+    }
+
+    public String getSplitNo() {
+        return splitNo;
+    }
+
+    public void setSplitNo(String splitNo) {
+        this.splitNo = splitNo;
+    }
 }

print-module/src/main/java/com/joe/print/mvp/print/service/PrjService.java

@@ -142,7 +142,7 @@ public class PrjService extends Service implements ReceiveListener {
     private void startGetPrjInfo() {
         cancel(wakeDisposable);
         cancel(disposable);
-        if(!GsaCloudApplication.isLogin){
+        if (!GsaCloudApplication.isLogin) {
             return;
         }
 
@@ -319,6 +319,7 @@ public class PrjService extends Service implements ReceiveListener {
 
     private int totalPrj;
     private int currentIndex;
+
     private void newPrint(String json) {
         printDatas.clear();
         listMap.clear();
@@ -365,6 +366,7 @@ public class PrjService extends Service implements ReceiveListener {
         printerDeviceBeans = printerDeviceDaoUtils.queryAllPrinterDeviceBean();
         //獲取所有通用配置
         printCurrencyBeans = MyPrintUtils.getPrintCurrencyBeans(this);
+
         //雙重遍歷可以以後優化
         //第二步：遍歷 Map<廚房位置，需要打印的數據>，通過廚房位置找到對應的打印機，並且通過數據拿到對應的通用配置
         for (Map.Entry<String, List<PrjBean.DataBean.Bean>> prjMap : listMap.entrySet()) {
@@ -663,6 +665,12 @@ public class PrjService extends Service implements ReceiveListener {
      * @param beans 打印的食品和其他的一些信息
      */
     private List<Map<String, Bitmap>> generatePrintMaps(String key, List<PrjBean.DataBean.Bean> beans, PrinterDeviceBean printerDeviceBean) {
+//        //食品合併
+//        for (PrjBean.DataBean.Bean bean : beans) {
+//            for (PrjBean.DataBean.Bean bean2 : beans) {
+//
+//            }
+//        }
         PrintPrjKitchen printPrjKitchen = new PrintPrjKitchen();
         //這個Map的key是這張PRJ的所有PRJ記錄的id，然後會同時打印多張，所以是一個List集合
         List<Map<String, Bitmap>> bitmapMaps = new ArrayList<>();

print-module/src/main/java/com/joe/print/mvp/ui/activity/PrintActivity.java

@@ -7,7 +7,6 @@ import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
@@ -154,13 +153,17 @@ public class PrintActivity extends BaseActivity<PrintPresenter> implements Print
         PrintCurrencyBean printCurrencyBean = null;
         PrinterDeviceBean defaultPrint;
         //獲取通用打印配置，不同的打印
-        if (type == 0 || type == 1 || type == 2) {
-            //堂食的通用打印配置
-            printCurrencyBean = mPresenter.getPrintCurrencyBeanByType(this, 1);
-        } else if (type == 5 || type == 7) {
+        if (type == 5 || type == 7) {
             //外賣的通用打印配置
             printCurrencyBean = mPresenter.getPrintCurrencyBeanByType(this, 2);
         }
+//        else if (type == 0 || type == 1 || type == 2) {
+//            //堂食的通用打印配置
+//            printCurrencyBean = mPresenter.getPrintCurrencyBeanByType(this, 1);
+//        }
+        else {
+            printCurrencyBean = mPresenter.getPrintCurrencyBeanByType(this, 1);
+        }
         //獲取打印機列表
         printerDeviceBeans = mPresenter.getAllPrintList(this);
         if (type == PrintConstans.PRINT_TEST) {

table-base/src/main/java/com/gingersoft/gsa/cloud/base/table/bean/TableBean.java

@@ -168,6 +168,174 @@ public class TableBean {
             this.splitStatus = dataBean.splitStatus;
             this.tableNumber = dataBean.tableNumber;
         }
+
+        public int getId() {
+            return id;
+        }
+
+        public void setId(int id) {
+            this.id = id;
+        }
+
+        public String getTableName() {
+            return tableName;
+        }
+
+        public void setTableName(String tableName) {
+            this.tableName = tableName;
+        }
+
+        public int getRestaurantId() {
+            return restaurantId;
+        }
+
+        public void setRestaurantId(int restaurantId) {
+            this.restaurantId = restaurantId;
+        }
+
+        public Long getOrderId() {
+            return orderId;
+        }
+
+        public void setOrderId(Long orderId) {
+            this.orderId = orderId;
+        }
+
+        public String getQrCode() {
+            return qrCode;
+        }
+
+        public void setQrCode(String qrCode) {
+            this.qrCode = qrCode;
+        }
+
+        public int getSeatCount() {
+            return seatCount;
+        }
+
+        public void setSeatCount(int seatCount) {
+            this.seatCount = seatCount;
+        }
+
+        public int getMaxSeatCount() {
+            return maxSeatCount;
+        }
+
+        public void setMaxSeatCount(int maxSeatCount) {
+            this.maxSeatCount = maxSeatCount;
+        }
+
+        public int getMinSeatCount() {
+            return minSeatCount;
+        }
+
+        public void setMinSeatCount(int minSeatCount) {
+            this.minSeatCount = minSeatCount;
+        }
+
+        public String getCreateTime() {
+            return createTime;
+        }
+
+        public void setCreateTime(String createTime) {
+            this.createTime = createTime;
+        }
+
+        public String getCreateBy() {
+            return createBy;
+        }
+
+        public void setCreateBy(String createBy) {
+            this.createBy = createBy;
+        }
+
+        public String getQrCodeImg() {
+            return qrCodeImg;
+        }
+
+        public void setQrCodeImg(String qrCodeImg) {
+            this.qrCodeImg = qrCodeImg;
+        }
+
+        public int getPosTableId() {
+            return posTableId;
+        }
+
+        public void setPosTableId(int posTableId) {
+            this.posTableId = posTableId;
+        }
+
+        public long getServiceCharge() {
+            return serviceCharge;
+        }
+
+        public void setServiceCharge(long serviceCharge) {
+            this.serviceCharge = serviceCharge;
+        }
+
+        public long getMemberId() {
+            return memberId;
+        }
+
+        public void setMemberId(long memberId) {
+            this.memberId = memberId;
+        }
+
+        public int getStatus() {
+            return status;
+        }
+
+        public void setStatus(int status) {
+            this.status = status;
+        }
+
+        public int getPerson() {
+            return person;
+        }
+
+        public void setPerson(int person) {
+            this.person = person;
+        }
+
+        public int getUseStatus() {
+            return useStatus;
+        }
+
+        public void setUseStatus(int useStatus) {
+            this.useStatus = useStatus;
+        }
+
+        public int getSort() {
+            return sort;
+        }
+
+        public void setSort(int sort) {
+            this.sort = sort;
+        }
+
+        public int getType() {
+            return type;
+        }
+
+        public void setType(int type) {
+            this.type = type;
+        }
+
+        public int getSplitStatus() {
+            return splitStatus;
+        }
+
+        public void setSplitStatus(int splitStatus) {
+            this.splitStatus = splitStatus;
+        }
+
+        public String getTableNumber() {
+            return tableNumber;
+        }
+
+        public void setTableNumber(String tableNumber) {
+            this.tableNumber = tableNumber;
+        }
     }
 
     public static TableBean.DataBean splitTableTransformTable(TableBean.DataBean mainTable,TableExtBean.DataBean dataBean) {
@@ -209,4 +377,6 @@ public class TableBean {
         tableBean.setSplitStatus(0);
         return tableBean;
     }
+
+
 }

table-base/src/main/java/com/gingersoft/gsa/cloud/base/table/bean/TableExtBean.java

@@ -49,6 +49,124 @@ public class TableExtBean {
         private long updateTime;
         private long createTime;
 
+        public int getId() {
+            return id;
         }
 
+        public void setId(int id) {
+            this.id = id;
+        }
+
+        public int getTableId() {
+            return tableId;
+        }
+
+        public void setTableId(int tableId) {
+            this.tableId = tableId;
+        }
+
+        public long getOrderId() {
+            return orderId;
+        }
+
+        public void setOrderId(long orderId) {
+            this.orderId = orderId;
+        }
+
+        public long getMemberId() {
+            return memberId;
+        }
+
+        public void setMemberId(long memberId) {
+            this.memberId = memberId;
+        }
+
+        public int getInUse() {
+            return inUse;
+        }
+
+        public void setInUse(int inUse) {
+            this.inUse = inUse;
+        }
+
+        public int getTableStatus() {
+            return tableStatus;
+        }
+
+        public void setTableStatus(int tableStatus) {
+            this.tableStatus = tableStatus;
+        }
+
+        public String getDeviceName() {
+            return deviceName;
+        }
+
+        public void setDeviceName(String deviceName) {
+            this.deviceName = deviceName;
+        }
+
+        public String getTableNumber() {
+            return tableNumber;
+        }
+
+        public void setTableNumber(String tableNumber) {
+            this.tableNumber = tableNumber;
+        }
+
+        public String getTableName() {
+            return tableName;
+        }
+
+        public void setTableName(String tableName) {
+            this.tableName = tableName;
+        }
+
+        public int getSeatCount() {
+            return seatCount;
+        }
+
+        public void setSeatCount(int seatCount) {
+            this.seatCount = seatCount;
+        }
+
+        public long getServiceCharge() {
+            return serviceCharge;
+        }
+
+        public void setServiceCharge(long serviceCharge) {
+            this.serviceCharge = serviceCharge;
+        }
+
+        public long getUpdateTime() {
+            return updateTime;
+        }
+
+        public void setUpdateTime(long updateTime) {
+            this.updateTime = updateTime;
+        }
+
+        public long getCreateTime() {
+            return createTime;
+        }
+
+        public void setCreateTime(long createTime) {
+            this.createTime = createTime;
+        }
+    }
+
+    public TableBean.DataBean getRestaurantTable() {
+        return restaurantTable;
+    }
+
+    public void setRestaurantTable(TableBean.DataBean restaurantTable) {
+        this.restaurantTable = restaurantTable;
+    }
+
+    public List<DataBean> getRestaurantTableExtList() {
+        return restaurantTableExtList;
+    }
+
+    public void setRestaurantTableExtList(List<DataBean> restaurantTableExtList) {
+        this.restaurantTableExtList = restaurantTableExtList;
+    }
 }