Commit 0d074ef4 authored by qinhaitao's avatar qinhaitao

refactor: 💡 B C端任务字段统一

parent 2c9db784
...@@ -30,11 +30,11 @@ export default class AwardsController { ...@@ -30,11 +30,11 @@ export default class AwardsController {
/** /**
* 权益重新领取 * 权益重新领取
*/ */
receiveEnamePrize(context: IContext<IReceiveEnameParams>, {}: {}, [awardSer]: [AwardsService]): Promise<import("taobao-mini-sdk/lib/utils/resultmodel").Result<string | boolean | object | string[] | object[] | number[], false> | import("taobao-mini-sdk/lib/utils/resultmodel").Result<CodeType | IAwards, true>>; receiveEnamePrize(context: IContext<IReceiveEnameParams>, {}: {}, [awardSer]: [AwardsService]): Promise<import("taobao-mini-sdk/lib/utils/resultmodel").Result<string | boolean | object | object[] | number[] | string[], false> | import("taobao-mini-sdk/lib/utils/resultmodel").Result<CodeType | IAwards, true>>;
/** /**
* 概率抽奖 * 概率抽奖
*/ */
drawLotteryPrize(context: IContext<IParams>, { userInfo }: IControllerInfos, [awardSer]: [AwardsService]): Promise<import("taobao-mini-sdk/lib/utils/resultmodel").Result<string | boolean | object | string[] | object[] | number[], false> | import("taobao-mini-sdk/lib/utils/resultmodel").Result<{ drawLotteryPrize(context: IContext<IParams>, { userInfo }: IControllerInfos, [awardSer]: [AwardsService]): Promise<import("taobao-mini-sdk/lib/utils/resultmodel").Result<string | boolean | object | object[] | number[] | string[], false> | import("taobao-mini-sdk/lib/utils/resultmodel").Result<{
data: { data: {
type: number; type: number;
name: string; name: string;
......
...@@ -83,7 +83,7 @@ var Share = /** @class */ (function () { ...@@ -83,7 +83,7 @@ var Share = /** @class */ (function () {
return [2 /*return*/, sdk_1.resultsModel.error(constants_1.CODE_TYPES.ERROR_AREADY_INVITE_SUCCESS)]; return [2 /*return*/, sdk_1.resultsModel.error(constants_1.CODE_TYPES.ERROR_AREADY_INVITE_SUCCESS)];
} }
tasks = activityInfo.tasks; tasks = activityInfo.tasks;
value = (tasks || {}).inviteFriends.value; value = (tasks || {}).invites.value;
isNewVip = userService.checkNewVip(userInfo, vipInfo); isNewVip = userService.checkNewVip(userInfo, vipInfo);
isValidShare = [isNewVip].every(function (v) { return !!v; }); isValidShare = [isNewVip].every(function (v) { return !!v; });
today = utils_1.getToday(); today = utils_1.getToday();
......
{"version":3,"file":"share.controller.js","sourceRoot":"","sources":["../../src/controller/share.controller.ts"],"names":[],"mappings":";AAAA,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEd,4CAA2C;AAC3C,4CAA8E;AAC9E,kDAAgD;AAEhD,8BAAqC;AACrC,kCAAmC;AACnC,sCAAoE;AAEpE;IAAA;IAyDA,CAAC;IAxDC;;OAEG;IAIG,sBAAM,GAAZ,UACE,OAA0B,EAC1B,EAAqD,EACrD,EAAoF;YADlF,QAAQ,cAAA,EAAE,OAAO,aAAA,EAAE,YAAY,kBAAA;YAChC,WAAW,QAAA,EAAE,WAAW,QAAA,EAAE,aAAa,QAAA;;;;;;;wBAEhC,QAAQ,GAAK,OAAO,CAAC,IAAI,SAAjB,CAAiB;wBACzB,MAAM,GAAK,OAAO,OAAZ,CAAY;wBAEQ,qBAAM,WAAW,CAAC,mBAAmB,CAAC,QAAQ,CAAC;4BACjF,iCAAiC;0BADgD;;wBAA3E,cAAc,GAAc,SAA+C;wBACjF,iCAAiC;wBACjC,IAAI,CAAC,cAAc;4BAAE,sBAAO,kBAAY,CAAC,KAAK,CAAC,sBAAU,CAAC,uBAAuB,CAAC,EAAA;wBAE5E,kBAAkB,GAAG,WAAW,CAAC,6BAA6B,CAAC,SAAS,EAAE,cAAc,CAAC,CAAA;wBAE/F,eAAe;wBACf,IAAI,kBAAkB,CAAC,IAAI,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,MAAM,KAAK,MAAM,EAAnB,CAAmB,CAAC,EAAE;4BACrD,sBAAO,kBAAY,CAAC,KAAK,CAAC,sBAAU,CAAC,2BAA2B,CAAC,EAAA;yBAClE;wBAKO,KAAK,GAAK,YAAY,MAAjB,CAAiB;wBAGX,KAAK,GACZ,CAAA,KAAK,IAAI,EAAE,CAAA,oBADC,CACD;wBAGjB,QAAQ,GAAG,WAAW,CAAC,WAAW,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;wBAGrD,YAAY,GAAG,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,CAAC,EAAH,CAAG,CAAC,CAAA;wBAEzC,KAAK,GAAG,gBAAQ,EAAE,CAAA;6BACpB,YAAY,EAAZ,wBAAY;wBACD,YAAY,GAAK,cAAc,IAAnB,CAAmB;wBAC5C,mBAAmB;wBACnB,qBAAM,WAAW,CAAC,UAAU,CAAC,YAAY,EAAE;gCACzC,IAAI,EAAE;oCACJ,qBAAqB,EAAE,KAAK;iCAC7B;gCACD,KAAK;oCACH,GAAC,cAAY,KAAK,aAAU,IAAG,EAAE,MAAM,QAAA,EAAE,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE;uCAClE;6BACF,CAAC,EAAA;;wBARF,mBAAmB;wBACnB,SAOE,CAAA;;4BAGJ,sBAAO,kBAAY,CAAC,OAAO,CAAC,IAAI,CAAC,EAAA;;;;KAClC;IAjDD;QAHC,mBAAW,CAAC,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;QACvC,yBAAiB;QACjB,mBAAQ,CAAC,CAAC,qBAAW,EAAE,qBAAW,EAAE,uBAAa,CAAC,CAAC;;;;uCAkDnD;IACH,YAAC;CAAA,AAzDD,IAyDC;kBAzDoB,KAAK"} {"version":3,"file":"share.controller.js","sourceRoot":"","sources":["../../src/controller/share.controller.ts"],"names":[],"mappings":";AAAA,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEd,4CAA2C;AAC3C,4CAA8E;AAC9E,kDAAgD;AAEhD,8BAAqC;AACrC,kCAAmC;AACnC,sCAAoE;AAEpE;IAAA;IAyDA,CAAC;IAxDC;;OAEG;IAIG,sBAAM,GAAZ,UACE,OAA0B,EAC1B,EAAqD,EACrD,EAAoF;YADlF,QAAQ,cAAA,EAAE,OAAO,aAAA,EAAE,YAAY,kBAAA;YAChC,WAAW,QAAA,EAAE,WAAW,QAAA,EAAE,aAAa,QAAA;;;;;;;wBAEhC,QAAQ,GAAK,OAAO,CAAC,IAAI,SAAjB,CAAiB;wBACzB,MAAM,GAAK,OAAO,OAAZ,CAAY;wBAEQ,qBAAM,WAAW,CAAC,mBAAmB,CAAC,QAAQ,CAAC;4BACjF,iCAAiC;0BADgD;;wBAA3E,cAAc,GAAc,SAA+C;wBACjF,iCAAiC;wBACjC,IAAI,CAAC,cAAc;4BAAE,sBAAO,kBAAY,CAAC,KAAK,CAAC,sBAAU,CAAC,uBAAuB,CAAC,EAAA;wBAE5E,kBAAkB,GAAG,WAAW,CAAC,6BAA6B,CAAC,SAAS,EAAE,cAAc,CAAC,CAAA;wBAE/F,eAAe;wBACf,IAAI,kBAAkB,CAAC,IAAI,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,MAAM,KAAK,MAAM,EAAnB,CAAmB,CAAC,EAAE;4BACrD,sBAAO,kBAAY,CAAC,KAAK,CAAC,sBAAU,CAAC,2BAA2B,CAAC,EAAA;yBAClE;wBAKO,KAAK,GAAK,YAAY,MAAjB,CAAiB;wBAGjB,KAAK,GACN,CAAA,KAAK,IAAI,EAAE,CAAA,cADL,CACK;wBAGjB,QAAQ,GAAG,WAAW,CAAC,WAAW,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;wBAGrD,YAAY,GAAG,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,CAAC,EAAH,CAAG,CAAC,CAAA;wBAEzC,KAAK,GAAG,gBAAQ,EAAE,CAAA;6BACpB,YAAY,EAAZ,wBAAY;wBACD,YAAY,GAAK,cAAc,IAAnB,CAAmB;wBAC5C,mBAAmB;wBACnB,qBAAM,WAAW,CAAC,UAAU,CAAC,YAAY,EAAE;gCACzC,IAAI,EAAE;oCACJ,qBAAqB,EAAE,KAAK;iCAC7B;gCACD,KAAK;oCACH,GAAC,cAAY,KAAK,aAAU,IAAG,EAAE,MAAM,QAAA,EAAE,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE;uCAClE;6BACF,CAAC,EAAA;;wBARF,mBAAmB;wBACnB,SAOE,CAAA;;4BAGJ,sBAAO,kBAAY,CAAC,OAAO,CAAC,IAAI,CAAC,EAAA;;;;KAClC;IAjDD;QAHC,mBAAW,CAAC,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;QACvC,yBAAiB;QACjB,mBAAQ,CAAC,CAAC,qBAAW,EAAE,qBAAW,EAAE,uBAAa,CAAC,CAAC;;;;uCAkDnD;IACH,YAAC;CAAA,AAzDD,IAyDC;kBAzDoB,KAAK"}
\ No newline at end of file \ No newline at end of file
...@@ -18,5 +18,5 @@ export default class StatController { ...@@ -18,5 +18,5 @@ export default class StatController {
/** /**
* 统计数据 * 统计数据
*/ */
getStats(context: IContext<IGetStatsParams>): Promise<import("taobao-mini-sdk/lib/utils/resultmodel").Result<string | boolean | object | string[] | object[] | number[], false> | import("taobao-mini-sdk/lib/utils/resultmodel").Result<any[], true>>; getStats(context: IContext<IGetStatsParams>): Promise<import("taobao-mini-sdk/lib/utils/resultmodel").Result<string | boolean | object | object[] | number[] | string[], false> | import("taobao-mini-sdk/lib/utils/resultmodel").Result<any[], true>>;
} }
...@@ -13,8 +13,8 @@ declare const _default: { ...@@ -13,8 +13,8 @@ declare const _default: {
}>, {}: {}, [baseService]: [import("./service").BaseService]) => Promise<IResult<IActivityInfo>>; }>, {}: {}, [baseService]: [import("./service").BaseService]) => Promise<IResult<IActivityInfo>>;
getMyPrizeList: (context: IContext<import("./controller/awards.controller").IPrizeListParams>, {}: {}, [awardSer]: [import("./service").AwardsService]) => Promise<IResult<IAwards[]>>; getMyPrizeList: (context: IContext<import("./controller/awards.controller").IPrizeListParams>, {}: {}, [awardSer]: [import("./service").AwardsService]) => Promise<IResult<IAwards[]>>;
receiveObjectPrize: (context: IContext<import("./controller/awards.controller").IReceiveOjectParams>, {}: {}, [awardSer]: [import("./service").AwardsService]) => Promise<IResult<boolean>>; receiveObjectPrize: (context: IContext<import("./controller/awards.controller").IReceiveOjectParams>, {}: {}, [awardSer]: [import("./service").AwardsService]) => Promise<IResult<boolean>>;
receiveEnamePrize: (context: IContext<import("./controller/awards.controller").IReceiveEnameParams>, {}: {}, [awardSer]: [import("./service").AwardsService]) => Promise<import("taobao-mini-sdk/lib/utils/resultmodel").Result<string | boolean | object | string[] | object[] | number[], false> | import("taobao-mini-sdk/lib/utils/resultmodel").Result<import("taobao-mini-sdk/lib/utils/codetypes").CodeType | IAwards, true>>; receiveEnamePrize: (context: IContext<import("./controller/awards.controller").IReceiveEnameParams>, {}: {}, [awardSer]: [import("./service").AwardsService]) => Promise<import("taobao-mini-sdk/lib/utils/resultmodel").Result<string | boolean | object | object[] | number[] | string[], false> | import("taobao-mini-sdk/lib/utils/resultmodel").Result<import("taobao-mini-sdk/lib/utils/codetypes").CodeType | IAwards, true>>;
doHelp: (context: IContext<IParams>, { userInfo, vipInfo, activityInfo }: IControllerInfos, [userService, taskService, accessService]: [import("./service/user.service").default, import("./service").TaskService, import("./service").AccessService]) => Promise<IResult<boolean>>; doHelp: (context: IContext<IParams>, { userInfo, vipInfo, activityInfo }: IControllerInfos, [userService, taskService, accessService]: [import("./service/user.service").default, import("./service").TaskService, import("./service").AccessService]) => Promise<IResult<boolean>>;
getStats: (context: IContext<import("./controller/stat.controller").IGetStatsParams>) => Promise<import("taobao-mini-sdk/lib/utils/resultmodel").Result<string | boolean | object | string[] | object[] | number[], false> | import("taobao-mini-sdk/lib/utils/resultmodel").Result<any[], true>>; getStats: (context: IContext<import("./controller/stat.controller").IGetStatsParams>) => Promise<import("taobao-mini-sdk/lib/utils/resultmodel").Result<string | boolean | object | object[] | number[] | string[], false> | import("taobao-mini-sdk/lib/utils/resultmodel").Result<any[], true>>;
}; };
export default _default; export default _default;
...@@ -84,7 +84,7 @@ var TaskService = /** @class */ (function (_super) { ...@@ -84,7 +84,7 @@ var TaskService = /** @class */ (function (_super) {
TaskService.prototype.initVipTask = function (userInfo, vipInfo, tasks) { TaskService.prototype.initVipTask = function (userInfo, vipInfo, tasks) {
var remainTimes = userInfo.remainTimes; var remainTimes = userInfo.remainTimes;
// 后台配置奖励 // 后台配置奖励
var value = tasks.beMembership.value; var value = tasks.member.value;
return { return {
taskType: "member", taskType: "member",
title: "\u52A0\u5165\u4F1A\u5458", title: "\u52A0\u5165\u4F1A\u5458",
...@@ -177,7 +177,7 @@ var TaskService = /** @class */ (function (_super) { ...@@ -177,7 +177,7 @@ var TaskService = /** @class */ (function (_super) {
}; };
// 初始化邀请任务 // 初始化邀请任务
TaskService.prototype.initInvitesTask = function (userInfo, tasks) { TaskService.prototype.initInvitesTask = function (userInfo, tasks) {
var _a = tasks.inviteFriends, value = _a.value, taskRateType = _a.taskRateType, times = _a.times; var _a = tasks.invites, value = _a.value, taskRateType = _a.taskRateType, times = _a.times;
var remainTimes = userInfo.remainTimes; var remainTimes = userInfo.remainTimes;
var todayCompleteTimes = this.getTodayCompleteTask('invites', userInfo).todayCompleteTimes; var todayCompleteTimes = this.getTodayCompleteTask('invites', userInfo).todayCompleteTimes;
var invitesCompleteList = this.getCompleteTaskByUserTaskInfo('invites', userInfo); var invitesCompleteList = this.getCompleteTaskByUserTaskInfo('invites', userInfo);
...@@ -196,7 +196,7 @@ var TaskService = /** @class */ (function (_super) { ...@@ -196,7 +196,7 @@ var TaskService = /** @class */ (function (_super) {
}; };
// 关注店铺 // 关注店铺
TaskService.prototype.initFollowTask = function (userInfo, tasks) { TaskService.prototype.initFollowTask = function (userInfo, tasks) {
var value = tasks.attentionStore.value; var value = tasks.follow.value;
var remainTimes = userInfo.remainTimes; var remainTimes = userInfo.remainTimes;
var followCompleteList = this.getCompleteTaskByUserTaskInfo('follow', userInfo); var followCompleteList = this.getCompleteTaskByUserTaskInfo('follow', userInfo);
return { return {
...@@ -249,7 +249,7 @@ var TaskService = /** @class */ (function (_super) { ...@@ -249,7 +249,7 @@ var TaskService = /** @class */ (function (_super) {
var newMember = member.newMember; var newMember = member.newMember;
var today = utils_1.getToday(); var today = utils_1.getToday();
var isNewVip = this.checkNewVip(userInfo, vipInfo); var isNewVip = this.checkNewVip(userInfo, vipInfo);
var value = tasks.beMembership.value; var value = tasks.member.value;
var projection = { var projection = {
$set: {}, $set: {},
$inc: {}, $inc: {},
...@@ -356,7 +356,7 @@ var TaskService = /** @class */ (function (_super) { ...@@ -356,7 +356,7 @@ var TaskService = /** @class */ (function (_super) {
today = utils_1.getToday(); today = utils_1.getToday();
_id = userInfo._id, _a = userInfo.taskInfo, taskInfo = _a === void 0 ? {} : _a, follow = userInfo.follow; _id = userInfo._id, _a = userInfo.taskInfo, taskInfo = _a === void 0 ? {} : _a, follow = userInfo.follow;
tasks = activityInfo.tasks; tasks = activityInfo.tasks;
value = (tasks || {}).attentionStore.value; value = (tasks || {}).follow.value;
followInfo = this.setNewFollowUserData(follow); followInfo = this.setNewFollowUserData(follow);
return [4 /*yield*/, this.updateUser(_id, { return [4 /*yield*/, this.updateUser(_id, {
$set: { $set: {
......
{"version":3,"file":"task.service.js","sourceRoot":"","sources":["../../src/service/task.service.ts"],"names":[],"mappings":"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"} {"version":3,"file":"task.service.js","sourceRoot":"","sources":["../../src/service/task.service.ts"],"names":[],"mappings":"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"}
\ No newline at end of file \ No newline at end of file
...@@ -184,7 +184,7 @@ var UserService = /** @class */ (function (_super) { ...@@ -184,7 +184,7 @@ var UserService = /** @class */ (function (_super) {
*/ */
UserService.prototype.initUserData = function (vipInfo, activityInfo) { UserService.prototype.initUserData = function (vipInfo, activityInfo) {
return __awaiter(this, void 0, void 0, function () { return __awaiter(this, void 0, void 0, function () {
var _a, openId, data, activityId, isFollow, avatar, inviteId, userNick, today, tasks, attentionStore, beMembership, user; var _a, openId, data, activityId, isFollow, avatar, inviteId, userNick, today, tasks, follow, member, user;
var _b, _c; var _b, _c;
return __generator(this, function (_d) { return __generator(this, function (_d) {
switch (_d.label) { switch (_d.label) {
...@@ -194,7 +194,7 @@ var UserService = /** @class */ (function (_super) { ...@@ -194,7 +194,7 @@ var UserService = /** @class */ (function (_super) {
today = utils_1.getToday(); today = utils_1.getToday();
console.log("----------" + today + "----------", today); console.log("----------" + today + "----------", today);
tasks = activityInfo.tasks; tasks = activityInfo.tasks;
attentionStore = tasks.attentionStore, beMembership = tasks.beMembership; follow = tasks.follow, member = tasks.member;
user = { user = {
activityId: activityId, activityId: activityId,
avatar: avatar, avatar: avatar,
...@@ -203,8 +203,8 @@ var UserService = /** @class */ (function (_super) { ...@@ -203,8 +203,8 @@ var UserService = /** @class */ (function (_super) {
openId: openId, openId: openId,
// 待领取次数初始化, 根据需自定义添加 // 待领取次数初始化, 根据需自定义添加
remainTimes: { remainTimes: {
follow: isFollow ? attentionStore.value : 0, follow: isFollow ? follow.value : 0,
member: vipInfo.isVip ? beMembership.value : 0 member: vipInfo.isVip ? member.value : 0
}, },
member: { member: {
flag: !!vipInfo.isVip flag: !!vipInfo.isVip
...@@ -230,7 +230,7 @@ var UserService = /** @class */ (function (_super) { ...@@ -230,7 +230,7 @@ var UserService = /** @class */ (function (_super) {
}; };
UserService.prototype.updateUserData = function (vipInfo, userInfo, activityInfo) { UserService.prototype.updateUserData = function (vipInfo, userInfo, activityInfo) {
return __awaiter(this, void 0, void 0, function () { return __awaiter(this, void 0, void 0, function () {
var data, isFollow, today, projection, tasks, attentionStore, beMembership, followBefore, followNow, isNewVip; var data, isFollow, today, projection, tasks, follow, member, followBefore, followNow, isNewVip;
var _a; var _a;
return __generator(this, function (_b) { return __generator(this, function (_b) {
switch (_b.label) { switch (_b.label) {
...@@ -248,21 +248,21 @@ var UserService = /** @class */ (function (_super) { ...@@ -248,21 +248,21 @@ var UserService = /** @class */ (function (_super) {
_a) _a)
}; };
tasks = activityInfo.tasks; tasks = activityInfo.tasks;
attentionStore = tasks.attentionStore, beMembership = tasks.beMembership; follow = tasks.follow, member = tasks.member;
followBefore = userInfo.follow.flag; followBefore = userInfo.follow.flag;
followNow = isFollow; followNow = isFollow;
if (!followBefore && followNow && !userInfo.follow.newFollow) { if (!followBefore && followNow && !userInfo.follow.newFollow) {
// @ts-ignore // @ts-ignore
projection.$set.follow = this.setNewFollowUserData(userInfo.follow); projection.$set.follow = this.setNewFollowUserData(userInfo.follow);
projection.$push["taskInfo." + today + ".follow"] = { createTime: Date.now() }; projection.$push["taskInfo." + today + ".follow"] = { createTime: Date.now() };
projection.$inc["remainTimes.follow"] = attentionStore.value; projection.$inc["remainTimes.follow"] = follow.value;
} }
isNewVip = this.checkNewVip(userInfo, vipInfo); isNewVip = this.checkNewVip(userInfo, vipInfo);
if (isNewVip && !userInfo.member.newMember) { if (isNewVip && !userInfo.member.newMember) {
// @ts-ignore // @ts-ignore
projection.$set.member = this.setNewVipUserData(userInfo.member); projection.$set.member = this.setNewVipUserData(userInfo.member);
projection.$push["taskInfo." + today + ".member"] = { createTime: Date.now() }; projection.$push["taskInfo." + today + ".member"] = { createTime: Date.now() };
projection.$inc["remainTimes.member"] = beMembership.value; projection.$inc["remainTimes.member"] = member.value;
} }
return [4 /*yield*/, this.updateUser(userInfo._id, projection)]; return [4 /*yield*/, this.updateUser(userInfo._id, projection)];
case 1: case 1:
......
{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../src/service/user.service.ts"],"names":[],"mappings":"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"} {"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../src/service/user.service.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,8BAAwC;AACxC,+CAAwC;AACxC,4BAAoC;AACpC,kCAAiD;AACjD,sCAAqC;AAErC;IAA0B,+BAAW;IAEnC,qBAAY,OAA0B;QAAtC,YACE,kBAAM,OAAO,CAAC,SAEf;QADC,KAAI,CAAC,OAAO,GAAG,IAAI,aAAO,CAAC,OAAO,EAAE,iBAAY,CAAC,CAAA;;IACnD,CAAC;IACD;;;OAGG;IACG,iCAAW,GAAjB;;;;;;wBACM,KAAmB,IAAI,CAAC,OAAO,EAA7B,MAAM,YAAA,EAAE,IAAI,UAAA,CAAiB;wBAC7B,UAAU,GAAK,IAAI,WAAT,CAAS;wBACZ,qBAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAY,EAAE,MAAM,QAAA,EAAE,UAAU,YAAA,EAAE,CAAC,EAAA;;wBAAtE,MAAM,GAAG,SAA6D;wBAC1E,sBAAO,MAAM,EAAA;;;;KACd;IAED;;;;;OAKG;IACG,yCAAmB,GAAzB,UAA0B,MAAc;;;;;;wBAChC,UAAU,GAAK,IAAI,CAAC,OAAO,CAAC,IAAI,WAAtB,CAAsB;wBACzB,qBAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAY,EAAE,MAAM,QAAA,EAAE,UAAU,YAAA,EAAE,CAAC,EAAA;;wBAAtE,MAAM,GAAG,SAA6D;wBAC1E,sBAAO,MAAM,EAAA;;;;KACd;IAED;;;;OAIG;IACG,gCAAU,GAAhB,UAAiB,OAAe,EAAE,gBAA6B,EAAE,WAAwB;QAAvD,iCAAA,EAAA,qBAA6B;QAAE,4BAAA,EAAA,gBAAwB;;;;;;wBACvF,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,kBAAkB,CAAC,CAAA;wBACjD,IAAI,oBAAY,CAAC,IAAI,CAAC,OAAO,EAAE,gBAAgB,CAAC,EAAE;4BAChD,sBAAO,kBAAQ,EAAA;yBAChB;wBACO,UAAU,GAAK,IAAI,CAAC,OAAO,CAAC,IAAI,WAAtB,CAAsB;wBACpC,MAAM,GAAG;4BACX,MAAM,EAAE;gCACN,WAAW,EAAE,EAAE;6BAChB;yBACF,CAAA;wBACG,OAAO,GAAG;4BACZ,MAAM,EAAE;gCACN,MAAM,EAAE,EAAE;6BACX;yBACF,CAAA;wBAEK,KAAK,GAAc,WAAW,4BAAuB,UAAY,CAAA;;;;wBAE5D,qBAAM,YAAM,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,EAAA;;wBAAzD,MAAM,GAAG,SAAgD,CAAA;wBAE/C,qBAAM,YAAM,CAAC,aAAa,CAClC,IAAI,CAAC,OAAO,EACZ,OAAO,EACP;gCACE,MAAM,EAAE,QAAQ;gCAChB,QAAQ,EAAE,OAAO;6BAClB,EACD,KAAK,CACN,EAAA;;wBARD,OAAO,GAAG,SAQT,CAAA;;;;wBAED,OAAO,CAAC,GAAG,CAAC,GAAC,CAAC,CAAA;;;wBAEhB,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;wBAC/C,sBAAO;gCACL,KAAK,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC;gCACrD,GAAG,EAAE,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM;6BAC7C,EAAA;;;;KACF;IACD;;;;;;;OAOG;IACG,kCAAY,GAAlB,UAAmB,OAAiB,EAAE,YAA2B;;;;;;;wBACzD,KAAmB,IAAI,CAAC,OAAO,EAA7B,MAAM,YAAA,EAAE,IAAI,UAAA,CAAiB;wBAC7B,UAAU,GAA2C,IAAI,WAA/C,EAAE,QAAQ,GAAiC,IAAI,SAArC,EAAE,MAAM,GAAyB,IAAI,OAA7B,EAAE,QAAQ,GAAe,IAAI,SAAnB,EAAE,QAAQ,GAAK,IAAI,SAAT,CAAS;wBAC3D,KAAK,GAAG,gBAAQ,EAAE,CAAA;wBACxB,OAAO,CAAC,GAAG,CAAC,eAAa,KAAK,eAAY,EAAE,KAAK,CAAC,CAAA;wBAC1C,KAAK,GAAK,YAAY,MAAjB,CAAiB;wBACtB,MAAM,GAAa,KAAK,OAAlB,EAAE,MAAM,GAAK,KAAK,OAAV,CAAU;wBAC1B,IAAI,GAAc;4BACtB,UAAU,YAAA;4BACV,MAAM,QAAA;4BACN,QAAQ,UAAA;4BACR,QAAQ,UAAA;4BACR,MAAM,QAAA;4BACN,qBAAqB;4BACrB,WAAW,EAAE;gCACX,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gCACnC,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;6BACzC;4BACD,MAAM,EAAE;gCACN,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK;6BACtB;4BACD,MAAM,EAAE;gCACN,IAAI,EAAE,CAAC,CAAC,QAAQ;6BACjB;4BACD,KAAK;gCACH,GAAC,KAAK,IAAG,CAAC;mCACX;4BACD,QAAQ;gCACN,GAAC,KAAK,IAAG,EAAE;mCACZ;4BACD,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE;4BACtB,SAAS,EAAE,KAAK;4BAChB,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE;yBACvB,CAAA;wBAEM,qBAAM,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,EAAA;4BAAzC,sBAAO,SAAkC,EAAA;;;;KAC1C;IAEK,oCAAc,GAApB,UAAqB,OAAiB,EAAE,QAAmB,EAAE,YAA2B;;;;;;;wBAC9E,IAAI,GAAK,IAAI,CAAC,OAAO,KAAjB,CAAiB;wBACrB,QAAQ,GAAK,IAAI,SAAT,CAAS;wBAEnB,KAAK,GAAG,gBAAQ,EAAE,CAAA;wBACpB,UAAU,GAAG;4BACf,IAAI,EAAE;gCACJ,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE;6BACvB;4BACD,KAAK,EAAE,EAAE;4BACT,IAAI;gCACF,GAAC,WAAS,KAAO,IAAG,CAAC;mCACtB;yBACF,CAAA;wBAEO,KAAK,GAAK,YAAY,MAAjB,CAAiB;wBACtB,MAAM,GAAa,KAAK,OAAlB,EAAE,MAAM,GAAK,KAAK,OAAV,CAAU;wBAI1B,YAAY,GAAG,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAA;wBACnC,SAAS,GAAG,QAAQ,CAAA;wBAC1B,IAAI,CAAC,YAAY,IAAI,SAAS,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,EAAE;4BAC5D,aAAa;4BACb,UAAU,CAAC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;4BACnE,UAAU,CAAC,KAAK,CAAC,cAAY,KAAK,YAAS,CAAC,GAAG,EAAE,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,CAAA;4BACzE,UAAU,CAAC,IAAI,CAAC,oBAAoB,CAAC,GAAG,MAAM,CAAC,KAAK,CAAA;yBACrD;wBAGK,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;wBACpD,IAAI,QAAQ,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,EAAE;4BAC1C,aAAa;4BACb,UAAU,CAAC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;4BAChE,UAAU,CAAC,KAAK,CAAC,cAAY,KAAK,YAAS,CAAC,GAAG,EAAE,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,CAAA;4BACzE,UAAU,CAAC,IAAI,CAAC,oBAAoB,CAAC,GAAG,MAAM,CAAC,KAAK,CAAA;yBACrD;wBAED,qBAAM,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,EAAE,UAAU,CAAC,EAAA;;wBAA/C,SAA+C,CAAA;;;;;KAChD;IAED;;;;;OAKG;IACG,gCAAU,GAAhB,UAAiB,GAAW,EAAE,UAAwB;;;;4BAC7C,qBAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,GAAG,KAAA,EAAE,EAAE,IAAI,CAAC,0BAA0B,CAAC,UAAU,CAAC,CAAC,EAAA;4BAAtF,sBAAO,SAA+E,EAAA;;;;KACvF;IACD;;;;;;OAMG;IACH,gDAA0B,GAA1B,UAA2B,UAAwB;QACjD,UAAU,CAAC,MAAM,CAAC,GAAG,UAAU,CAAC,MAAM,CAAC,IAAI,EAAE,CAAA;QAC7C,UAAU,CAAC,MAAM,CAAC,CAAC,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QAC1C,sBAAsB;QACtB,IAAI,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,EAAE;YACnE,OAAO,UAAU,CAAC,OAAO,CAAC,CAAA;SAC3B;QAED,4BAA4B;QAC5B,IAAI,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,EAAE;YACzE,OAAO,UAAU,CAAC,UAAU,CAAC,CAAA;SAC9B;QACD,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;QACvB,OAAO,UAAU,CAAA;IACnB,CAAC;IACD;;;;OAIG;IACG,qCAAe,GAArB,UAAsB,GAAW;;;;4BACxB,qBAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,GAAG,KAAA,EAAE,CAAC,EAAA;4BAA1C,sBAAO,SAAmC,EAAA;;;;KAC3C;IAED;;;;;;;OAOG;IACH,iCAAW,GAAX,UAAY,QAAmB,EAAE,OAAiB;QAEpC,IAAA,IAAI,GACZ,QAAQ,YADI,CACJ;QAEJ,IAAA,KAAK,GAAK,OAAO,MAAZ,CAAY;QAEzB,OAAO,CAAC,IAAI,IAAI,KAAK,CAAA;IACvB,CAAC;IAED,uCAAiB,GAAjB,UAAkB,MAAmB;QACnC,IAAM,KAAK,GAAG,gBAAQ,EAAE,CAAA;QACxB,6BACK,MAAM,KACT,SAAS,EAAE,IAAI,EACf,YAAY,EAAE,IAAI,CAAC,GAAG,EAAE,EACxB,WAAW,EAAE,KAAK,IACnB;IACH,CAAC;IAED,0CAAoB,GAApB,UAAqB,MAAmB;QACtC,IAAM,KAAK,GAAG,gBAAQ,EAAE,CAAA;QACxB,6BACK,MAAM,KACT,SAAS,EAAE,IAAI,EACf,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,EACtB,SAAS,EAAE,KAAK,IACjB;IACH,CAAC;IACH,kBAAC;AAAD,CAAC,AA7OD,CAA0B,sBAAW,GA6OpC;AAED,kBAAe,WAAW,CAAA"}
\ No newline at end of file \ No newline at end of file
...@@ -40,7 +40,7 @@ export default class Share { ...@@ -40,7 +40,7 @@ export default class Share {
const { tasks } = activityInfo const { tasks } = activityInfo
// 获取分享奖励 // 获取分享奖励
const { const {
inviteFriends: { value } invites: { value }
}: ITasks = tasks || {} }: ITasks = tasks || {}
// 新会员 // 新会员
......
...@@ -32,7 +32,7 @@ export default class TaskService extends UserService { ...@@ -32,7 +32,7 @@ export default class TaskService extends UserService {
// 后台配置奖励 // 后台配置奖励
const { const {
beMembership: { value } member: { value }
} = tasks } = tasks
return { return {
...@@ -146,7 +146,7 @@ export default class TaskService extends UserService { ...@@ -146,7 +146,7 @@ export default class TaskService extends UserService {
// 初始化邀请任务 // 初始化邀请任务
initInvitesTask(userInfo: IUserInfo, tasks: ITasks): ITaskInfo { initInvitesTask(userInfo: IUserInfo, tasks: ITasks): ITaskInfo {
const { const {
inviteFriends: { value, taskRateType, times } invites: { value, taskRateType, times }
} = tasks } = tasks
const { remainTimes } = userInfo const { remainTimes } = userInfo
...@@ -171,7 +171,7 @@ export default class TaskService extends UserService { ...@@ -171,7 +171,7 @@ export default class TaskService extends UserService {
// 关注店铺 // 关注店铺
initFollowTask(userInfo: IUserInfo, tasks: ITasks): ITaskInfo { initFollowTask(userInfo: IUserInfo, tasks: ITasks): ITaskInfo {
const { const {
attentionStore: { value } follow: { value }
} = tasks } = tasks
const { remainTimes } = userInfo const { remainTimes } = userInfo
...@@ -241,7 +241,7 @@ export default class TaskService extends UserService { ...@@ -241,7 +241,7 @@ export default class TaskService extends UserService {
const isNewVip = this.checkNewVip(userInfo, vipInfo) const isNewVip = this.checkNewVip(userInfo, vipInfo)
const { const {
beMembership: { value } member: { value }
} = tasks } = tasks
let projection = { let projection = {
...@@ -359,7 +359,7 @@ export default class TaskService extends UserService { ...@@ -359,7 +359,7 @@ export default class TaskService extends UserService {
const { tasks } = activityInfo const { tasks } = activityInfo
// 获取关注店铺奖励 // 获取关注店铺奖励
const { const {
attentionStore: { value } follow: { value }
} = tasks || {} } = tasks || {}
// 更新follow信息 // 更新follow信息
......
...@@ -97,7 +97,7 @@ class UserService extends BaseService { ...@@ -97,7 +97,7 @@ class UserService extends BaseService {
const today = getToday() const today = getToday()
console.log(`----------${today}----------`, today) console.log(`----------${today}----------`, today)
const { tasks } = activityInfo const { tasks } = activityInfo
const { attentionStore, beMembership } = tasks const { follow, member } = tasks
const user: IUserInfo = { const user: IUserInfo = {
activityId, activityId,
avatar, avatar,
...@@ -106,8 +106,8 @@ class UserService extends BaseService { ...@@ -106,8 +106,8 @@ class UserService extends BaseService {
openId, openId,
// 待领取次数初始化, 根据需自定义添加 // 待领取次数初始化, 根据需自定义添加
remainTimes: { remainTimes: {
follow: isFollow ? attentionStore.value : 0, follow: isFollow ? follow.value : 0,
member: vipInfo.isVip ? beMembership.value : 0 member: vipInfo.isVip ? member.value : 0
}, },
member: { member: {
flag: !!vipInfo.isVip flag: !!vipInfo.isVip
...@@ -145,7 +145,7 @@ class UserService extends BaseService { ...@@ -145,7 +145,7 @@ class UserService extends BaseService {
} }
const { tasks } = activityInfo const { tasks } = activityInfo
const { attentionStore, beMembership } = tasks const { follow, member } = tasks
// 老用户 // 老用户
// 之前进入活动未关注,现在进入关注,则视为新关注店铺用户 // 之前进入活动未关注,现在进入关注,则视为新关注店铺用户
...@@ -155,7 +155,7 @@ class UserService extends BaseService { ...@@ -155,7 +155,7 @@ class UserService extends BaseService {
// @ts-ignore // @ts-ignore
projection.$set.follow = this.setNewFollowUserData(userInfo.follow) projection.$set.follow = this.setNewFollowUserData(userInfo.follow)
projection.$push[`taskInfo.${today}.follow`] = { createTime: Date.now() } projection.$push[`taskInfo.${today}.follow`] = { createTime: Date.now() }
projection.$inc[`remainTimes.follow`] = attentionStore.value projection.$inc[`remainTimes.follow`] = follow.value
} }
// 之前进入活动非会员,现在进入会员,则视为新会员用户 // 之前进入活动非会员,现在进入会员,则视为新会员用户
...@@ -164,7 +164,7 @@ class UserService extends BaseService { ...@@ -164,7 +164,7 @@ class UserService extends BaseService {
// @ts-ignore // @ts-ignore
projection.$set.member = this.setNewVipUserData(userInfo.member) projection.$set.member = this.setNewVipUserData(userInfo.member)
projection.$push[`taskInfo.${today}.member`] = { createTime: Date.now() } projection.$push[`taskInfo.${today}.member`] = { createTime: Date.now() }
projection.$inc[`remainTimes.member`] = beMembership.value projection.$inc[`remainTimes.member`] = member.value
} }
await this.updateUser(userInfo._id, projection) await this.updateUser(userInfo._id, projection)
......
...@@ -16,15 +16,15 @@ interface IActivityInfo { ...@@ -16,15 +16,15 @@ interface IActivityInfo {
} }
interface ITasks { interface ITasks {
attentionStore?: ITaskConfig follow?: ITaskConfig
beMembership?: ITaskConfig member?: ITaskConfig
sign?: ITaskConfig sign?: ITaskConfig
exchangeCredits?: ITaskConfig exchangeCredits?: ITaskConfig
browseGoods?: ITaskConfig browseGoods?: ITaskConfig
orderGoods?: ITaskConfig orderGoods?: ITaskConfig
collectGoods?: ITaskConfig collectGoods?: ITaskConfig
jumpLink?: ITaskConfig jumpLink?: ITaskConfig
inviteFriends?: ITaskConfig invites?: ITaskConfig
} }
interface ITaskConfig { interface ITaskConfig {
......
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