:spakles:新增适配微信新数据，调整测试用例命名 AutoAccountingOrg#71

taigongzhaihua · Apr 14, 2024 · 2647960 · 2647960
1 parent 7139834
commit 2647960
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 9 deletions.
diff --git a/src/rule/app/com.tencent.mm/微信支付/main.js b/src/rule/app/com.tencent.mm/微信支付/main.js
@@ -21,8 +21,7 @@ const regexMap = new Map([
     [/扣费金额￥(\d+\.\d{2})\n扣费服务(.*?)\n扣费内容(.*?)\n支付方式(.*?)\n收单机构.*/, (match) => ({
         money: parseFloat(match[1]),
         accountNameFrom: match[4],
-        shopName: match[2],
-        shopItem: match[3],
+        shopItem: `${match[2]} - ${match[3]}`,
         type: BillType.Expend
     })],
     [/收款金额￥(\d+\.\d{2})\n汇总(.*?)\n备注.*/, (match) => ({
@@ -70,7 +69,7 @@ export function get(data) {
     return new RuleObject(
         parsedText.type,
         parsedText.money,
-        parsedText.shopName,
+        mapItem.display_name,
         parsedText.shopItem,
         parsedText.accountNameFrom,
         "",

diff --git a/src/rule/app/com.tencent.mm/微信支付/main.test.js b/src/rule/app/com.tencent.mm/微信支付/main.test.js
@@ -5,7 +5,7 @@ const {testAnkioInit, testAnkio} = require("../../../../tests/TestUtils");
 const {DataType} = require("../../../../utils/DataType");
 
 testAnkioInit(get,__dirname,DataType.App,"com.tencent.mm")
-test("微信支付扫码付款（商家收款码）", () => testAnkio('微信支付扫码付款（商家收款码）',[
+test("微信支付消费（商家收款）", () => testAnkio('微信支付消费（商家收款）',[
     {
         type: 0,
         money: 14.00,
@@ -20,7 +20,7 @@ test("微信支付扫码付款（商家收款码）", () => testAnkio('微信支
     }
 ]))
 
-test("微信支付扫码付款（第三方收款码）", () => testAnkio('微信支付扫码付款（第三方收款码）',[
+test("微信支付消费（第三方收款）", () => testAnkio('微信支付消费（第三方收款）',[
     {
         type: 0,
         money: 2.00,
@@ -56,6 +56,18 @@ test("微信支付扫码付款（第三方收款码）", () => testAnkio('微信
         currency: 'CNY',
         time: 0,
         channel: '微信[微信支付]'
+    },
+    {
+        type: 0,
+        money: 35.41,
+        fee: 0,
+        shopName: '京东',
+        shopItem: '',
+        accountNameFrom: '中国银行储蓄卡(7575)',
+        accountNameTo: '',
+        currency: 'CNY',
+        time: 0,
+        channel: '微信[微信支付]'
     }
 ]))
 
@@ -64,8 +76,8 @@ test("微信支付自动扣费", () => testAnkio('微信支付自动扣费',[
         type: 0,
         money: 53.72,
         fee: 0,
-        shopName: '滴滴出行',
-        shopItem: '先乘后付',
+        shopName: '',
+        shopItem: '滴滴出行 - 先乘后付',
         accountNameFrom: '零钱通',
         accountNameTo: '',
         currency: 'CNY',
@@ -76,8 +88,8 @@ test("微信支付自动扣费", () => testAnkio('微信支付自动扣费',[
         type: 0,
         money: 51.70,
         fee: 0,
-        shopName: '滴滴出行',
-        shopItem: '先乘后付',
+        shopName: '',
+        shopItem: '滴滴出行 - 先乘后付',
         accountNameFrom: '零钱通',
         accountNameTo: '',
         currency: 'CNY',

diff --git a/...tencent.mm/微信支付/tests/微信支付扫码付款（商家收款码）.txt → ...om.tencent.mm/微信支付/tests/微信支付消费（商家收款）.txt b/...tencent.mm/微信支付/tests/微信支付扫码付款（商家收款码）.txt → ...om.tencent.mm/微信支付/tests/微信支付消费（商家收款）.txt
diff --git a/...encent.mm/微信支付/tests/微信支付扫码付款（第三方收款码）.txt → ...m.tencent.mm/微信支付/tests/微信支付消费（第三方收款）.txt b/...encent.mm/微信支付/tests/微信支付扫码付款（第三方收款码）.txt → ...m.tencent.mm/微信支付/tests/微信支付消费（第三方收款）.txt
diff --git a/...ncent.mm/微信支付/tests/微信支付扫码付款（第三方收款码）2.txt → ....tencent.mm/微信支付/tests/微信支付消费（第三方收款）2.txt b/...ncent.mm/微信支付/tests/微信支付扫码付款（第三方收款码）2.txt → ....tencent.mm/微信支付/tests/微信支付消费（第三方收款）2.txt
diff --git a/...ncent.mm/微信支付/tests/微信支付扫码付款（第三方收款码）3.txt → ....tencent.mm/微信支付/tests/微信支付消费（第三方收款）3.txt b/...ncent.mm/微信支付/tests/微信支付扫码付款（第三方收款码）3.txt → ....tencent.mm/微信支付/tests/微信支付消费（第三方收款）3.txt
diff --git a/src/rule/app/com.tencent.mm/微信支付/tests/微信支付消费（第三方收款）4.txt b/src/rule/app/com.tencent.mm/微信支付/tests/微信支付消费（第三方收款）4.txt
@@ -0,0 +1 @@
+{"mMap":{"description":"付款金额￥35.41\n付款方式中国银行储蓄卡(7575)\n收单机构财付通支付科技有限公司","source":"微信支付","type":5,"appId":"","msgId":99064,"title":"已支付¥35.41","display_name":"京东"}}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{"mMap":{"description":"付款金额￥35.41\n付款方式中国银行储蓄卡(7575)\n收单机构财付通支付科技有限公司","source":"微信支付","type":5,"appId":"","msgId":99064,"title":"已支付¥35.41","display_name":"京东"}}