Merge branch 'gateway' of gitee.com:bootx/daxpay into union_pay

# Conflicts:
#	_doc/Task.md
#	daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/channel/UnionPayController.java
#	daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/code/PaySyncStatusEnum.java
#	daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/code/PayWayEnum.java
#	daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/code/UnionPayWay.java
#	daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/union/service/UnionPayService.java
#	daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/order/refund/dao/RefundOrderManager.java
#	daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/reconcile/strategy/UnionPayReconcileStrategy.java
#	daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/sdk/union/api/UnionPayKit.java
#	daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/task/service/RefundSyncTaskService.java

_doc/Task.md

@@ -25,8 +25,15 @@
 - [ ] 数据库表进行规则, 字段设置长度, 增加索引
 
 **任务池**
+- [x] 支付SDK编写
+- [x] 接入支付网关的演示项目
+- [x] 增加聚合支付功能支持
+- [x] 增加手机用户收银台功能
+- [ ] 订单超时支持数据表级别触发
 - [ ] 支持转账操作, 通过支付通道专有参数进行实现, 转账时只能单个通道进行操作
 - [ ] 支付成功回调后, 如果订单已超时, 则进入待退款订单中，提示进行退款，或者自动退款
+- [x] 增加回调机制(通知客户端)
+- [ ] 增加消息通知机制(通知客户端)
 - [ ] 新增支付单预警功能, 处理支付单与网关状态不一致且无法自动修复的情况
 - [ ] 微信消息通知相关配置
 - [ ] 钉钉消息通知配置

daxpay-single/daxpay-single-core/src/main/java/cn/bootx/platform/daxpay/code/PaySyncStatusEnum.java

@@ -28,7 +28,7 @@ public enum PaySyncStatusEnum {
      * 所以查询为了区分，增加一个未知的状态, 用于处理这种特殊情况, 然后根据业务需要，关闭订单或者进行其他操作
      */
     NOT_FOUND_UNKNOWN("pay_not_found_unknown","交易不存在(特殊)"),
-    /** 订单到了超时时间, 不分情况可以进行手动设置支付超时状态 */
+    /** 订单到了超时时间, 可以进行手动设置支付超时状态 */
     TIMEOUT("pay_timeout", "支付超时");
 
     /** 编码 */

daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/sdk/union/api/UnionPayKit.java

@@ -284,7 +284,6 @@ public class UnionPayKit extends UnionPayService {
             params.put(SDKConstants.param_reqReserved, order.getAddition());
         }
         switch (type) {
-            //
             case WAP:
             case WEB:
             case B2B: