From ea2635a0e4661d0c7a6b61e45682e6707620fc25 Mon Sep 17 00:00:00 2001
From: xuanchen <122383162@qq.com>
Date: Mon, 21 Dec 2020 15:12:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 composer.lock       | 16 +++++++----
 config/unionpay.php | 68 +++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 72 insertions(+), 12 deletions(-)

diff --git a/composer.lock b/composer.lock
index 82a8bbb..57d6b74 100644
--- a/composer.lock
+++ b/composer.lock
@@ -5959,16 +5959,16 @@
         },
         {
             "name": "xuanchen/unionpay",
-            "version": "2.0",
+            "version": "2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/xuanchen120/unionpay.git",
-                "reference": "089e8bef2e815ed37ffacecdd95f8bde0c352268"
+                "reference": "8f714a9b312893aca914a43d58ad190b6b2f1e88"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/xuanchen120/unionpay/zipball/089e8bef2e815ed37ffacecdd95f8bde0c352268",
-                "reference": "089e8bef2e815ed37ffacecdd95f8bde0c352268",
+                "url": "https://api.github.com/repos/xuanchen120/unionpay/zipball/8f714a9b312893aca914a43d58ad190b6b2f1e88",
+                "reference": "8f714a9b312893aca914a43d58ad190b6b2f1e88",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -6005,7 +6005,11 @@
                 }
             ],
             "description": "第三方银联对接",
-            "time": "2020-12-14T00:54:58+00:00"
+            "support": {
+                "issues": "https://github.com/xuanchen120/unionpay/issues",
+                "source": "https://github.com/xuanchen120/unionpay/tree/2.2"
+            },
+            "time": "2020-12-21T07:04:17+00:00"
         }
     ],
     "packages-dev": [
@@ -8349,5 +8353,5 @@
         "php": "^7.2"
     },
     "platform-dev": [],
-    "plugin-api-version": "1.1.0"
+    "plugin-api-version": "2.0.0"
 }
diff --git a/config/unionpay.php b/config/unionpay.php
index 16904cb..4c1f63a 100644
--- a/config/unionpay.php
+++ b/config/unionpay.php
@@ -45,6 +45,7 @@ return [
         'openid' => '封装openid参数',
         '106040' => '领券',
         '012100' => '核销通知',
+        'code'   => '生活请求发券',
     ],
     'log_type'     => [
         '002025' => 'query',
@@ -55,6 +56,58 @@ return [
         '106040' => 'getcode',
         '012100' => 'notify',
     ],
+    // 签名检查数据  没有为全数据
+    'checksign'    => [
+        '106040' => [
+            'in'  => [
+                'msg_type',
+                'msg_txn_code',
+                'msg_crrltn_id',
+                'msg_flg',
+                'msg_sender',
+                'msg_time',
+                'msg_sys_sn',
+                'msg_ver',
+                'sign_type',
+            ],
+            'out' => [
+                'msg_type',
+                'msg_txn_code',
+                'msg_crrltn_id',
+                'msg_flg',
+                'msg_sender',
+                'msg_sys_sn',
+                'msg_time',
+                'msg_ver',
+                'msg_rsp_code',
+                'msg_rsp_desc',
+            ],
+        ],
+        '012100' => [
+            'in'  => [
+                'msg_type',
+                'msg_txn_code',
+                'msg_crrltn_id',
+                'msg_flg',
+                'msg_sender',
+                'msg_time',
+                'msg_sys_sn',
+                'msg_ver',
+            ],
+            'out' => [
+                'msg_type',
+                'msg_txn_code',
+                'msg_crrltn_id',
+                'msg_flg',
+                'msg_sender',
+                'msg_time',
+                'msg_sys_sn',
+                'msg_ver',
+                'msg_rsp_code',
+                'msg_rsp_desc',
+            ],
+        ],
+    ],
     //需要校验的数据
     'validator'    => [
         '002025' => [
@@ -148,7 +201,7 @@ return [
             'event_no',
             'issue_user_id',
         ],
-        //回调核销信息
+        //回调核销信息 校验数据项目
         '012100' => [
             'msg_type',
             'msg_txn_code',
@@ -163,15 +216,18 @@ return [
             'shop_no',
             'req_serial_no',
             'coupon_no',
+            'coupon_type',
+            'enc_card_no',
+            'acq_term_sn',
+            'refer_no',
+            'sett_date',
+            'txn_date',
+            'txn_time',
             'orig_amt',
             'discount_amt',
             'pay_amt',
+            'pay_mode',
             'event_no',
-            'trans_crrltn_no',
-            'order_no',
-            'order_no',
-            'order_no',
-            'order_no',
         ],
     ],
     //入库基础数据