Commit e41bcde3 authored by qinhaitao's avatar qinhaitao

feat: 🎸 删除ID

parent aa90a275
......@@ -5,7 +5,7 @@ export interface IPrizeListParams {
}
export interface IReceiveOjectParams {
activityId: string;
_id: string;
id: string;
name: string;
phone: string;
province: string;
......@@ -15,7 +15,7 @@ export interface IReceiveOjectParams {
}
export interface IReceiveEnameParams {
activityId: string;
_id: string;
id: string;
}
export default class AwardsController {
/**
......
......@@ -79,12 +79,12 @@ var AwardsController = /** @class */ (function () {
AwardsController.prototype.receiveObjectPrize = function (context, _a, _b) {
var awardSer = _b[0];
return __awaiter(this, void 0, void 0, function () {
var _c, province, city, area, addressdetail, _id, name, phone, activityId, result;
var _c, province, city, area, addressdetail, id, name, phone, activityId, result;
return __generator(this, function (_d) {
switch (_d.label) {
case 0:
_c = context.data, province = _c.province, city = _c.city, area = _c.area, addressdetail = _c.addressdetail, _id = _c._id, name = _c.name, phone = _c.phone, activityId = _c.activityId;
return [4 /*yield*/, awardSer.recieveObjectPrize(_id, {
_c = context.data, province = _c.province, city = _c.city, area = _c.area, addressdetail = _c.addressdetail, id = _c.id, name = _c.name, phone = _c.phone, activityId = _c.activityId;
return [4 /*yield*/, awardSer.recieveObjectPrize(id, {
activityId: activityId,
province: province,
city: city,
......@@ -109,12 +109,12 @@ var AwardsController = /** @class */ (function () {
AwardsController.prototype.receiveEnamePrize = function (context, _a, _b) {
var awardSer = _b[0];
return __awaiter(this, void 0, void 0, function () {
var _c, _id, activityId, result;
var _c, id, activityId, result;
return __generator(this, function (_d) {
switch (_d.label) {
case 0:
_c = context.data, _id = _c._id, activityId = _c.activityId;
return [4 /*yield*/, awardSer.recieveEnamePrize(_id, activityId)
_c = context.data, id = _c.id, activityId = _c.activityId;
return [4 /*yield*/, awardSer.recieveEnamePrize(id, activityId)
//@ts-ignore
];
case 1:
......
{"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
......@@ -9,5 +9,5 @@ export default class StatController {
/**
* 统计数据
*/
getStats(context: IContext<IStatsParams>): Promise<import("taobao-mini-sdk/lib/utils/resultmodel").Result<any[], true> | import("taobao-mini-sdk/lib/utils/resultmodel").Result<string | boolean | object | string[] | object[] | number[], false>>;
getStats(context: IContext<IStatsParams>): 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: {
}>, {}: {}, [baseService]: [import("./service").BaseService]) => Promise<IResult<IActivityInfo>>;
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>>;
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<{}, 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 | string[] | object[] | number[], false> | import("taobao-mini-sdk/lib/utils/resultmodel").Result<{}, 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>>;
getStats: (context: IContext<import("./controller/stat.controller").IStatsParams>) => 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>>;
getStats: (context: IContext<import("./controller/stat.controller").IStatsParams>) => 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>>;
};
export default _default;
......@@ -198,14 +198,37 @@ var AwardsService = /** @class */ (function (_super) {
case 1:
awardReceiveExpiredTime = (_b.sent()).awardReceiveExpiredTime;
return [4 /*yield*/, this.awardsdao.find({ openId: openId, activityId: activityId }, {
projection: {
_id: 1,
name: 1,
image: 1,
type: 1,
drawStatus: 1,
shipStatus: 1,
receiveName: 1,
phone: 1,
address: 1,
provice: 1,
city: 1,
area: 1,
remark: 1,
shipCompany: 1,
shipNum: 1
},
sort: {
createTime: -1
}
})
// 若有过期时间,且已过期
// _id转化为id
];
case 2:
myprizeList = _b.sent();
// _id转化为id
myprizeList = myprizeList.map(function (v) {
var prize = __assign(__assign({}, v), { id: v._id });
delete v._id;
return prize;
});
// 若有过期时间,且已过期
if (awardReceiveExpiredTime) {
currentTime_1 = Date.now();
......
This diff is collapsed.
......@@ -13,7 +13,7 @@ export interface IPrizeListParams {
export interface IReceiveOjectParams {
activityId: string
_id: string
id: string
name: string
phone: string
province: string
......@@ -24,7 +24,7 @@ export interface IReceiveOjectParams {
export interface IReceiveEnameParams {
activityId: string
_id: string
id: string
}
export default class AwardsController {
......@@ -58,9 +58,9 @@ export default class AwardsController {
{},
[awardSer]: [AwardsService]
): Promise<IResult<boolean>> {
let { province, city, area, addressdetail, _id, name, phone, activityId } = context.data
let { province, city, area, addressdetail, id, name, phone, activityId } = context.data
let result = await awardSer.recieveObjectPrize(_id, {
let result = await awardSer.recieveObjectPrize(id, {
activityId,
province,
city,
......@@ -83,9 +83,9 @@ export default class AwardsController {
@userCheck({ intercept: true })
@services([AwardsService])
async receiveEnamePrize(context: IContext<IReceiveEnameParams>, {}, [awardSer]: [AwardsService]) {
let { _id, activityId } = context.data
let { id, activityId } = context.data
let result = await awardSer.recieveEnamePrize(_id, activityId)
let result = await awardSer.recieveEnamePrize(id, activityId)
//@ts-ignore
if (result.code) {
//@ts-ignore
......
......@@ -109,11 +109,38 @@ export default class AwardsService extends UserService {
let myprizeList = await this.awardsdao.find(
{ openId, activityId },
{
projection: {
_id: 1,
name: 1,
image: 1,
type: 1,
drawStatus: 1,
shipStatus: 1,
receiveName: 1,
phone: 1,
address: 1,
provice: 1,
city: 1,
area: 1,
remark: 1,
shipCompany: 1,
shipNum: 1
},
sort: {
createTime: -1
}
}
)
// _id转化为id
myprizeList = myprizeList.map(v => {
let prize = {
...v,
id: v._id
}
delete v._id
return prize
})
// 若有过期时间,且已过期
if (awardReceiveExpiredTime) {
let currentTime = Date.now()
......
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