struggle 2.0.4 → 2.0.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/struggle/logistic.rb +1 -1
- data/lib/struggle/pay_gateway.rb +3 -2
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 0cdb993b1ce68adc13aa2e499e50e0de4db0ea1b
|
|
4
|
+
data.tar.gz: c5fca3e0ee7f9c69ed7bb882c956ce76325e5565
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: a53cf016e4b54544e7cf781447039bdff818b55974c5b292c46acfb1ff307ebea27f4b82f3e36c545b473d4c03bd7649ed1261473dfee2feccc84bb549ad3796
|
|
7
|
+
data.tar.gz: 0622bb965c35fd4ceffe173974cc663f5826499002357f1bf6dfcdcb2e44c01be9ad570554914d4f8ebebf3641377c34cf302182099249e0c9c1d7ce1078a8e3
|
data/lib/struggle/logistic.rb
CHANGED
|
@@ -40,7 +40,7 @@ module Struggle
|
|
|
40
40
|
"zhengzhoujianhua"=>"郑州建华", "zhongtianwanyun"=>"中天万运"}
|
|
41
41
|
|
|
42
42
|
GuoJi_Company = {"auspost" => "澳大利亚邮政", "aramex" => "Aramex", "bpost" => "比利时邮政", "bpostinter" => "比利时邮政国际件", "canpost" => "加拿大邮政", "canpostfr" => "加拿大邮政", "citylink" => "City-Link", "emsen" => "EMS-（中国-中国）件-英文",
|
|
43
|
-
"fedex" => "Fedex-国际件", "fedexcn" => "Fedex-中国件", "fedexus" => "Fedex-美国件", "dhlen" => "DHL-国际件", "
|
|
43
|
+
"fedex" => "Fedex-国际件", "fedexcn" => "Fedex-中国件", "fedexus" => "Fedex-美国件", "dhlen" => "DHL-国际件", "haiwaihuanqiu"=>"海外环球", "lianbangkuaidien" => "Fedex-中国件-英文", "shunfengen"=>"顺丰-英文","cces" => "希伊艾斯（CCES）", "aae" => "AAE",
|
|
44
44
|
"dpex" => "DPEX", "dpexen" => "DPEX", "dhl" => "DHL-中国件", "dhlde" => "DHL-德国件", "ems" => "EMS-（中国-中国）件",
|
|
45
45
|
"emsguoji" => "EMS-（中国-国际）件", "emsinten" => "EMS-（中国-国际）件-英文", "gls" => "GLS", "hkpost" => "香港邮政", "ruidianyouzheng" => "瑞典邮政包裹小包", "singpost" => "新加坡邮政包裹小包", "tnt" => "TNT-中文", "tnten" => "TNT-英文",
|
|
46
46
|
"ups" => "UPS-中文", "upsen" => "UPS-英文", "usps" => "USPS", "youzhengguonei" => "邮政包裹、挂号信-中国件", "youzhengguoji" => "邮政包裹、挂号信-国际件", "zhongyouwuliu" => "中邮物流"}
|
data/lib/struggle/pay_gateway.rb
CHANGED
|
@@ -30,14 +30,15 @@ module Struggle
|
|
|
30
30
|
def self.receive(params, key)
|
|
31
31
|
v_oid = params["v_oid"]
|
|
32
32
|
v_pstatus = params["v_pstatus"]
|
|
33
|
+
v_pstring = params["v_pstring"]
|
|
33
34
|
v_md5str = params["v_md5str"]
|
|
34
35
|
v_amount = params["v_amount"]
|
|
35
36
|
remark1 = params["remark1"]
|
|
36
37
|
v_moneytype = params["v_moneytype"]
|
|
37
38
|
if v_pstatus=="20" && v_md5str==Digest::MD5.hexdigest(v_oid+v_pstatus+v_amount+v_moneytype+key).upcase
|
|
38
|
-
return {state: true, code: v_oid, amount: v_amount, remark1: remark1}
|
|
39
|
+
return {state: true, code: v_oid, amount: v_amount, remark1: remark1, v_pstring: v_pstring}
|
|
39
40
|
else
|
|
40
|
-
return {state: false, code: v_oid, amount: v_amount, remark1: remark1}
|
|
41
|
+
return {state: false, code: v_oid, amount: v_amount, remark1: remark1, result: v_pstring}
|
|
41
42
|
end
|
|
42
43
|
end
|
|
43
44
|
end
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: struggle
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.0.
|
|
4
|
+
version: 2.0.5
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- lean
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2015-09
|
|
11
|
+
date: 2015-10-09 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: iconv
|