Skip to content

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

feat: 🎸 抽奖接口暴露prizeDatatype参数

parent ee157e51
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 19 deletions
v2.0/dist/controller/awards.controller.js
View file @ ecebb46c
......@@ -145,26 +145,26 @@ var AwardsController = /** @class */ (function () {
var userInfo = _a.userInfo;
var awardSer = _b[0];
return __awaiter(this, void 0, void 0, function () {
var openId, activityId, prizesPool, prize, reduceResult, type, _id, ename, image, userNick, record, result;
return __generator(this, function (_c) {
switch (_c.label) {
var openId, _c, activityId, prizeDataType, prizesPool, prize, reduceResult, type, _id, ename, image, userNick, record, result;
return __generator(this, function (_d) {
switch (_d.label) {
case 0:
openId = context.openId;
activityId = context.data.activityId;
_c = context.data, activityId = _c.activityId, prizeDataType = _c.prizeDataType;
return [4 /*yield*/, awardSer.getPrizeConfig({
activityId: activityId
activityId: activityId,
// 根据需求配置筛选条件
// prizeDataType: PRIZE_DATA_TYPE.PROBABILITY
prizeDataType: prizeDataType
})
// 根据概率获取
];
case 1:
prizesPool = _c.sent();
prizesPool = _d.sent();
return [4 /*yield*/, awardSer.getPrizeByProbability(prizesPool)
// 未找到奖品,降级到谢谢参与
];
case 2:
prize = _c.sent();
prize = _d.sent();
// 未找到奖品,降级到谢谢参与
if (prize) {
return [2 /*return*/, sdk_1.resultsModel.success({
......@@ -178,8 +178,8 @@ var AwardsController = /** @class */ (function () {
if (!(prize.type !== constants_1.PRIZE_TYPE.CREDITS)) return [3 /*break*/, 4];
return [4 /*yield*/, awardSer.reduceStock(prize._id)];
case 3:
reduceResult = _c.sent();
_c.label = 4;
reduceResult = _d.sent();
_d.label = 4;
case 4:
// 扣库存失败
if (reduceResult.code)
......@@ -191,7 +191,7 @@ var AwardsController = /** @class */ (function () {
prizeId: _id,
activityId: activityId,
drawStatus: constants_1.DRAW_STATUS.WAITAWARD,
// prizeDataType,
prizeDataType: prizeDataType,
remark: '',
type: type,
ename: ename,
......@@ -202,7 +202,7 @@ var AwardsController = /** @class */ (function () {
};
return [4 /*yield*/, awardSer.addAward(record)];
case 5:
result = _c.sent();
result = _d.sent();
return [2 /*return*/, sdk_1.resultsModel.success({
id: result,
type: type,
......@@ -238,7 +238,7 @@ var AwardsController = /** @class */ (function () {
__metadata("design:returntype", Promise)
], AwardsController.prototype, "receiveEnamePrize", null);
__decorate([
decorator_1.paramsCheck(['activityId']),
decorator_1.paramsCheck(['activityId', 'prizeDataType']),
decorator_1.activityTimeCheck,
decorator_1.services([service_1.AwardsService]),
__metadata("design:type", Function),
......
v2.0/dist/controller/awards.controller.js.map
View file @ ecebb46c
{"version":3,"file":"awards.controller.js","sourceRoot":"","sources":["../../src/controller/awards.controller.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
{"version":3,"file":"awards.controller.js","sourceRoot":"","sources":["../../src/controller/awards.controller.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
v2.0/src/controller/awards.controller.ts
View file @ ecebb46c
......@@ -73,18 +73,18 @@ export default class AwardsController {
/**
* 概率抽奖
*/
@paramsCheck(['activityId'])
@paramsCheck(['activityId', 'prizeDataType'])
@activityTimeCheck
@services([AwardsService])
async drawLotteryPrize(context: Context, { userInfo }: IControllerInfos, [awardSer]: [AwardsService]) {
const { openId } = context
const { activityId } = context.data
const { activityId, prizeDataType } = context.data
// 获取奖池配置
const prizesPool = await awardSer.getPrizeConfig({
activityId
activityId,
// 根据需求配置筛选条件
// prizeDataType: PRIZE_DATA_TYPE.PROBABILITY
prizeDataType
})
// 根据概率获取
......@@ -118,7 +118,7 @@ export default class AwardsController {
prizeId: _id,
activityId,
drawStatus: DRAW_STATUS.WAITAWARD,
// prizeDataType,
prizeDataType,
remark: '',
type,
ename,
......
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