Skip to content

T
taobao-mini-template
Commit 8a58fc7d authored by qinhaitao's avatar qinhaitao
Browse files
Options

feat: 🎸 access 增加记录

parent 19706925
Show whitespace changes
Inline Side-by-side
Showing with 42 additions and 22 deletions
v2.0/dist/controller/user.controller.js
View file @ 8a58fc7d
......@@ -69,15 +69,15 @@ var User = /** @class */ (function () {
if (!!userInfo) return [3 /*break*/, 2];
return [4 /*yield*/, userService.initUserData(vipInfo, activityInfo)];
case 1:
_c.sent();
userInfo = _c.sent();
return [3 /*break*/, 4];
case 2: return [4 /*yield*/, userService.updateUserData(vipInfo, userInfo, activityInfo)];
case 3:
_c.sent();
userInfo = _c.sent();
_c.label = 4;
case 4:
// access表
return [4 /*yield*/, accessService.addAccess(isFollow, vipInfo.isVip)];
return [4 /*yield*/, accessService.addAccess(userInfo)];
case 5:
// access表
_c.sent();
......
v2.0/dist/controller/user.controller.js.map
View file @ 8a58fc7d
{"version":3,"file":"user.controller.js","sourceRoot":"","sources":["../../src/controller/user.controller.ts"],"names":[],"mappings":";AAAA,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEd,0CAAuE;AAEvE,8BAAqC;AACrC,sCAAuD;AAEvD,4CAAqD;AAcrD;IAAA;IA6CA,CAAC;IA5CC;;OAEG;IAIG,oBAAK,GAAX,UACE,OAA+B,EAC/B,EAAqD,EACrD,EAA0D;YADxD,QAAQ,cAAA,EAAE,OAAO,aAAA,EAAE,YAAY,kBAAA;YAChC,WAAW,QAAA,EAAE,aAAa,QAAA;;;;;;wBAEnB,MAAM,GAAK,OAAO,OAAZ,CAAY;wBAElB,QAAQ,GAAK,OAAO,CAAC,IAAI,SAAjB,CAAiB;6BAE7B,CAAC,QAAQ,EAAT,wBAAS;wBACX,qBAAM,WAAW,CAAC,YAAY,CAAC,OAAO,EAAE,YAAY,CAAC,EAAA;;wBAArD,SAAqD,CAAA;;4BAErD,qBAAM,WAAW,CAAC,cAAc,CAAC,OAAO,EAAE,QAAQ,EAAE,YAAY,CAAC,EAAA;;wBAAjE,SAAiE,CAAA;;;oBAGnE,UAAU;oBACV,qBAAM,aAAa,CAAC,SAAS,CAAC,QAAQ,EAAE,OAAO,CAAC,KAAK,CAAC,EAAA;;wBADtD,UAAU;wBACV,SAAsD,CAAA;wBAEtD,sBAAO,kBAAY,CAAC,OAAO,CAAC;gCAC1B,MAAM,QAAA;6BACP,CAAC,EAAA;;;;KACH;IACD;;OAEG;IAGG,yBAAU,GAAhB,UACE,OAA6B,EAC7B,EAA+C,EAC/C,EAA4B;YAD1B,OAAO,aAAA,EAAE,gBAAgB,sBAAA;YAC1B,WAAW,QAAA;;;;;;wBAEJ,WAAW,GAAK,OAAO,CAAC,IAAI,YAAjB,CAAiB;wBAErB,qBAAM,WAAW,CAAC,UAAU,CAAC,OAAO,EAAE,WAAW,IAAI,oBAAc,CAAC,OAAO,CAAC,EAAE,gBAAgB,CAAC,EAAA;;wBAAxG,MAAM,GAAG,SAA+F;wBAE9G,sBAAO,kBAAY,CAAC,OAAO,CAAC,MAAM,CAAC,EAAA;;;;KACpC;IArCD;QAHC,uBAAW,CAAC,CAAC,YAAY,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;QAC7D,6BAAiB;QACjB,oBAAQ,CAAC,CAAC,qBAAW,EAAE,uBAAa,CAAC,CAAC;;;;qCAsBtC;IAMD;QAFC,uBAAW,CAAC,CAAC,YAAY,CAAC,CAAC;QAC3B,oBAAQ,CAAC,CAAC,qBAAW,CAAC,CAAC;;;;0CAWvB;IACH,WAAC;CAAA,AA7CD,IA6CC;kBA7CoB,IAAI"}
\ No newline at end of file
{"version":3,"file":"user.controller.js","sourceRoot":"","sources":["../../src/controller/user.controller.ts"],"names":[],"mappings":";AAAA,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEd,0CAAuE;AAEvE,8BAAqC;AACrC,sCAAuD;AAEvD,4CAAqD;AAcrD;IAAA;IA6CA,CAAC;IA5CC;;OAEG;IAIG,oBAAK,GAAX,UACE,OAA+B,EAC/B,EAAqD,EACrD,EAA0D;YADxD,QAAQ,cAAA,EAAE,OAAO,aAAA,EAAE,YAAY,kBAAA;YAChC,WAAW,QAAA,EAAE,aAAa,QAAA;;;;;;wBAEnB,MAAM,GAAK,OAAO,OAAZ,CAAY;wBAElB,QAAQ,GAAK,OAAO,CAAC,IAAI,SAAjB,CAAiB;6BAE7B,CAAC,QAAQ,EAAT,wBAAS;wBACA,qBAAM,WAAW,CAAC,YAAY,CAAC,OAAO,EAAE,YAAY,CAAC,EAAA;;wBAAhE,QAAQ,GAAG,SAAqD,CAAA;;4BAErD,qBAAM,WAAW,CAAC,cAAc,CAAC,OAAO,EAAE,QAAQ,EAAE,YAAY,CAAC,EAAA;;wBAA5E,QAAQ,GAAG,SAAiE,CAAA;;;oBAG9E,UAAU;oBACV,qBAAM,aAAa,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAA;;wBADvC,UAAU;wBACV,SAAuC,CAAA;wBAEvC,sBAAO,kBAAY,CAAC,OAAO,CAAC;gCAC1B,MAAM,QAAA;6BACP,CAAC,EAAA;;;;KACH;IACD;;OAEG;IAGG,yBAAU,GAAhB,UACE,OAA6B,EAC7B,EAA+C,EAC/C,EAA4B;YAD1B,OAAO,aAAA,EAAE,gBAAgB,sBAAA;YAC1B,WAAW,QAAA;;;;;;wBAEJ,WAAW,GAAK,OAAO,CAAC,IAAI,YAAjB,CAAiB;wBAErB,qBAAM,WAAW,CAAC,UAAU,CAAC,OAAO,EAAE,WAAW,IAAI,oBAAc,CAAC,OAAO,CAAC,EAAE,gBAAgB,CAAC,EAAA;;wBAAxG,MAAM,GAAG,SAA+F;wBAE9G,sBAAO,kBAAY,CAAC,OAAO,CAAC,MAAM,CAAC,EAAA;;;;KACpC;IArCD;QAHC,uBAAW,CAAC,CAAC,YAAY,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;QAC7D,6BAAiB;QACjB,oBAAQ,CAAC,CAAC,qBAAW,EAAE,uBAAa,CAAC,CAAC;;;;qCAsBtC;IAMD;QAFC,uBAAW,CAAC,CAAC,YAAY,CAAC,CAAC;QAC3B,oBAAQ,CAAC,CAAC,qBAAW,CAAC,CAAC;;;;0CAWvB;IACH,WAAC;CAAA,AA7CD,IA6CC;kBA7CoB,IAAI"}
\ No newline at end of file
v2.0/dist/service/access.service.d.ts
View file @ 8a58fc7d
......@@ -11,6 +11,6 @@ export default class UserAccessService {
* 增加访问记录
* @param {是否关注店铺} isFollow
*/
addAccess(isFollow: boolean, isVip: boolean): Promise<number>;
addAccess(userInfo: IUserInfo): Promise<number>;
getAccessCount(): Promise<number>;
}
v2.0/dist/service/access.service.js
View file @ 8a58fc7d
......@@ -53,7 +53,7 @@ var UserAccessService = /** @class */ (function () {
* 增加访问记录
* @param {是否关注店铺} isFollow
*/
UserAccessService.prototype.addAccess = function (isFollow, isVip) {
UserAccessService.prototype.addAccess = function (userInfo) {
return __awaiter(this, void 0, void 0, function () {
var _a, openId, data, activityId, userNick, avatar, inviteId;
return __generator(this, function (_b) {
......@@ -68,8 +68,10 @@ var UserAccessService = /** @class */ (function () {
avatar: avatar,
isReceiveShare: !!inviteId,
inviteId: inviteId,
isFollow: isFollow,
isVip: isVip,
isFollow: userInfo.follow.flag || userInfo.follow.newFollow,
isVip: userInfo.member.flag || userInfo.member.newMember,
follow: userInfo.follow,
member: userInfo.member,
accessTime: Date.now(),
createTime: Date.now(),
updateTime: Date.now(),
......
v2.0/dist/service/access.service.js.map
View file @ 8a58fc7d
{"version":3,"file":"access.service.js","sourceRoot":"","sources":["../../src/service/access.service.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,8BAAgC;AAChC,kCAAmC;AACnC,4BAAsC;AAEtC;IAGE,2BAAY,OAA0B;QACpC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,SAAS,GAAG,IAAI,aAAO,CAAC,OAAO,EAAE,mBAAc,CAAC,CAAA;IACvD,CAAC;IACD;;;OAGG;IACG,qCAAS,GAAf,UAAgB,QAAiB,EAAE,KAAc;;;;;;wBAC3C,KAAmB,IAAI,CAAC,OAAO,EAA7B,MAAM,YAAA,EAAE,IAAI,UAAA,CAAiB;wBAC7B,UAAU,GAAiC,IAAI,WAArC,EAAE,QAAQ,GAAuB,IAAI,SAA3B,EAAE,MAAM,GAAe,IAAI,OAAnB,EAAE,QAAQ,GAAK,IAAI,SAAT,CAAS;wBAE9C,qBAAM,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC;gCACpC,MAAM,QAAA;gCACN,UAAU,YAAA;gCACV,QAAQ,UAAA;gCACR,MAAM,QAAA;gCACN,cAAc,EAAE,CAAC,CAAC,QAAQ;gCAC1B,QAAQ,UAAA;gCACR,QAAQ,UAAA;gCACR,KAAK,OAAA;gCACL,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE;gCACtB,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE;gCACtB,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE;gCACtB,SAAS,EAAE,gBAAQ,EAAE;6BACtB,CAAC,EAAA;4BAbF,sBAAO,SAaL,EAAA;;;;KACH;IAEK,0CAAc,GAApB;;;;;;wBACM,KAAmB,IAAI,CAAC,OAAO,EAA7B,MAAM,YAAA,EAAE,IAAI,UAAA,CAAiB;wBAC7B,UAAU,GAAK,IAAI,WAAT,CAAS;wBAClB,qBAAM,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC;gCAChC,MAAM,QAAA;gCACN,UAAU,YAAA;6BACX,CAAC,EAAA;4BAHF,sBAAO,SAGL,EAAA;;;;KACH;IACH,wBAAC;AAAD,CAAC,AAvCD,IAuCC"}
\ No newline at end of file
{"version":3,"file":"access.service.js","sourceRoot":"","sources":["../../src/service/access.service.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,8BAAgC;AAChC,kCAAmC;AACnC,4BAAsC;AAEtC;IAGE,2BAAY,OAA0B;QACpC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,SAAS,GAAG,IAAI,aAAO,CAAC,OAAO,EAAE,mBAAc,CAAC,CAAA;IACvD,CAAC;IACD;;;OAGG;IACG,qCAAS,GAAf,UAAgB,QAAmB;;;;;;wBAC7B,KAAmB,IAAI,CAAC,OAAO,EAA7B,MAAM,YAAA,EAAE,IAAI,UAAA,CAAiB;wBAC7B,UAAU,GAAiC,IAAI,WAArC,EAAE,QAAQ,GAAuB,IAAI,SAA3B,EAAE,MAAM,GAAe,IAAI,OAAnB,EAAE,QAAQ,GAAK,IAAI,SAAT,CAAS;wBAE9C,qBAAM,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC;gCACpC,MAAM,QAAA;gCACN,UAAU,YAAA;gCACV,QAAQ,UAAA;gCACR,MAAM,QAAA;gCACN,cAAc,EAAE,CAAC,CAAC,QAAQ;gCAC1B,QAAQ,UAAA;gCACR,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,IAAI,IAAI,QAAQ,CAAC,MAAM,CAAC,SAAS;gCAC3D,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,IAAI,IAAI,QAAQ,CAAC,MAAM,CAAC,SAAS;gCACxD,MAAM,EAAE,QAAQ,CAAC,MAAM;gCACvB,MAAM,EAAE,QAAQ,CAAC,MAAM;gCACvB,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE;gCACtB,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE;gCACtB,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE;gCACtB,SAAS,EAAE,gBAAQ,EAAE;6BACtB,CAAC,EAAA;4BAfF,sBAAO,SAeL,EAAA;;;;KACH;IAEK,0CAAc,GAApB;;;;;;wBACM,KAAmB,IAAI,CAAC,OAAO,EAA7B,MAAM,YAAA,EAAE,IAAI,UAAA,CAAiB;wBAC7B,UAAU,GAAK,IAAI,WAAT,CAAS;wBAClB,qBAAM,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC;gCAChC,MAAM,QAAA;gCACN,UAAU,YAAA;6BACX,CAAC,EAAA;4BAHF,sBAAO,SAGL,EAAA;;;;KACH;IACH,wBAAC;AAAD,CAAC,AAzCD,IAyCC"}
\ No newline at end of file
v2.0/dist/service/user.service.d.ts
View file @ 8a58fc7d
......@@ -33,8 +33,8 @@ declare class UserService extends BaseService {
* @returns
* @memberof UserService
*/
initUserData(vipInfo: IVipInfo, activityInfo: IActivityInfo): Promise<number>;
updateUserData(vipInfo: IVipInfo, userInfo: IUserInfo, activityInfo: IActivityInfo): Promise<void>;
initUserData(vipInfo: IVipInfo, activityInfo: IActivityInfo): Promise<IUserInfo>;
updateUserData(vipInfo: IVipInfo, userInfo: IUserInfo, activityInfo: IActivityInfo): Promise<IUserInfo>;
/**
* @desc 更新用户表
* @param {用户的主键id} _id
......
v2.0/dist/service/user.service.js
View file @ 8a58fc7d
......@@ -225,7 +225,9 @@ var UserService = /** @class */ (function (_super) {
user.taskInfo[today].follow = [{ createTime: Date.now() }];
}
return [4 /*yield*/, this.userdao.insertOne(user)];
case 1: return [2 /*return*/, _d.sent()];
case 1:
_d.sent();
return [2 /*return*/, user];
}
});
});
......@@ -269,7 +271,11 @@ var UserService = /** @class */ (function (_super) {
return [4 /*yield*/, this.updateUser(userInfo._id, projection)];
case 1:
_b.sent();
return [2 /*return*/];
return [2 /*return*/, __assign(__assign({}, userInfo), {
// @ts-ignore
follow: projection.$set.follow || userInfo.follow,
// @ts-ignore
member: projection.$set.member || userInfo.member })];
}
});
});
......
v2.0/dist/service/user.service.js.map
View file @ 8a58fc7d
{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../src/service/user.service.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../src/service/user.service.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
v2.0/src/controller/user.controller.ts
View file @ 8a58fc7d
......@@ -36,13 +36,13 @@ export default class User {
const { isFollow } = context.data
if (!userInfo) {
await userService.initUserData(vipInfo, activityInfo)
userInfo = await userService.initUserData(vipInfo, activityInfo)
} else {
await userService.updateUserData(vipInfo, userInfo, activityInfo)
userInfo = await userService.updateUserData(vipInfo, userInfo, activityInfo)
}
// access表
await accessService.addAccess(isFollow, vipInfo.isVip)
await accessService.addAccess(userInfo)
return resultsModel.success({
openId
......
v2.0/src/service/access.service.ts
View file @ 8a58fc7d
......@@ -19,7 +19,7 @@ export default class UserAccessService {
* 增加访问记录
* @param {是否关注店铺} isFollow
*/
async addAccess(isFollow: boolean, isVip: boolean) {
async addAccess(userInfo: IUserInfo) {
let { openId, data } = this.context
let { activityId, userNick, avatar, inviteId } = data
......@@ -30,8 +30,10 @@ export default class UserAccessService {
avatar,
isReceiveShare: !!inviteId,
inviteId,
isFollow,
isVip,
isFollow: userInfo.follow.flag || userInfo.follow.newFollow,
isVip: userInfo.member.flag || userInfo.member.newMember,
follow: userInfo.follow,
member: userInfo.member,
accessTime: Date.now(),
createTime: Date.now(),
updateTime: Date.now(),
......
v2.0/src/service/user.service.ts
View file @ 8a58fc7d
......@@ -129,10 +129,12 @@ class UserService extends BaseService {
user.taskInfo[today].follow = [{ createTime: Date.now() }]
}
return await this.userdao.insertOne(user)
await this.userdao.insertOne(user)
return user
}
async updateUserData(vipInfo: IVipInfo, userInfo: IUserInfo, activityInfo: IActivityInfo) {
async updateUserData(vipInfo: IVipInfo, userInfo: IUserInfo, activityInfo: IActivityInfo): Promise<IUserInfo> {
const { data } = this.context
const { isFollow } = data
......@@ -171,6 +173,14 @@ class UserService extends BaseService {
}
await this.updateUser(userInfo._id, projection)
return {
...userInfo,
// @ts-ignore
follow: projection.$set.follow || userInfo.follow,
// @ts-ignore
member: projection.$set.member || userInfo.member
}
}
/**
......
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