Skip to content

T
taobao-mini-template
Commit 2938eda6 authored by qinhaitao's avatar qinhaitao
Browse files
Options

fix: 🐛 vip bug

parent ddd7a2a0
Show whitespace changes
Inline Side-by-side
Showing with 15 additions and 12 deletions
v2.0/dist/decorator/services.js
View file @ 2938eda6
...@@ -44,33 +44,35 @@ var sdk_1 = require("../sdk"); ...@@ -44,33 +44,35 @@ var sdk_1 = require("../sdk");
var constants_1 = require("../constants"); var constants_1 = require("../constants");
var vip_1 = require("../utils/package/vip"); var vip_1 = require("../utils/package/vip");
function initBaseInfo(context, baseInfos) { function initBaseInfo(context, baseInfos) {
var _a, _b, _c;
return __awaiter(this, void 0, void 0, function () { return __awaiter(this, void 0, void 0, function () {
var userService, userInfo, _a, session, userNick, vipInfo; var handler, userService, userInfo, _d, session, userNick, vipInfo;
return __generator(this, function (_b) { return __generator(this, function (_e) {
switch (_b.label) { switch (_e.label) {
case 0: case 0:
handler = (_c = (_b = (_a = context === null || context === void 0 ? void 0 : context.cloud) === null || _a === void 0 ? void 0 : _a.dataspace) === null || _b === void 0 ? void 0 : _b.context) === null || _c === void 0 ? void 0 : _c.handler;
userService = new service_1.UserService(context); userService = new service_1.UserService(context);
if (!!baseInfos.userInfo) return [3 /*break*/, 2]; if (!!baseInfos.userInfo) return [3 /*break*/, 2];
return [4 /*yield*/, userService.getUserInfo()]; return [4 /*yield*/, userService.getUserInfo()];
case 1: case 1:
userInfo = _b.sent(); userInfo = _e.sent();
baseInfos.userInfo = userInfo; baseInfos.userInfo = userInfo;
_b.label = 2; _e.label = 2;
case 2: case 2:
if (!!baseInfos.session) return [3 /*break*/, 4]; if (!!baseInfos.session) return [3 /*break*/, 4];
return [4 /*yield*/, utils_1.getSellerSession(context)]; return [4 /*yield*/, utils_1.getSellerSession(context)];
case 3: case 3:
_a = _b.sent(), session = _a.session, userNick = _a.userNick; _d = _e.sent(), session = _d.session, userNick = _d.userNick;
baseInfos.session = session; baseInfos.session = session;
baseInfos.activityUserNick = userNick; baseInfos.activityUserNick = userNick;
_b.label = 4; _e.label = 4;
case 4: case 4:
if (!(!baseInfos.vipInfo && context.fcName !== 'getVipInfo')) return [3 /*break*/, 6]; if (!(!baseInfos.vipInfo && handler !== 'getVipInfo')) return [3 /*break*/, 6];
return [4 /*yield*/, userService.getShopVip(baseInfos.session, vip_1.formatVipCbUrl(context), baseInfos.activityUserNick)]; return [4 /*yield*/, userService.getShopVip(baseInfos.session, vip_1.formatVipCbUrl(context), baseInfos.activityUserNick)];
case 5: case 5:
vipInfo = _b.sent(); vipInfo = _e.sent();
baseInfos.vipInfo = vipInfo; baseInfos.vipInfo = vipInfo;
_b.label = 6; _e.label = 6;
case 6: return [2 /*return*/, baseInfos]; case 6: return [2 /*return*/, baseInfos];
} }
}); });
......
v2.0/dist/decorator/services.js.map
View file @ 2938eda6
{"version":3,"file":"services.js","sourceRoot":"","sources":["../../src/decorator/services.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,cAAc;AACd,sCAAwC;AACxC,kCAAkE;AAClE,8BAAqC;AACrC,0CAAyC;AACzC,4CAAqD;AACrD,SAAe,YAAY,CAAC,OAA0B,EAAE,SAA2B;;;;;;oBAC3E,WAAW,GAAG,IAAI,qBAAW,CAAC,OAAO,CAAC,CAAA;yBAExC,CAAC,SAAS,CAAC,QAAQ,EAAnB,wBAAmB;oBACJ,qBAAM,WAAW,CAAC,WAAW,EAAE,EAAA;;oBAA1C,QAAQ,GAAG,SAA+B;oBAChD,SAAS,CAAC,QAAQ,GAAG,QAAQ,CAAA;;;yBAG3B,CAAC,SAAS,CAAC,OAAO,EAAlB,wBAAkB;oBACU,qBAAM,wBAAgB,CAAC,OAAO,CAAC,EAAA;;oBAAvD,KAAwB,SAA+B,EAArD,OAAO,aAAA,EAAE,QAAQ,cAAA;oBACzB,SAAS,CAAC,OAAO,GAAG,OAAO,CAAA;oBAC3B,SAAS,CAAC,gBAAgB,GAAG,QAAQ,CAAA;;;yBAGnC,CAAA,CAAC,SAAS,CAAC,OAAO,IAAI,OAAO,CAAC,MAAM,KAAK,YAAY,CAAA,EAArD,wBAAqD;oBACvC,qBAAM,WAAW,CAAC,UAAU,CAAC,SAAS,CAAC,OAAO,EAAE,oBAAc,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,gBAAgB,CAAC,EAAA;;oBAA9G,OAAO,GAAG,SAAoG;oBACpH,SAAS,CAAC,OAAO,GAAG,OAAO,CAAA;;wBAE7B,sBAAO,SAAS,EAAA;;;;CACjB;AAID,OAAO;AACM,QAAA,QAAQ,GAAG,UAAC,QAAuB;IAC9C,OAAO,UAAC,MAAc,EAAE,IAAY,EAAE,UAA8B;QAClE,IAAM,MAAM,GAAG,UAAU,CAAC,KAAK,CAAA;QAE/B,UAAU,CAAC,KAAK,GAAG;YAAgB,cAAc;iBAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;gBAAd,yBAAc;;;;;;;4BAC1C,OAAO,GAAoB,IAAI,GAAxB,EAAE,KAAkB,IAAI,GAAR,EAAd,SAAS,mBAAG,EAAE,KAAA,CAAQ;4BAC9B,gBAAgB,GAAG,QAAQ,CAAC,GAAG,CAAC,UAAA,CAAC,IAAI,OAAA,IAAI,CAAC,CAAC,OAAO,CAAC,EAAd,CAAc,CAAC,CAAA;4BACtB,qBAAM,YAAY,CAAC,OAAO,EAAE,SAAS,CAAC,EAAA;;4BAApE,SAAS,GAAqB,SAAsC;4BAE1E,aAAK,CAAC,OAAO,CAAC,CAAA;4BAEd,mCAAmC;4BACnC,IAAI,SAAS,CAAC,OAAO,EAAE;gCACrB,OAAO,SAAS,CAAC,OAAO,CAAA;gCACxB,sBAAO,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,SAAS,EAAE,gBAAgB,CAAC,CAAC,EAAA;6BACpE;;;;4BAGO,qBAAM,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,SAAS,EAAE,gBAAgB,CAAC,CAAC,EAAA;;4BAAxE,GAAG,GAAG,SAAkE,CAAA;;;;4BAExE,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,OAAK,CAAC,CAAA;4BAC3B,qBAAM,sBAAc,CAAC,OAAO,EAAE,SAAS,EAAE,OAAK,CAAC,QAAQ,EAAE,EAAE,OAAK,CAAC,KAAK,CAAC,EAAA;;4BAAvE,SAAuE,CAAA;4BACvE,GAAG,GAAG,kBAAY,CAAC,KAAK,CAAC,sBAAU,CAAC,YAAY,CAAC,CAAA;;gCAEnD,sBAAO,GAAG,EAAA;;;;SACX,CAAA;IACH,CAAC,CAAA;AACH,CAAC,CAAA"} {"version":3,"file":"services.js","sourceRoot":"","sources":["../../src/decorator/services.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,cAAc;AACd,sCAAwC;AACxC,kCAAkE;AAClE,8BAAqC;AACrC,0CAAyC;AACzC,4CAAqD;AACrD,SAAe,YAAY,CAAC,OAA0B,EAAE,SAA2B;;;;;;;oBAC3E,OAAO,qBAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,0CAAE,SAAS,0CAAE,OAAO,0CAAE,OAAO,CAAA;oBACrD,WAAW,GAAG,IAAI,qBAAW,CAAC,OAAO,CAAC,CAAA;yBAExC,CAAC,SAAS,CAAC,QAAQ,EAAnB,wBAAmB;oBACJ,qBAAM,WAAW,CAAC,WAAW,EAAE,EAAA;;oBAA1C,QAAQ,GAAG,SAA+B;oBAChD,SAAS,CAAC,QAAQ,GAAG,QAAQ,CAAA;;;yBAG3B,CAAC,SAAS,CAAC,OAAO,EAAlB,wBAAkB;oBACU,qBAAM,wBAAgB,CAAC,OAAO,CAAC,EAAA;;oBAAvD,KAAwB,SAA+B,EAArD,OAAO,aAAA,EAAE,QAAQ,cAAA;oBACzB,SAAS,CAAC,OAAO,GAAG,OAAO,CAAA;oBAC3B,SAAS,CAAC,gBAAgB,GAAG,QAAQ,CAAA;;;yBAGnC,CAAA,CAAC,SAAS,CAAC,OAAO,IAAI,OAAO,KAAK,YAAY,CAAA,EAA9C,wBAA8C;oBAChC,qBAAM,WAAW,CAAC,UAAU,CAAC,SAAS,CAAC,OAAO,EAAE,oBAAc,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,gBAAgB,CAAC,EAAA;;oBAA9G,OAAO,GAAG,SAAoG;oBACpH,SAAS,CAAC,OAAO,GAAG,OAAO,CAAA;;wBAE7B,sBAAO,SAAS,EAAA;;;;CACjB;AAID,OAAO;AACM,QAAA,QAAQ,GAAG,UAAC,QAAuB;IAC9C,OAAO,UAAC,MAAc,EAAE,IAAY,EAAE,UAA8B;QAClE,IAAM,MAAM,GAAG,UAAU,CAAC,KAAK,CAAA;QAE/B,UAAU,CAAC,KAAK,GAAG;YAAgB,cAAc;iBAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;gBAAd,yBAAc;;;;;;;4BAC1C,OAAO,GAAoB,IAAI,GAAxB,EAAE,KAAkB,IAAI,GAAR,EAAd,SAAS,mBAAG,EAAE,KAAA,CAAQ;4BAC9B,gBAAgB,GAAG,QAAQ,CAAC,GAAG,CAAC,UAAA,CAAC,IAAI,OAAA,IAAI,CAAC,CAAC,OAAO,CAAC,EAAd,CAAc,CAAC,CAAA;4BACtB,qBAAM,YAAY,CAAC,OAAO,EAAE,SAAS,CAAC,EAAA;;4BAApE,SAAS,GAAqB,SAAsC;4BAE1E,aAAK,CAAC,OAAO,CAAC,CAAA;4BAEd,mCAAmC;4BACnC,IAAI,SAAS,CAAC,OAAO,EAAE;gCACrB,OAAO,SAAS,CAAC,OAAO,CAAA;gCACxB,sBAAO,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,SAAS,EAAE,gBAAgB,CAAC,CAAC,EAAA;6BACpE;;;;4BAGO,qBAAM,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,SAAS,EAAE,gBAAgB,CAAC,CAAC,EAAA;;4BAAxE,GAAG,GAAG,SAAkE,CAAA;;;;4BAExE,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,OAAK,CAAC,CAAA;4BAC3B,qBAAM,sBAAc,CAAC,OAAO,EAAE,SAAS,EAAE,OAAK,CAAC,QAAQ,EAAE,EAAE,OAAK,CAAC,KAAK,CAAC,EAAA;;4BAAvE,SAAuE,CAAA;4BACvE,GAAG,GAAG,kBAAY,CAAC,KAAK,CAAC,sBAAU,CAAC,YAAY,CAAC,CAAA;;gCAEnD,sBAAO,GAAG,EAAA;;;;SACX,CAAA;IACH,CAAC,CAAA;AACH,CAAC,CAAA"}
\ No newline at end of file \ No newline at end of file
v2.0/src/decorator/services.ts
View file @ 2938eda6
...@@ -5,6 +5,7 @@ import { resultsModel } from '../sdk' ...@@ -5,6 +5,7 @@ import { resultsModel } from '../sdk'
import { CODE_TYPES } from '../constants' import { CODE_TYPES } from '../constants'
import { formatVipCbUrl } from '../utils/package/vip' import { formatVipCbUrl } from '../utils/package/vip'
async function initBaseInfo(context: IContext<IParams>, baseInfos: IControllerInfos) { async function initBaseInfo(context: IContext<IParams>, baseInfos: IControllerInfos) {
const handler = context?.cloud?.dataspace?.context?.handler
const userService = new UserService(context) const userService = new UserService(context)
if (!baseInfos.userInfo) { if (!baseInfos.userInfo) {
...@@ -18,7 +19,7 @@ async function initBaseInfo(context: IContext<IParams>, baseInfos: IControllerIn ...@@ -18,7 +19,7 @@ async function initBaseInfo(context: IContext<IParams>, baseInfos: IControllerIn
baseInfos.activityUserNick = userNick baseInfos.activityUserNick = userNick
} }
if (!baseInfos.vipInfo && context.fcName !== 'getVipInfo') { if (!baseInfos.vipInfo && handler !== 'getVipInfo') {
const vipInfo = await userService.getShopVip(baseInfos.session, formatVipCbUrl(context), baseInfos.activityUserNick) const vipInfo = await userService.getShopVip(baseInfos.session, formatVipCbUrl(context), baseInfos.activityUserNick)
baseInfos.vipInfo = vipInfo baseInfos.vipInfo = vipInfo
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment