1、項目結構整理，2、添加獲取deviceId方案

library-common/src/main/java/com/gingersoft/gsa/cloud/common/core/pay/pos/IAdjustTip.java

+package com.gingersoft.gsa.cloud.common.core.pay.pos;
+
+/**
+ * @作者: bin
+ * @創建時間: 2020-12-25 17:43
+ * @更新時間: 2020-12-25 17:43
+ * @描述:
+ */
+public interface IAdjustTip {
+
+    void openAdjustTip();
+
+    void adjustTipComplte(String result);
+
+    void adjustTipError(String error);
+
+}

library-common/src/main/java/com/gingersoft/gsa/cloud/common/core/pay/pos/IRefund.java

+package com.gingersoft.gsa.cloud.common.core.pay.pos;
+
+/**
+ * @作者: bin
+ * @創建時間: 2020-12-25 17:31
+ * @更新時間: 2020-12-25 17:31
+ * @描述:
+ */
+public interface IRefund {
+
+    void openRefund();
+
+    void refundComplte(String result);
+
+    void refundError(String error);
+}

library-common/src/main/java/com/gingersoft/gsa/cloud/common/core/pay/pos/IRetrieval.java

+package com.gingersoft.gsa.cloud.common.core.pay.pos;
+
+/**
+ * @作者: bin
+ * @創建時間: 2020-12-25 17:43
+ * @更新時間: 2020-12-25 17:43
+ * @描述:
+ */
+public interface IRetrieval {
+
+    void openRetrieval();
+
+    void retrievalComplte(String result);
+
+    void retrievalError(String error);
+
+}

library-common/src/main/java/com/gingersoft/gsa/cloud/common/core/pay/pos/ISale.java

+package com.gingersoft.gsa.cloud.common.core.pay.pos;
+
+/**
+ * @作者: bin
+ * @創建時間: 2020-12-25 17:31
+ * @更新時間: 2020-12-25 17:31
+ * @描述:
+ */
+public interface ISale {
+
+    void openPay();
+
+    void payComplte(String result);
+
+    void payError(String error);
+}

library-common/src/main/java/com/gingersoft/gsa/cloud/common/core/pay/pos/ISettlement.java

+package com.gingersoft.gsa.cloud.common.core.pay.pos;
+
+/**
+ * @作者: bin
+ * @創建時間: 2020-12-25 17:43
+ * @更新時間: 2020-12-25 17:43
+ * @描述:
+ */
+public interface ISettlement {
+
+    void openSettlement();
+
+    void SettlementComplte(String result);
+
+    void SettlementError(String error);
+
+}

library-common/src/main/java/com/gingersoft/gsa/cloud/common/core/pay/pos/IVoid.java

+package com.gingersoft.gsa.cloud.common.core.pay.pos;
+
+/**
+ * @作者: bin
+ * @創建時間: 2020-12-25 17:43
+ * @更新時間: 2020-12-25 17:43
+ * @描述:
+ */
+public interface IVoid {
+
+    void openVoid();
+
+    void voidComplte(String result);
+
+    void voidError(String error);
+
+}

library-common/src/main/java/com/gingersoft/gsa/cloud/common/core/pay/pos/base/request/BaseSaleRequest.java

+package com.gingersoft.gsa.cloud.common.core.pay.pos.base.request;
+
+/**
+ * @作者: bin
+ * @創建時間: 2020-12-25 17:40
+ * @更新時間: 2020-12-25 17:40
+ * @描述:
+ */
+public abstract class BaseSaleRequest {
+
+
+}

library-common/src/main/java/com/gingersoft/gsa/cloud/common/core/pay/pos/base/response/BaseSaleResponse.java

+package com.gingersoft.gsa.cloud.common.core.pay.pos.base.response;
+
+/**
+ * @作者: bin
+ * @創建時間: 2020-12-25 17:40
+ * @更新時間: 2020-12-25 17:40
+ * @描述:
+ */
+public class BaseSaleResponse {
+}

library-common/src/main/java/com/gingersoft/gsa/cloud/common/core/pay/pos/bean/PosMatter.java

+package com.gingersoft.gsa.cloud.common.core.pay.pos.bean;
+
+import lombok.Data;
+
+/**
+ * @作者: bin
+ * @創建時間: 2020-12-25 17:53
+ * @更新時間: 2020-12-25 17:53
+ * @描述: 事項實體
+ */
+@Data
+public class PosMatter {
+
+    private Long id;
+    /**
+     * N5支付ID（N5支付 TXN_ID 唯一標示，雲端GSA生成）
+     */
+    private String payId;
+    /**
+     * N5退款ID（N5退款 Refund_ID 唯一標示，雲端GSA生成）
+     */
+    private String refundId;
+    /**
+     * 設備ID
+     */
+    private String deviceId;
+    /**
+     * 訂單ID
+     */
+    private Long orderId;
+    /**
+     * 事項類型：1 支付，2 取消，3 退款，4 追加小費，5 清機
+     */
+    private Byte businessType;
+    /**
+     * 狀態：0 未處理，1 成功，2 失敗
+     */
+    private Byte status;
+    /**
+     * 主檯ID
+     */
+    private Long tableId;
+    /**
+     * 分檯ID
+     */
+    private Long tableExtId;
+    /**
+     * 支付方式ID
+     */
+    private Long payMethodId;
+    /**
+     * 支付金額
+     */
+    private Double amount;
+    /**
+     * 創建時間
+     */
+    private Long createTime;
+    /**
+     * 創建人ID
+     */
+    private Long createBy;
+    /**
+     * 更新時間
+     */
+    private Long updateTime;
+    /**
+     * 更新人ID
+     */
+    private Long updateBy;
+
+    /**
+     * 業務類型：1 支付，2 取消，3 退款，4 追加小費，5 清機
+     */
+    public static final byte BUSINESS_TYPE_PAY = 1;
+    public static final byte BUSINESS_TYPE_CANCEL = 2;
+    public static final byte BUSINESS_TYPE_REFUND = 3;
+    public static final byte BUSINESS_TYPE_TIP = 4;
+    public static final byte BUSINESS_TYPE_SETTLE = 5;
+
+    /**
+     * 狀態：0 未處理，1 成功，2 失敗
+     */
+    public static final byte STATUS_UNTREATED = 0;
+    public static final byte STATUS_SUCCESS = 1;
+    public static final byte STATUS_FAILURE = 2;
+
+
+}

library-common/src/main/java/com/gingersoft/gsa/cloud/common/core/pay/pos/bean/PosPayLog.java

+package com.gingersoft.gsa.cloud.common.core.pay.pos.bean;
+
+import lombok.Data;
+
+/**
+ * @作者: bin
+ * @創建時間: 2020-12-25 17:54
+ * @更新時間: 2020-12-25 17:54
+ * @描述: 支付日誌實體
+ */
+@Data
+public class PosPayLog {
+
+    private Long id;
+    /**
+     * 訂單ID
+     */
+    private Long orderId;
+    /**
+     * 設備ID
+     */
+    private String deviceId;
+    /**
+     * 業務類型：1 支付，2 取消，3 退款，4 追加小費，5 清機
+     */
+    private Byte businessType;
+    /**
+     * 狀態：0 未處理，1 成功，2 失敗
+     */
+    private Byte status;
+    /**
+     * N5 回調內容
+     */
+    private Long content;
+    /**
+     * 創建時間
+     */
+    private Long createTime;
+    /**
+     * 創建人ID
+     */
+    private Long createBy;
+    /**
+     * 更新時間
+     */
+    private Long updateTime;
+    /**
+     * 更新人ID
+     */
+    private Long updateBy;
+
+    /**
+     * 業務類型：1 支付，2 取消，3 退款，4 追加小費，5 清機
+     */
+    public static final byte BUSINESS_TYPE_PAY = 1;
+    public static final byte BUSINESS_TYPE_CANCEL = 2;
+    public static final byte BUSINESS_TYPE_REFUND = 3;
+    public static final byte BUSINESS_TYPE_TIP = 4;
+    public static final byte BUSINESS_TYPE_SETTLE = 5;
+
+    /**
+     * 狀態：0 未處理，1 成功，2 失敗
+     */
+    public static final byte STATUS_UNTREATED = 0;
+    public static final byte STATUS_SUCCESS = 1;
+    public static final byte STATUS_FAILURE = 2;
+}

library-pay/src/main/java/com/gingersoft/gsa/cloud/pay/pos/hywebpos/command/CommandImpl.java → library-common/src/main/java/com/gingersoft/gsa/cloud/common/core/pay/pos/hywebpos/command/CommandImpl.java

-package com.gingersoft.gsa.cloud.pay.pos.hywebpos.command;
+package com.gingersoft.gsa.cloud.common.core.pay.pos.hywebpos.command;
 
 //public class CommandImpl implements ICommand {
 //

library-pay/src/main/java/com/gingersoft/gsa/cloud/pay/pos/hywebpos/constant/PayMethodConstant.java → library-common/src/main/java/com/gingersoft/gsa/cloud/common/core/pay/pos/hywebpos/constant/PayMethodConstant.java

-package com.gingersoft.gsa.cloud.pay.pos.hywebpos.constant;
+package com.gingersoft.gsa.cloud.common.core.pay.pos.hywebpos.constant;
 
 /**
  * @作者: bin

library-pay/src/main/java/com/gingersoft/gsa/cloud/pay/pos/hywebpos/constant/PayStatusConstant.java → library-common/src/main/java/com/gingersoft/gsa/cloud/common/core/pay/pos/hywebpos/constant/PayStatusConstant.java

-package com.gingersoft.gsa.cloud.pay.pos.hywebpos.constant;
+package com.gingersoft.gsa.cloud.common.core.pay.pos.hywebpos.constant;
 
 /**
  * @作者: bin

library-common/src/main/java/com/gingersoft/gsa/cloud/common/core/pay/pos/hywebpos/imp/HywebPosSaleImp.java

+package com.gingersoft.gsa.cloud.common.core.pay.pos.hywebpos.imp;
+
+import android.app.Activity;
+
+import com.gingersoft.gsa.cloud.common.core.pay.pos.ISale;
+
+import java.lang.ref.WeakReference;
+
+/**
+ * @作者: bin
+ * @創建時間: 2020-12-25 17:35
+ * @更新時間: 2020-12-25 17:35
+ * @描述:
+ */
+public class HywebPosSaleImp implements ISale {
+
+    private WeakReference<Activity> activityWeakReference;
+//    private StatusLoadingDialog mStatusLoadingDialog;
+
+    public HywebPosSaleImp(WeakReference<Activity> activity) {
+        this.activityWeakReference = activity;
+    }
+
+    @Override
+    public void openPay() {
+
+    }
+
+    @Override
+    public void payComplte(String result) {
+
+    }
+
+    @Override
+    public void payError(String error) {
+
+    }
+
+}

library-common/src/main/java/com/gingersoft/gsa/cloud/common/core/pay/pos/hywebpos/imp/HywebPosVoidImp.java

+package com.gingersoft.gsa.cloud.common.core.pay.pos.hywebpos.imp;
+
+
+import com.gingersoft.gsa.cloud.common.core.pay.pos.IVoid;
+
+/**
+ * @作者: bin
+ * @創建時間: 2020-12-25 17:35
+ * @更新時間: 2020-12-25 17:35
+ * @描述:
+ */
+public class HywebPosVoidImp implements IVoid {
+
+
+    @Override
+    public void openVoid() {
+
+    }
+
+    @Override
+    public void voidComplte(String result) {
+
+    }
+
+    @Override
+    public void voidError(String error) {
+
+    }
+}

library-pay/src/main/java/com/gingersoft/gsa/cloud/pay/pos/hywebpos/request/pos/AdjustTipRequest.java → library-common/src/main/java/com/gingersoft/gsa/cloud/common/core/pay/pos/hywebpos/request/pos/AdjustTipRequest.java

-package com.gingersoft.gsa.cloud.pay.pos.hywebpos.request.pos;
+package com.gingersoft.gsa.cloud.common.core.pay.pos.hywebpos.request.pos;
 
 import lombok.Data;
 

library-pay/src/main/java/com/gingersoft/gsa/cloud/pay/pos/hywebpos/request/pos/RefundRequest.java → library-common/src/main/java/com/gingersoft/gsa/cloud/common/core/pay/pos/hywebpos/request/pos/RefundRequest.java

-package com.gingersoft.gsa.cloud.pay.pos.hywebpos.request.pos;
+package com.gingersoft.gsa.cloud.common.core.pay.pos.hywebpos.request.pos;
 
 import lombok.Data;
 

library-pay/src/main/java/com/gingersoft/gsa/cloud/pay/pos/hywebpos/request/pos/RetrievalRequest.java → library-common/src/main/java/com/gingersoft/gsa/cloud/common/core/pay/pos/hywebpos/request/pos/RetrievalRequest.java

-package com.gingersoft.gsa.cloud.pay.pos.hywebpos.request.pos;
+package com.gingersoft.gsa.cloud.common.core.pay.pos.hywebpos.request.pos;
 
 import lombok.Data;
 

library-pay/src/main/java/com/gingersoft/gsa/cloud/pay/pos/hywebpos/request/pos/SaleRequest.java → library-common/src/main/java/com/gingersoft/gsa/cloud/common/core/pay/pos/hywebpos/request/pos/SaleRequest.java

-package com.gingersoft.gsa.cloud.pay.pos.hywebpos.request.pos;
+package com.gingersoft.gsa.cloud.common.core.pay.pos.hywebpos.request.pos;
 
 import lombok.Data;
 

library-pay/src/main/java/com/gingersoft/gsa/cloud/pay/pos/hywebpos/request/pos/SettlementRequest.java → library-common/src/main/java/com/gingersoft/gsa/cloud/common/core/pay/pos/hywebpos/request/pos/SettlementRequest.java

-package com.gingersoft.gsa.cloud.pay.pos.hywebpos.request.pos;
+package com.gingersoft.gsa.cloud.common.core.pay.pos.hywebpos.request.pos;
 
 import lombok.Data;
 

library-pay/src/main/java/com/gingersoft/gsa/cloud/pay/pos/hywebpos/request/pos/VoidRequest.java → library-common/src/main/java/com/gingersoft/gsa/cloud/common/core/pay/pos/hywebpos/request/pos/VoidRequest.java

-package com.gingersoft.gsa.cloud.pay.pos.hywebpos.request.pos;
+package com.gingersoft.gsa.cloud.common.core.pay.pos.hywebpos.request.pos;
 
 import lombok.Data;
 

library-pay/src/main/java/com/gingersoft/gsa/cloud/pay/pos/hywebpos/request/pos/WaitRequest.java → library-common/src/main/java/com/gingersoft/gsa/cloud/common/core/pay/pos/hywebpos/request/pos/WaitRequest.java

-package com.gingersoft.gsa.cloud.pay.pos.hywebpos.request.pos;
+package com.gingersoft.gsa.cloud.common.core.pay.pos.hywebpos.request.pos;
 
 import lombok.Data;
 

library-pay/src/main/java/com/gingersoft/gsa/cloud/pay/pos/hywebpos/response/pos/AdjustTipRespose.java → library-common/src/main/java/com/gingersoft/gsa/cloud/common/core/pay/pos/hywebpos/response/pos/AdjustTipRespose.java

-package com.gingersoft.gsa.cloud.pay.pos.hywebpos.response.pos;
+package com.gingersoft.gsa.cloud.common.core.pay.pos.hywebpos.response.pos;
 
 import lombok.Data;
 

library-pay/src/main/java/com/gingersoft/gsa/cloud/pay/pos/hywebpos/response/pos/RefundRespose.java → library-common/src/main/java/com/gingersoft/gsa/cloud/common/core/pay/pos/hywebpos/response/pos/RefundRespose.java

-package com.gingersoft.gsa.cloud.pay.pos.hywebpos.response.pos;
+package com.gingersoft.gsa.cloud.common.core.pay.pos.hywebpos.response.pos;
 
 import lombok.Data;
 

library-pay/src/main/java/com/gingersoft/gsa/cloud/pay/pos/hywebpos/response/pos/RetrievalRespose.java → library-common/src/main/java/com/gingersoft/gsa/cloud/common/core/pay/pos/hywebpos/response/pos/RetrievalRespose.java

-package com.gingersoft.gsa.cloud.pay.pos.hywebpos.response.pos;
+package com.gingersoft.gsa.cloud.common.core.pay.pos.hywebpos.response.pos;
 
 import lombok.Data;
 

library-pay/src/main/java/com/gingersoft/gsa/cloud/pay/pos/hywebpos/response/pos/SaleRespose.java → library-common/src/main/java/com/gingersoft/gsa/cloud/common/core/pay/pos/hywebpos/response/pos/SaleRespose.java

-package com.gingersoft.gsa.cloud.pay.pos.hywebpos.response.pos;
+package com.gingersoft.gsa.cloud.common.core.pay.pos.hywebpos.response.pos;
 
 import lombok.Data;
 

library-pay/src/main/java/com/gingersoft/gsa/cloud/pay/pos/hywebpos/response/pos/SettlementRespose.java → library-common/src/main/java/com/gingersoft/gsa/cloud/common/core/pay/pos/hywebpos/response/pos/SettlementRespose.java

-package com.gingersoft.gsa.cloud.pay.pos.hywebpos.response.pos;
+package com.gingersoft.gsa.cloud.common.core.pay.pos.hywebpos.response.pos;
 
 import lombok.Data;
 

library-pay/src/main/java/com/gingersoft/gsa/cloud/pay/pos/hywebpos/response/pos/VoidRespose.java → library-common/src/main/java/com/gingersoft/gsa/cloud/common/core/pay/pos/hywebpos/response/pos/VoidRespose.java

-package com.gingersoft.gsa.cloud.pay.pos.hywebpos.response.pos;
+package com.gingersoft.gsa.cloud.common.core.pay.pos.hywebpos.response.pos;
 
 import lombok.Data;
 

library-order/src/androidTest/java/com/gingersoft/runtime/pay_module/ExampleInstrumentedTest.java

@@ -2,8 +2,8 @@ package com.gingersoft.runtime.pay_module;
 
 import android.content.Context;
 
-import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;