q-koa 12.8.3 → 12.8.4

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. package/core/file/plugins/app/controller.js +12 -8
  2. package/core/file/plugins/toutiao/controller.js +12 -8
  3. package/core/file/plugins/user/controller.js +24 -16
  4. package/core/file/plugins/weixin/controller.js +61 -41
  5. package/package.json +1 -1
package/core/file/plugins/app/controller.js CHANGED
@@ -28,21 +28,25 @@ exports.login = async (ctx) => {
28
28
  id: result.id,
29
29
  name: result.name,
30
30
  mobile: result.mobile,
31
- h5_user: result.h5_user
32
- ? {
33
- openid: result.h5_user && result.h5_user.openid,
34
- }
35
- : null,
36
31
  mp_user: result.mp_user
37
32
  ? {
38
33
  openid: result.mp_user && result.mp_user.openid,
39
34
  }
40
35
  : null,
41
- toutiao_user: result.toutiao_user
36
+ ...(result.h5_user
42
37
  ? {
43
- openid: result.toutiao_user && result.toutiao_user.openid,
38
+ h5_user: {
39
+ openid: result.h5_user && result.h5_user.openid,
40
+ },
44
41
  }
45
- : null,
42
+ : {}),
43
+ ...(result.toutiao_user
44
+ ? {
45
+ toutiao_user: {
46
+ openid: result.toutiao_user && result.toutiao_user.openid,
47
+ },
48
+ }
49
+ : {}),
46
50
  }
47
51
  const token = await app.sign({
48
52
  user: tokenResult,
package/core/file/plugins/toutiao/controller.js CHANGED
@@ -167,21 +167,25 @@ exports.login = async (ctx) => {
167
167
  id: result.id,
168
168
  name: result.name,
169
169
  mobile: result.mobile,
170
- h5_user: result.h5_user
171
- ? {
172
- openid: result.h5_user && result.h5_user.openid,
173
- }
174
- : null,
175
170
  mp_user: result.mp_user
176
171
  ? {
177
172
  openid: result.mp_user && result.mp_user.openid,
178
173
  }
179
174
  : null,
180
- toutiao_user: result.toutiao_user
175
+ ...(result.h5_user
181
176
  ? {
182
- openid: result.toutiao_user && result.toutiao_user.openid,
177
+ h5_user: {
178
+ openid: result.h5_user && result.h5_user.openid,
179
+ },
183
180
  }
184
- : null,
181
+ : {}),
182
+ ...(result.toutiao_user
183
+ ? {
184
+ toutiao_user: {
185
+ openid: result.toutiao_user && result.toutiao_user.openid,
186
+ },
187
+ }
188
+ : {}),
185
189
  }
186
190
 
187
191
  const token = await app.sign({
package/core/file/plugins/user/controller.js CHANGED
@@ -185,21 +185,25 @@ exports.login = async (ctx) => {
185
185
  id: result.id,
186
186
  name: result.name,
187
187
  mobile: result.mobile,
188
- h5_user: result.h5_user
189
- ? {
190
- openid: result.h5_user && result.h5_user.openid,
191
- }
192
- : null,
193
188
  mp_user: result.mp_user
194
189
  ? {
195
190
  openid: result.mp_user && result.mp_user.openid,
196
191
  }
197
192
  : null,
198
- toutiao_user: result.toutiao_user
193
+ ...(result.h5_user
194
+ ? {
195
+ h5_user: {
196
+ openid: result.h5_user && result.h5_user.openid,
197
+ },
198
+ }
199
+ : {}),
200
+ ...(result.toutiao_user
199
201
  ? {
200
- openid: result.toutiao_user && result.toutiao_user.openid,
202
+ toutiao_user: {
203
+ openid: result.toutiao_user && result.toutiao_user.openid,
204
+ },
201
205
  }
202
- : null,
206
+ : {}),
203
207
  }
204
208
  const token = await app.sign({
205
209
  user: tokenResult,
@@ -409,21 +413,25 @@ exports.checkLogin = async (ctx) => {
409
413
  id: result.id,
410
414
  name: result.name,
411
415
  mobile: result.mobile,
412
- h5_user: result.h5_user
413
- ? {
414
- openid: result.h5_user && result.h5_user.openid,
415
- }
416
- : null,
417
416
  mp_user: result.mp_user
418
417
  ? {
419
418
  openid: result.mp_user && result.mp_user.openid,
420
419
  }
421
420
  : null,
422
- toutiao_user: result.toutiao_user
421
+ ...(result.h5_user
423
422
  ? {
424
- openid: result.toutiao_user && result.toutiao_user.openid,
423
+ h5_user: {
424
+ openid: result.h5_user && result.h5_user.openid,
425
+ },
425
426
  }
426
- : null,
427
+ : {}),
428
+ ...(result.toutiao_user
429
+ ? {
430
+ toutiao_user: {
431
+ openid: result.toutiao_user && result.toutiao_user.openid,
432
+ },
433
+ }
434
+ : {}),
427
435
  }
428
436
  const token = await app.sign({
429
437
  user: tokenResult,
package/core/file/plugins/weixin/controller.js CHANGED
@@ -126,21 +126,25 @@ exports.mp_getPhone = async (ctx) => {
126
126
  id: result.id,
127
127
  name: result.name,
128
128
  mobile: result.mobile,
129
- h5_user: result.h5_user
130
- ? {
131
- openid: result.h5_user && result.h5_user.openid,
132
- }
133
- : null,
134
129
  mp_user: result.mp_user
135
130
  ? {
136
131
  openid: result.mp_user && result.mp_user.openid,
137
132
  }
138
133
  : null,
139
- toutiao_user: result.toutiao_user
134
+ ...(result.h5_user
140
135
  ? {
141
- openid: result.toutiao_user && result.toutiao_user.openid,
136
+ h5_user: {
137
+ openid: result.h5_user && result.h5_user.openid,
138
+ },
142
139
  }
143
- : null,
140
+ : {}),
141
+ ...(result.toutiao_user
142
+ ? {
143
+ toutiao_user: {
144
+ openid: result.toutiao_user && result.toutiao_user.openid,
145
+ },
146
+ }
147
+ : {}),
144
148
  }
145
149
 
146
150
  const token = await app.sign({
@@ -244,21 +248,25 @@ exports.mp_getPhoneNew = async (ctx) => {
244
248
  id: result.id,
245
249
  name: result.name,
246
250
  mobile: result.mobile,
247
- h5_user: result.h5_user
248
- ? {
249
- openid: result.h5_user && result.h5_user.openid,
250
- }
251
- : null,
252
251
  mp_user: result.mp_user
253
252
  ? {
254
253
  openid: result.mp_user && result.mp_user.openid,
255
254
  }
256
255
  : null,
257
- toutiao_user: result.toutiao_user
256
+ ...(result.h5_user
258
257
  ? {
259
- openid: result.toutiao_user && result.toutiao_user.openid,
258
+ h5_user: {
259
+ openid: result.h5_user && result.h5_user.openid,
260
+ },
260
261
  }
261
- : null,
262
+ : {}),
263
+ ...(result.toutiao_user
264
+ ? {
265
+ toutiao_user: {
266
+ openid: result.toutiao_user && result.toutiao_user.openid,
267
+ },
268
+ }
269
+ : {}),
262
270
  }
263
271
 
264
272
  const token = await app.sign({
@@ -470,21 +478,25 @@ exports.mp_login = async (ctx) => {
470
478
  id: result.id,
471
479
  name: result.name,
472
480
  mobile: result.mobile,
473
- h5_user: result.h5_user
474
- ? {
475
- openid: result.h5_user && result.h5_user.openid,
476
- }
477
- : null,
478
481
  mp_user: result.mp_user
479
482
  ? {
480
483
  openid: result.mp_user && result.mp_user.openid,
481
484
  }
482
485
  : null,
483
- toutiao_user: result.toutiao_user
486
+ ...(result.h5_user
484
487
  ? {
485
- openid: result.toutiao_user && result.toutiao_user.openid,
488
+ h5_user: {
489
+ openid: result.h5_user && result.h5_user.openid,
490
+ },
486
491
  }
487
- : null,
492
+ : {}),
493
+ ...(result.toutiao_user
494
+ ? {
495
+ toutiao_user: {
496
+ openid: result.toutiao_user && result.toutiao_user.openid,
497
+ },
498
+ }
499
+ : {}),
488
500
  }
489
501
 
490
502
  const token = await app.sign({
@@ -646,21 +658,25 @@ exports.h5_login_callback = async (ctx) => {
646
658
  id: result.id,
647
659
  name: result.name,
648
660
  mobile: result.mobile,
649
- h5_user: result.h5_user
650
- ? {
651
- openid: result.h5_user && result.h5_user.openid,
652
- }
653
- : null,
654
661
  mp_user: result.mp_user
655
662
  ? {
656
663
  openid: result.mp_user && result.mp_user.openid,
657
664
  }
658
665
  : null,
659
- toutiao_user: result.toutiao_user
666
+ ...(result.h5_user
660
667
  ? {
661
- openid: result.toutiao_user && result.toutiao_user.openid,
668
+ h5_user: {
669
+ openid: result.h5_user && result.h5_user.openid,
670
+ },
662
671
  }
663
- : null,
672
+ : {}),
673
+ ...(result.toutiao_user
674
+ ? {
675
+ toutiao_user: {
676
+ openid: result.toutiao_user && result.toutiao_user.openid,
677
+ },
678
+ }
679
+ : {}),
664
680
  }
665
681
 
666
682
  const token = await app.sign({
@@ -777,21 +793,25 @@ exports.h5_login_info_callback = async (ctx) => {
777
793
  id: result.id,
778
794
  name: result.name,
779
795
  mobile: result.mobile,
780
- h5_user: result.h5_user
781
- ? {
782
- openid: result.h5_user && result.h5_user.openid,
783
- }
784
- : null,
785
796
  mp_user: result.mp_user
786
797
  ? {
787
798
  openid: result.mp_user && result.mp_user.openid,
788
799
  }
789
800
  : null,
790
- toutiao_user: result.toutiao_user
801
+ ...(result.h5_user
802
+ ? {
803
+ h5_user: {
804
+ openid: result.h5_user && result.h5_user.openid,
805
+ },
806
+ }
807
+ : {}),
808
+ ...(result.toutiao_user
791
809
  ? {
792
- openid: result.toutiao_user && result.toutiao_user.openid,
810
+ toutiao_user: {
811
+ openid: result.toutiao_user && result.toutiao_user.openid,
812
+ },
793
813
  }
794
- : null,
814
+ : {}),
795
815
  }
796
816
 
797
817
  const token = await app.sign({
@@ -1401,7 +1421,7 @@ exports.refund_notify = async (ctx) => {
1401
1421
  : Number(out_refund_no.split('-')[1])
1402
1422
  const type = out_refund_no.includes('_') ? out_refund_no.split('_')[1] : ''
1403
1423
  const model = prefix ? `${prefix}_order` : 'order'
1404
- console.log(`微信退款回调 ${refundResult}`)
1424
+
1405
1425
  if (app.service[model] && app.service[model].refund_notify) {
1406
1426
  await app.service[model].refund_notify({
1407
1427
  app,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "q-koa",
3
- "version": "12.8.3",
3
+ "version": "12.8.4",
4
4
  "description": "",
5
5
  "main": "index.js",
6
6
  "scripts": {