Skip to content

T
taobao-mini-template
Commit 760b0b33 authored by qinhaitao's avatar qinhaitao
Browse files
Options

fix: 🐛 奖品排序

parent 9d8c9b1c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 75 additions and 36 deletions
server/duibats/dist/controller/save.controller.js
View file @ 760b0b33
"use strict";
/** @format */
var __assign = (this && this.__assign) || function () {
__assign = Object.assign || function(t) {
for (var s, i = 1, n = arguments.length; i < n; i++) {
s = arguments[i];
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
t[p] = s[p];
}
return t;
};
return __assign.apply(this, arguments);
};
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
......@@ -68,7 +79,7 @@ var ActivitSaveController = /** @class */ (function () {
ActivitSaveController.prototype.saveActivityInfo = function (context, _a, _b) {
var activityconfigService = _b[0];
return __awaiter(this, void 0, void 0, function () {
var _c, _d, title, _e, activityId, startTime, endTime, _f, tasks, rule, prizeList, openId, baseData, allPrizeList, result, result, _g, bothIds, deleteIds;
var _c, _d, title, _e, activityId, startTime, endTime, _f, tasks, rule, prizeList, openId, baseData, allPrizeList, result, result, _g, bothIds, deleteIds, prizeResult;
return __generator(this, function (_h) {
switch (_h.label) {
case 0:
......@@ -84,7 +95,7 @@ var ActivitSaveController = /** @class */ (function () {
// 奖品过期时间, 根据需求领奖是否有过期时间
awardReceiveExpiredTime: endTime + constants_1._48_HOURS
};
allPrizeList = __spreadArrays(prizeList);
allPrizeList = __spreadArrays(prizeList.map(function (v, i) { return (__assign(__assign({}, v), { level: i + 1 })); }));
if (!!activityId) return [3 /*break*/, 2];
return [4 /*yield*/, activityconfigService.saveNewActivity(baseData, allPrizeList, openId)];
case 1:
......@@ -115,8 +126,11 @@ var ActivitSaveController = /** @class */ (function () {
result = _h.sent();
return [4 /*yield*/, activityconfigService.insertAndUpdatePrize(activityId, allPrizeList, bothIds)];
case 6:
// 添加和更新奖品
result = _h.sent();
prizeResult = _h.sent();
if (prizeResult.failed.length) {
console.log(prizeResult.failed, '更新奖品失败');
return [2 /*return*/, sdk_1.resultsModel.error(constants_1.CODE_TYPES.SYSTEM_ERROR, '保存活动失败')];
}
if (result || result === 0) {
return [2 /*return*/, sdk_1.resultsModel.success(true)];
}
......
server/duibats/dist/controller/save.controller.js.map
View file @ 760b0b33
{"version":3,"file":"save.controller.js","sourceRoot":"","sources":["../../src/controller/save.controller.ts"],"names":[],"mappings":";AAAA,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEd,4CAAsD;AACtD,0CAAoE;AACpE,8BAAqC;AACrC,sCAAkD;AAClD,sDAAkD;AAgBlD;IAAA;IA8DA,CAAC;IA7DC;;OAEG;IACH,mEAAmE;IAG7D,gDAAgB,GAAtB,UAAuB,OAA6B,EAAE,EAAE,EAAE,EAAgD;YAA/C,qBAAqB,QAAA;;;;;;wBAC1E,KAAmF,OAAO,CAAC,IAAI,EAA7F,aAAU,EAAV,KAAK,mBAAG,EAAE,KAAA,EAAE,kBAAe,EAAf,UAAU,mBAAG,EAAE,KAAA,EAAE,SAAS,eAAA,EAAE,OAAO,aAAA,EAAE,aAAU,EAAV,KAAK,mBAAG,EAAE,KAAA,EAAE,IAAI,UAAA,EAAE,SAAS,eAAA,CAAiB;wBAC3F,MAAM,GAAK,OAAO,OAAZ,CAAY;wBAGpB,QAAQ,GAAsB;4BAClC,KAAK,OAAA;4BACL,SAAS,WAAA;4BACT,OAAO,SAAA;4BACP,IAAI,MAAA;4BACJ,MAAM,QAAA;4BACN,KAAK,OAAA;4BACL,wBAAwB;4BACxB,uBAAuB,EAAE,OAAO,GAAG,qBAAS;yBAC7C,CAAA;wBAMK,YAAY,kBAA8B,SAAS,CAAC,CAAA;6BAGtD,CAAC,UAAU,EAAX,wBAAW;wBAEE,qBAAM,qBAAqB,CAAC,eAAe,CAAC,QAAQ,EAAE,YAAY,EAAE,MAAM,CAAC,EAAA;;wBAApF,MAAM,GAAG,SAA2E;wBAC1F,IAAI,MAAM,IAAI,MAAM,KAAK,CAAC,EAAE;4BAC1B,sBAAO,kBAAY,CAAC,OAAO,CAAC,IAAI,CAAC,EAAA;yBAClC;6BAAM;4BACL,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;4BAC7B,sBAAO,kBAAY,CAAC,KAAK,CAAC,sBAAU,CAAC,YAAY,EAAE,QAAQ,CAAC,EAAA;yBAC7D;;4BAKY,qBAAM,qBAAqB,CAAC,oBAAoB,CAAC,UAAU,EAAE,QAAQ,CAAC;wBAEnF,gBAAgB;sBAFmE;;wBAA/E,MAAM,GAAG,SAAsE;wBAGpD,qBAAM,qBAAqB,CAAC,aAAa,CAAC,UAAU,EAAE,YAAY,CAAC;4BAElG,aAAa;0BAFqF;;wBAA5F,KAAyB,SAAmE,EAA1F,OAAO,aAAA,EAAE,SAAS,eAAA;wBAGjB,qBAAM,qBAAqB,CAAC,gBAAgB,CAAC,SAAS,CAAC;4BAEhE,UAAU;0BAFsD;;wBADhE,aAAa;wBACb,MAAM,GAAG,SAAuD,CAAA;wBAGvD,qBAAM,qBAAqB,CAAC,oBAAoB,CAAC,UAAU,EAAE,YAAY,EAAE,OAAO,CAAC,EAAA;;wBAD5F,UAAU;wBACV,MAAM,GAAG,SAAmF,CAAA;wBAE5F,IAAI,MAAM,IAAI,MAAM,KAAK,CAAC,EAAE;4BAC1B,sBAAO,kBAAY,CAAC,OAAO,CAAC,IAAI,CAAC,EAAA;yBAClC;6BAAM;4BACL,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;4BAC7B,sBAAO,kBAAY,CAAC,KAAK,CAAC,sBAAU,CAAC,YAAY,EAAE,QAAQ,CAAC,EAAA;yBAC7D;;;;;;KAEJ;IAtDD;QAFC,0BAAc,CAAC,yBAAU,CAAC;QAC1B,oBAAQ,CAAC,CAAC,+BAAqB,CAAC,CAAC;;;;iEAuDjC;IACH,4BAAC;CAAA,AA9DD,IA8DC;kBA9DoB,qBAAqB"}
\ No newline at end of file
{"version":3,"file":"save.controller.js","sourceRoot":"","sources":["../../src/controller/save.controller.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
server/duibats/dist/decorator/services.js
View file @ 760b0b33
......@@ -44,18 +44,16 @@ var constants_1 = require("../constants");
var service_1 = require("../service");
function initBaseInfo(context, baseInfos) {
return __awaiter(this, void 0, void 0, function () {
var _a;
return __generator(this, function (_b) {
switch (_b.label) {
var session;
return __generator(this, function (_a) {
switch (_a.label) {
case 0:
if (!!baseInfos.session) return [3 /*break*/, 2];
// @ts-ignore
_a = baseInfos;
return [4 /*yield*/, new service_1.TaobaoTopService(context).getAccessTokenByOpenId()];
case 1:
// @ts-ignore
_a.session = _b.sent();
_b.label = 2;
session = (_a.sent()).session;
baseInfos.session = session;
_a.label = 2;
case 2: return [2 /*return*/, baseInfos];
}
});
......
server/duibats/dist/decorator/services.js.map
View file @ 760b0b33
{"version":3,"file":"services.js","sourceRoot":"","sources":["../../src/decorator/services.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,cAAc;AACd,kCAAiD;AACjD,8BAAqC;AACrC,0CAAyC;AACzC,sCAA6C;AAC7C,SAAe,YAAY,CAAC,OAAgB,EAAE,SAA2B;;;;;;yBACnE,CAAC,SAAS,CAAC,OAAO,EAAlB,wBAAkB;oBACpB,aAAa;oBACb,KAAA,SAAS,CAAA;oBAAW,qBAAM,IAAI,0BAAgB,CAAC,OAAO,CAAC,CAAC,sBAAsB,EAAE,EAAA;;oBADhF,aAAa;oBACb,GAAU,OAAO,GAAG,SAA4D,CAAA;;wBAGlF,sBAAO,SAAS,EAAA;;;;CACjB;AAEY,QAAA,QAAQ,GAAG,UAAC,QAAe;IACtC,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;gCAC1E,mCAAmC;8BADuC;;4BAApE,SAAS,GAAqB,SAAsC;4BAC1E,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;;;;4BAGC,cAAM,CAAC,OAAO,CAAC,CAAA;4BACT,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,CACtB,sBAAU,CAAC,YAAY,EACvB,CAAG,mBAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,0CAAE,SAAS,0CAAE,OAAO,0CAAE,OAAO,KAAI,OAAO,CAAC,OAAO,8BAAM,CACxE,CAAA;;gCAEH,sBAAO,GAAG,EAAA;;;;SACX,CAAA;IACH,CAAC,CAAA;AACH,CAAC,CAAA"}
\ No newline at end of file
{"version":3,"file":"services.js","sourceRoot":"","sources":["../../src/decorator/services.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,cAAc;AACd,kCAAiD;AACjD,8BAAqC;AACrC,0CAAyC;AACzC,sCAA6C;AAC7C,SAAe,YAAY,CAAC,OAAgB,EAAE,SAA2B;;;;;;yBACnE,CAAC,SAAS,CAAC,OAAO,EAAlB,wBAAkB;oBAEA,qBAAM,IAAI,0BAAgB,CAAC,OAAO,CAAC,CAAC,sBAAsB,EAAE,EAAA;;oBAAxE,OAAO,GAAK,CAAA,SAA4D,CAAA,QAAjE;oBACf,SAAS,CAAC,OAAO,GAAG,OAAO,CAAA;;wBAG7B,sBAAO,SAAS,EAAA;;;;CACjB;AAEY,QAAA,QAAQ,GAAG,UAAC,QAAe;IACtC,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;gCAC1E,mCAAmC;8BADuC;;4BAApE,SAAS,GAAqB,SAAsC;4BAC1E,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;;;;4BAGC,cAAM,CAAC,OAAO,CAAC,CAAA;4BACT,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,CACtB,sBAAU,CAAC,YAAY,EACvB,CAAG,mBAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,0CAAE,SAAS,0CAAE,OAAO,0CAAE,OAAO,KAAI,OAAO,CAAC,OAAO,8BAAM,CACxE,CAAA;;gCAEH,sBAAO,GAAG,EAAA;;;;SACX,CAAA;IACH,CAAC,CAAA;AACH,CAAC,CAAA"}
\ No newline at end of file
server/duibats/dist/decorator/validate.js
View file @ 760b0b33
......@@ -83,14 +83,15 @@ exports.paramsValidate = function (validators) {
var validateParams = function (validators, data) {
var validator = new async_validator_1.default(validators);
return new Promise(function (resolve) {
validator
.validate(data)
.then(function () {
resolve({});
})
.catch(function (_a) {
var errors = _a.errors, fields = _a.fields;
resolve({ errors: errors, fields: fields });
validator.validate(data, {}, function (errors, fields) {
console.log('errors', errors);
console.log('fields', fields);
if (errors) {
resolve({});
}
else {
resolve({ errors: errors, fields: fields });
}
});
});
};
......
server/duibats/dist/decorator/validate.js.map
View file @ 760b0b33
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../src/decorator/validate.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,cAAc;AACd,8BAAqC;AACrC,0CAAyC;AACzC,mDAA+C;AAElC,QAAA,cAAc,GAAG,UAAC,UAAiB;IAC9C,OAAO,UAAU,MAAc,EAAE,IAAY,EAAE,UAA8B;QAC3E,IAAM,MAAM,GAAG,UAAU,CAAC,KAAK,CAAA;QAE/B,UAAU,CAAC,KAAK,GAAG;;YAAgB,cAAc;iBAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;gBAAd,yBAAc;;;;;;;4BACxC,OAAO,GAAoB,IAAI,GAAxB,EAAE,KAAkB,IAAI,GAAR,EAAd,SAAS,mBAAG,EAAE,KAAA,CAAQ;4BAEnB,qBAAM,cAAc,CAAC,UAAU,EAAE,OAAO,CAAC,IAAI,CAAC,EAAA;;4BAAzD,MAAM,GAAK,CAAA,SAA8C,CAAA,OAAnD;4BAEd,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;4BACnB,IAAI,MAAM;gCAAE,sBAAO,kBAAY,CAAC,KAAK,CAAC,sBAAU,CAAC,YAAY,QAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAG,CAAC,2CAAG,OAAO,CAAC,EAAA;4BAEpF,sBAAO,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,OAAO,eAAO,SAAS,EAAG,CAAC,EAAA;;;;SACzD,CAAA;IACH,CAAC,CAAA;AACH,CAAC,CAAA;AAED,IAAM,cAAc,GAAG,UAAC,UAAiB,EAAE,IAAY;IACrD,IAAM,SAAS,GAAG,IAAI,yBAAM,CAAC,UAAU,CAAC,CAAA;IAExC,OAAO,IAAI,OAAO,CAAC,UAAA,OAAO;QACxB,SAAS;aACN,QAAQ,CAAC,IAAI,CAAC;aACd,IAAI,CAAC;YACJ,OAAO,CAAC,EAAE,CAAC,CAAA;QACb,CAAC,CAAC;aACD,KAAK,CAAC,UAAC,EAAkB;gBAAhB,MAAM,YAAA,EAAE,MAAM,YAAA;YACtB,OAAO,CAAC,EAAE,MAAM,QAAA,EAAE,MAAM,QAAA,EAAE,CAAC,CAAA;QAC7B,CAAC,CAAC,CAAA;IACN,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA"}
\ No newline at end of file
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../src/decorator/validate.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,cAAc;AACd,8BAAqC;AACrC,0CAAyC;AACzC,mDAA+C;AAElC,QAAA,cAAc,GAAG,UAAC,UAAiB;IAC9C,OAAO,UAAU,MAAc,EAAE,IAAY,EAAE,UAA8B;QAC3E,IAAM,MAAM,GAAG,UAAU,CAAC,KAAK,CAAA;QAE/B,UAAU,CAAC,KAAK,GAAG;;YAAgB,cAAc;iBAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;gBAAd,yBAAc;;;;;;;4BACxC,OAAO,GAAoB,IAAI,GAAxB,EAAE,KAAkB,IAAI,GAAR,EAAd,SAAS,mBAAG,EAAE,KAAA,CAAQ;4BAEnB,qBAAM,cAAc,CAAC,UAAU,EAAE,OAAO,CAAC,IAAI,CAAC,EAAA;;4BAAzD,MAAM,GAAK,CAAA,SAA8C,CAAA,OAAnD;4BAEd,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;4BACnB,IAAI,MAAM;gCAAE,sBAAO,kBAAY,CAAC,KAAK,CAAC,sBAAU,CAAC,YAAY,QAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAG,CAAC,2CAAG,OAAO,CAAC,EAAA;4BAEpF,sBAAO,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,OAAO,eAAO,SAAS,EAAG,CAAC,EAAA;;;;SACzD,CAAA;IACH,CAAC,CAAA;AACH,CAAC,CAAA;AAED,IAAM,cAAc,GAAG,UAAC,UAAiB,EAAE,IAAY;IACrD,IAAM,SAAS,GAAG,IAAI,yBAAM,CAAC,UAAU,CAAC,CAAA;IAExC,OAAO,IAAI,OAAO,CAAC,UAAA,OAAO;QACxB,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,EAAE,UAAC,MAAM,EAAE,MAAM;YAC1C,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;YAC7B,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;YAC7B,IAAI,MAAM,EAAE;gBACV,OAAO,CAAC,EAAE,CAAC,CAAA;aACZ;iBAAM;gBACL,OAAO,CAAC,EAAE,MAAM,QAAA,EAAE,MAAM,QAAA,EAAE,CAAC,CAAA;aAC5B;QACH,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA"}
\ No newline at end of file
server/duibats/dist/service/activityconfig.service.d.ts
View file @ 760b0b33
......@@ -8,7 +8,10 @@ export default class ActivityConfigService {
getPrizeInfoById(id: any): Promise<any>;
updateDeleteStatusById(id: any): Promise<any>;
deletePrizeByIds(ids: string[]): Promise<any>;
insertAndUpdatePrize(activityId: string, allPrizeList: Array<IActivityPrize>, bothIds: string[]): Promise<any>;
insertAndUpdatePrize(activityId: string, allPrizeList: Array<IActivityPrize>, bothIds: string[]): Promise<{
success: any[];
failed: any[];
}>;
updateOnePrizeById(id: any, data: any): Promise<any>;
insertPrizeByActivityId(activityId: any, data: any): Promise<any>;
getAllOldPrizeList(activityId: string): Promise<any>;
......
server/duibats/dist/service/activityconfig.service.js
View file @ 760b0b33
......@@ -162,6 +162,7 @@ var ActivityConfigService = /** @class */ (function () {
return __generator(this, function (_a) {
switch (_a.label) {
case 0:
result = true;
i = 0;
_a.label = 1;
case 1:
......@@ -180,32 +181,47 @@ var ActivityConfigService = /** @class */ (function () {
};
ActivityConfigService.prototype.insertAndUpdatePrize = function (activityId, allPrizeList, bothIds) {
return __awaiter(this, void 0, void 0, function () {
var result, i, isNewPrize, isEditPrize;
var result, i, isNewPrize, insertResult, isEditPrize, editResult;
return __generator(this, function (_a) {
switch (_a.label) {
case 0:
result = {
success: [],
failed: []
};
i = 0;
_a.label = 1;
case 1:
if (!(i < allPrizeList.length)) return [3 /*break*/, 7];
if (!(i < allPrizeList.length)) return [3 /*break*/, 6];
isNewPrize = !allPrizeList[i]._id;
if (!isNewPrize) return [3 /*break*/, 3];
return [4 /*yield*/, this.insertPrizeByActivityId(activityId, allPrizeList[i])];
case 2:
result = _a.sent();
insertResult = _a.sent();
if (insertResult) {
result.success.push(insertResult);
}
else {
result.failed.push(insertResult);
}
_a.label = 3;
case 3:
isEditPrize = bothIds.includes(allPrizeList[i]._id);
if (!isEditPrize) return [3 /*break*/, 5];
return [4 /*yield*/, this.updateOnePrizeById(allPrizeList[i]._id, allPrizeList[i])];
case 4:
result = _a.sent();
editResult = _a.sent();
if (editResult) {
result.success.push(editResult);
}
else {
result.failed.push(editResult);
}
_a.label = 5;
case 5: return [2 /*return*/, result];
case 6:
case 5:
i++;
return [3 /*break*/, 1];
case 7: return [2 /*return*/];
case 6: return [2 /*return*/, result];
}
});
});
......@@ -405,7 +421,7 @@ var ActivityConfigService = /** @class */ (function () {
})];
case 1:
_a.baseConfig = _b.sent();
return [4 /*yield*/, this.activityconfigPrizeDao.find({ activityId: activityId, deleteStatus: constants_1.DELETE_STATUS.EXIST }, { sort: { level: 1 } })];
return [4 /*yield*/, this.activityconfigPrizeDao.find({ activityId: activityId, deleteStatus: constants_1.DELETE_STATUS.EXIST, type: { $ne: constants_1.PRIZE_TYPE.THANK } }, { sort: { level: 1 } })];
case 2: return [2 /*return*/, (_a.prizeConfig = _b.sent(),
_a)];
}
......@@ -552,7 +568,8 @@ var ActivityConfigService = /** @class */ (function () {
*/
ActivityConfigService.prototype.formatPrizeConfig = function (prizeConfig) {
return {
prizeList: prizeConfig
// level 根据level排序
prizeList: prizeConfig.sort(function (a, b) { return a.level - b.level; })
};
};
// 概率奖品配置 properiodfrom properiodto
......@@ -561,6 +578,9 @@ var ActivityConfigService = /** @class */ (function () {
return prizes.map(function (v) {
if (!v.probability)
return v;
// 概率为0 跳出10000之外的区间
if (+v.probability === 0)
return __assign(__assign({}, v), { properiodfrom: 1000000, properiodto: 1000000 });
var properiodfrom = originPeriod;
var properiodto = +originPeriod + utils_1.signFigures(+v.probability * 100) - 1;
originPeriod = +originPeriod + utils_1.signFigures(+v.probability * 100);
......
server/duibats/src/controller/save.controller.ts
View file @ 760b0b33
......@@ -47,7 +47,8 @@ export default class ActivitSaveController {
// prizeList = activityconfigService.setPrizeProbalityRange(prizeList)
// 所有奖品均存在b_prize_config表里, 根据需求定义的奖品参数都要整合到allPrizeLists里
const allPrizeList: Array<IActivityPrize> = [...prizeList]
// level 排序用避免查询乱序
const allPrizeList: Array<IActivityPrize> = [...prizeList.map((v,i) => ({...v, level: i + 1}))]
// 保存新活动
if (!activityId) {
......
server/duibats/src/service/activityconfig.service.ts
View file @ 760b0b33
......@@ -403,7 +403,8 @@ export default class ActivityConfigService {
*/
formatPrizeConfig(prizeConfig: Array<IActivityPrize>) {
return {
prizeList: prizeConfig
// level 根据level排序
prizeList: prizeConfig.sort((a,b) => a.level - b.level)
}
}
// 概率奖品配置 properiodfrom properiodto
......
server/duibats/src/typings/activity.d.ts
View file @ 760b0b33
......@@ -34,6 +34,7 @@ interface IActivityPrize {
stock: number
useStock: number
openId?: string
level: number // 索引排序用
deleteStatus: number
createTime: number
updateTime: number
......
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