blsm-vd-core 0.4.0 → 0.4.1

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.
Files changed (5) hide show
  1. checksums.yaml +13 -5
  2. data/Gemfile.lock +1 -1
  3. data/lib/blsm-vd-core/version.rb +1 -1
  4. data/lib/blsm-vd-core.rb +16 -5
  5. metadata +25 -25
checksums.yaml CHANGED
@@ -1,7 +1,15 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: bf07cda0da972dc53eac58aca880cdfbee8ff55d
4
- data.tar.gz: 1f744ca8b99dc5e9c0ba68ce695d2606d4fd4e39
2
+ !binary "U0hBMQ==":
3
+ metadata.gz: !binary |-
4
+ ZjI3N2NkYmE1ZGVkNDdiMWVhMWVkNDdjODUxNzZlMmQwNDYxNjJhYg==
5
+ data.tar.gz: !binary |-
6
+ MTljYjk2OTFmYTlkZjFjYjNhYjFhYTJlMDMwZmM3MTlhNTUxNjRkZA==
5
7
  SHA512:
6
- metadata.gz: 10b1a91b040c16bfa282589a7467ea989a57a7f00ed61c605af4757c6a273229e8da68d21f96d378c2374d1922505aa3a190f2582b6f7f42e0c4381089b19f4b
7
- data.tar.gz: 50e46ea162f5ba6d3181a55711848e0e5972649bd79bc33800cbff5a28ddffd3cf2defa6f2b8c909d73094f203c810e244263a1aa874cccc4d5ed839f0d6f382
8
+ metadata.gz: !binary |-
9
+ MmZhZTg2ZTFjOGFkYWVlODg0ZGRiOTA1OTRmMzUyMDA1N2IwNTU1MzY0NjE4
10
+ YzhlYjRmNjhmNjFhNjkwZmUwOTRkMzZhMjU1NGQ5YzE1MWI5ZDI5MjI5ZWNi
11
+ N2NiZTNkMTc0OTY5YjQxODhhYzgyM2ExYjVjYjFlZmNlYWQ3Nzg=
12
+ data.tar.gz: !binary |-
13
+ ZDMyMzc2NTExYWRiNDFhYjE5ZTNhOTM4NTM2OWNkYzU2ZTUzNDY1N2U5ZWQ4
14
+ OTYwOTYwMjJkMjYxMDEwMWM5MjRiMmUzZGZjMDc2NTBhYzRjZDliMjE4OTEz
15
+ MWY4MGEzZWI0NjBkODc1NzM1MTAwY2Y1ZmMxZDc4MzU3MmJiNTM=
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- blsm-vd-core (0.3.9)
4
+ blsm-vd-core (0.4.0)
5
5
 
6
6
  GEM
7
7
  remote: https://ruby.taobao.org/
data/lib/blsm-vd-core/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module BlsmVdCore
2
- VERSION = "0.4.0"
2
+ VERSION = "0.4.1"
3
3
  end
data/lib/blsm-vd-core.rb CHANGED
@@ -80,6 +80,21 @@ module BlsmVdCore
80
80
  ERROR_CODES[0]
81
81
  end
82
82
 
83
+ #发送物流返款通知
84
+ def send_cash_back_notify(order_id)
85
+ order = Order.where(id: order_id).first
86
+ seller = order.application.user if order && order.application
87
+ #数据校验
88
+ return ERROR_CODES[404] unless order
89
+ return ERROR_CODES[4045] unless seller
90
+
91
+ #物流返款通知
92
+ seller_notify = {touser: seller.openid, order_id: Order.encrypt(Order.encrypted_id_key, order.id.to_s), content: "【物流返款通知】"}
93
+ BlsmMpWx.create_msg(nil, seller.openid, seller_notify, 'order')
94
+
95
+ ERROR_CODES[200]
96
+ end
97
+
83
98
  #物流返款
84
99
  #==== Parameters
85
100
  # * +order_id+ - 订单id
@@ -101,14 +116,10 @@ module BlsmVdCore
101
116
  return danger if danger
102
117
 
103
118
  #（物流返款成功，订单完成）
104
- if sign_type =~ /sign_ok/
119
+ if sign_type =~ /sign_ok/ && order.pay_off_line?
105
120
  note = Order.latest_notes(clearing_item, {username: '首趣'}, '标记物流返款')
106
121
  clearing_item.marking_confirm(note)
107
122
 
108
- #物流返款通知
109
- seller_notify = {touser: seller.openid, order_id: Order.encrypt(Order.encrypted_id_key, order.id.to_s), content: "【物流返款通知】"}
110
- BlsmMpWx.create_msg(nil, seller.openid, seller_notify, 'order')
111
-
112
123
  VdInfoSec.committed(vd_transaction)
113
124
  return ERROR_CODES[200]
114
125
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: blsm-vd-core
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.0
4
+ version: 0.4.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - saxer
@@ -15,140 +15,140 @@ dependencies:
15
15
  name: rspec
16
16
  requirement: !ruby/object:Gem::Requirement
17
17
  requirements:
18
- - - "~>"
18
+ - - ~>
19
19
  - !ruby/object:Gem::Version
20
20
  version: '3.2'
21
21
  type: :development
22
22
  prerelease: false
23
23
  version_requirements: !ruby/object:Gem::Requirement
24
24
  requirements:
25
- - - "~>"
25
+ - - ~>
26
26
  - !ruby/object:Gem::Version
27
27
  version: '3.2'
28
28
  - !ruby/object:Gem::Dependency
29
29
  name: bundler
30
30
  requirement: !ruby/object:Gem::Requirement
31
31
  requirements:
32
- - - "~>"
32
+ - - ~>
33
33
  - !ruby/object:Gem::Version
34
34
  version: '1.9'
35
35
  type: :development
36
36
  prerelease: false
37
37
  version_requirements: !ruby/object:Gem::Requirement
38
38
  requirements:
39
- - - "~>"
39
+ - - ~>
40
40
  - !ruby/object:Gem::Version
41
41
  version: '1.9'
42
42
  - !ruby/object:Gem::Dependency
43
43
  name: rake
44
44
  requirement: !ruby/object:Gem::Requirement
45
45
  requirements:
46
- - - "~>"
46
+ - - ~>
47
47
  - !ruby/object:Gem::Version
48
48
  version: '10.0'
49
49
  type: :development
50
50
  prerelease: false
51
51
  version_requirements: !ruby/object:Gem::Requirement
52
52
  requirements:
53
- - - "~>"
53
+ - - ~>
54
54
  - !ruby/object:Gem::Version
55
55
  version: '10.0'
56
56
  - !ruby/object:Gem::Dependency
57
57
  name: rails
58
58
  requirement: !ruby/object:Gem::Requirement
59
59
  requirements:
60
- - - "~>"
60
+ - - ~>
61
61
  - !ruby/object:Gem::Version
62
62
  version: '3.2'
63
63
  type: :development
64
64
  prerelease: false
65
65
  version_requirements: !ruby/object:Gem::Requirement
66
66
  requirements:
67
- - - "~>"
67
+ - - ~>
68
68
  - !ruby/object:Gem::Version
69
69
  version: '3.2'
70
70
  - !ruby/object:Gem::Dependency
71
71
  name: mysql2
72
72
  requirement: !ruby/object:Gem::Requirement
73
73
  requirements:
74
- - - "~>"
74
+ - - ~>
75
75
  - !ruby/object:Gem::Version
76
76
  version: 0.3.16
77
77
  type: :development
78
78
  prerelease: false
79
79
  version_requirements: !ruby/object:Gem::Requirement
80
80
  requirements:
81
- - - "~>"
81
+ - - ~>
82
82
  - !ruby/object:Gem::Version
83
83
  version: 0.3.16
84
84
  - !ruby/object:Gem::Dependency
85
85
  name: activemodel
86
86
  requirement: !ruby/object:Gem::Requirement
87
87
  requirements:
88
- - - "~>"
88
+ - - ~>
89
89
  - !ruby/object:Gem::Version
90
90
  version: '3.2'
91
91
  type: :development
92
92
  prerelease: false
93
93
  version_requirements: !ruby/object:Gem::Requirement
94
94
  requirements:
95
- - - "~>"
95
+ - - ~>
96
96
  - !ruby/object:Gem::Version
97
97
  version: '3.2'
98
98
  - !ruby/object:Gem::Dependency
99
99
  name: activerecord
100
100
  requirement: !ruby/object:Gem::Requirement
101
101
  requirements:
102
- - - "~>"
102
+ - - ~>
103
103
  - !ruby/object:Gem::Version
104
104
  version: '3.2'
105
105
  type: :development
106
106
  prerelease: false
107
107
  version_requirements: !ruby/object:Gem::Requirement
108
108
  requirements:
109
- - - "~>"
109
+ - - ~>
110
110
  - !ruby/object:Gem::Version
111
111
  version: '3.2'
112
112
  - !ruby/object:Gem::Dependency
113
113
  name: activesupport
114
114
  requirement: !ruby/object:Gem::Requirement
115
115
  requirements:
116
- - - "~>"
116
+ - - ~>
117
117
  - !ruby/object:Gem::Version
118
118
  version: '3.2'
119
119
  type: :development
120
120
  prerelease: false
121
121
  version_requirements: !ruby/object:Gem::Requirement
122
122
  requirements:
123
- - - "~>"
123
+ - - ~>
124
124
  - !ruby/object:Gem::Version
125
125
  version: '3.2'
126
126
  - !ruby/object:Gem::Dependency
127
127
  name: faraday
128
128
  requirement: !ruby/object:Gem::Requirement
129
129
  requirements:
130
- - - "~>"
130
+ - - ~>
131
131
  - !ruby/object:Gem::Version
132
132
  version: '0.9'
133
133
  type: :development
134
134
  prerelease: false
135
135
  version_requirements: !ruby/object:Gem::Requirement
136
136
  requirements:
137
- - - "~>"
137
+ - - ~>
138
138
  - !ruby/object:Gem::Version
139
139
  version: '0.9'
140
140
  - !ruby/object:Gem::Dependency
141
141
  name: blsm-mp-wx
142
142
  requirement: !ruby/object:Gem::Requirement
143
143
  requirements:
144
- - - "~>"
144
+ - - ~>
145
145
  - !ruby/object:Gem::Version
146
146
  version: 0.2.3
147
147
  type: :development
148
148
  prerelease: false
149
149
  version_requirements: !ruby/object:Gem::Requirement
150
150
  requirements:
151
- - - "~>"
151
+ - - ~>
152
152
  - !ruby/object:Gem::Version
153
153
  version: 0.2.3
154
154
  description: 首趣微店核心模块,包含结算项的创建、更新、删除,微店主积分的更改等信息
@@ -159,8 +159,8 @@ executables: []
159
159
  extensions: []
160
160
  extra_rdoc_files: []
161
161
  files:
162
- - ".gitignore"
163
- - ".travis.yml"
162
+ - .gitignore
163
+ - .travis.yml
164
164
  - Gemfile
165
165
  - Gemfile.lock
166
166
  - README.md
@@ -194,12 +194,12 @@ require_paths:
194
194
  - lib
195
195
  required_ruby_version: !ruby/object:Gem::Requirement
196
196
  requirements:
197
- - - ">="
197
+ - - ! '>='
198
198
  - !ruby/object:Gem::Version
199
199
  version: '0'
200
200
  required_rubygems_version: !ruby/object:Gem::Requirement
201
201
  requirements:
202
- - - ">="
202
+ - - ! '>='
203
203
  - !ruby/object:Gem::Version
204
204
  version: '0'
205
205
  requirements: []