fix: 类型

v2.0/dist/decorator/check.js

@@ -148,10 +148,11 @@ exports.activityTimeCheck = function (target, name, descriptor) {
                         if (!activityId)
                             return [2 /*return*/, sdk_1.resultsModel.error(constants_1.CODE_TYPES.PARAMS_ERROR, "\u7F3A\u5C11\u6D3B\u52A8id")];
                         baseService = new service_1.BaseService(context);
-                        return [4 /*yield*/, baseService.getBaseInfo(activityId)];
+                        return [4 /*yield*/, baseService.getBaseInfo(activityId)
+                            // 活动不存在
+                        ];
                     case 1:
                         activityInfo = _b.sent();
-                        console.log(activityInfo, 'activityInfo');
                         // 活动不存在
                         if (!activityInfo) {
                             return [2 /*return*/, sdk_1.resultsModel.error(constants_1.CODE_TYPES.ERROR_NO_ACTIVITY)];

v2.0/dist/decorator/check.js.map

-{"version":3,"file":"check.js","sourceRoot":"","sources":["../../src/decorator/check.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"check.js","sourceRoot":"","sources":["../../src/decorator/check.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,cAAc;AACd,8BAAqC;AACrC,0CAAyC;AACzC,sCAAqD;AACrD,kCAA2C;AAE9B,QAAA,WAAW,GAAG,UAAC,MAAgB;IAC1C,OAAO,UAAU,MAAc,EAAE,IAAY,EAAE,UAA8B;QAC3E,IAAM,MAAM,GAAG,UAAU,CAAC,KAAK,CAAA;QAE/B,UAAU,CAAC,KAAK,GAAG;YAAU,cAAc;iBAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;gBAAd,yBAAc;;YAClC,IAAA,OAAO,GAAoB,IAAI,GAAxB,EAAE,KAAkB,IAAI,GAAR,EAAd,SAAS,mBAAG,EAAE,KAAA,CAAQ;YACtC,IAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;YAC1C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBACtC,IAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;gBACvB,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC;oBAAE,OAAO,kBAAY,CAAC,KAAK,CAAC,sBAAU,CAAC,YAAY,EAAE,iBAAK,KAAK,iBAAI,CAAC,CAAA;aAClG;YACD,OAAO,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,OAAO,eAAO,SAAS,EAAG,CAAC,CAAA;QAC1D,CAAC,CAAA;IACH,CAAC,CAAA;AACH,CAAC,CAAA;AAEY,QAAA,SAAS,GAAG,UAAC,EAAoB;QAAlB,iBAAgB,EAAhB,SAAS,mBAAG,IAAI,KAAA;IAC1C,OAAO,UAAU,MAAW,EAAE,IAAY,EAAE,UAA8B;QACxE,IAAM,MAAM,GAAG,UAAU,CAAC,KAAK,CAAA;QAC/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;4BAEhC,WAAW,GAAG,IAAI,qBAAW,CAAC,OAAO,CAAC,CAAA;4BAE3B,qBAAM,WAAW,CAAC,WAAW,EAAE,EAAA;;4BAA1C,QAAQ,GAAG,SAA+B;4BAEhD,IAAI,CAAC,QAAQ,IAAI,SAAS;gCAAE,sBAAO,kBAAY,CAAC,KAAK,CAAC,sBAAU,CAAC,aAAa,CAAC,EAAA;4BAE/E,sBAAO,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,OAAO,wBAAO,SAAS,KAAE,QAAQ,UAAA,IAAG,CAAC,EAAA;;;;SACnE,CAAA;IACH,CAAC,CAAA;AACH,CAAC,CAAA;AAEY,QAAA,QAAQ,GAAG,UAAC,EAAsC;QAApC,iBAAgB,EAAhB,SAAS,mBAAG,IAAI,KAAA,EAAE,mBAAgB,EAAhB,WAAW,mBAAG,EAAE,KAAA;IAC3D,OAAO,UAAU,MAAW,EAAE,IAAY,EAAE,UAA8B;QACxE,IAAM,MAAM,GAAG,UAAU,CAAC,KAAK,CAAA;QAC/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;4BAEhC,WAAW,GAAG,IAAI,qBAAW,CAAC,OAAO,CAAC,CAAA;4BACxB,qBAAM,wBAAgB,CAAC,OAAO,CAAC,EAAA;;4BAA3C,OAAO,GAAK,CAAA,SAA+B,CAAA,QAApC;4BACC,qBAAM,WAAW,CAAC,UAAU,CAAC,OAAO,EAAE,WAAW,CAAC,EAAA;;4BAA5D,OAAO,GAAG,SAAkD;4BAClE,IAAI,CAAC,OAAO,CAAC,KAAK,IAAI,SAAS;gCAAE,sBAAO,kBAAY,CAAC,KAAK,CAAC,sBAAU,CAAC,YAAY,EAAE,OAAO,EAAE,OAAO,CAAC,EAAA;4BAErG,sBAAO,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,OAAO,wBAAO,SAAS,KAAE,OAAO,SAAA,EAAE,OAAO,SAAA,IAAG,CAAC,EAAA;;;;SAC3E,CAAA;IACH,CAAC,CAAA;AACH,CAAC,CAAA;AAEY,QAAA,iBAAiB,GAAG,UAAC,MAAW,EAAE,IAAY,EAAE,UAA8B;IACzF,IAAM,MAAM,GAAG,UAAU,CAAC,KAAK,CAAA;IAC/B,UAAU,CAAC,KAAK,GAAG;QAAgB,cAAc;aAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;YAAd,yBAAc;;;;;;;wBACxC,OAAO,GAAoB,IAAI,GAAxB,EAAE,KAAkB,IAAI,GAAR,EAAd,SAAS,mBAAG,EAAE,KAAA,CAAQ;wBAC9B,UAAU,GAAK,OAAO,CAAC,IAAI,WAAjB,CAAiB;wBACnC,IAAI,CAAC,UAAU;4BAAE,sBAAO,kBAAY,CAAC,KAAK,CAAC,sBAAU,CAAC,YAAY,EAAE,4BAAQ,CAAC,EAAA;wBACvE,WAAW,GAAG,IAAI,qBAAW,CAAC,OAAO,CAAC,CAAA;wBAGvB,qBAAM,WAAW,CAAC,WAAW,CAAC,UAAU,CAAC;4BAC9D,QAAQ;0BADsD;;wBAAxD,YAAY,GAAG,SAAyC;wBAC9D,QAAQ;wBACR,IAAI,CAAC,YAAY,EAAE;4BACjB,sBAAO,kBAAY,CAAC,KAAK,CAAC,sBAAU,CAAC,iBAAiB,CAAC,EAAA;yBACxD;wBACO,SAAS,GAAc,YAAY,UAA1B,EAAE,OAAO,GAAK,YAAY,QAAjB,CAAiB;wBACrC,WAAW,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;wBAC9B,IAAI,WAAW,GAAG,SAAS,EAAE;4BAC3B,sBAAO,kBAAY,CAAC,KAAK,CAAC,sBAAU,CAAC,sBAAsB,EAAE,gCAAO,CAAC,EAAA;yBACtE;wBACD,IAAI,WAAW,GAAG,OAAO,EAAE;4BACzB,sBAAO,kBAAY,CAAC,KAAK,CAAC,sBAAU,CAAC,mBAAmB,EAAE,gCAAO,CAAC,EAAA;yBACnE;wBACD,sBAAO,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,OAAO,wBAAO,SAAS,KAAE,YAAY,cAAA,IAAG,CAAC,EAAA;;;;KACvE,CAAA;AACH,CAAC,CAAA"}
\ No newline at end of file

v2.0/dist/service/awards.service.d.ts

@@ -27,16 +27,16 @@ export default class AwardsService extends UserService {
         openId: any;
         activityId: any;
     }): Promise<any>;
-    recieveObjectPrize(_id: any, { activityId, province, city, area, addressdetail, name, phone }: {
-        activityId: any;
-        province: any;
-        city: any;
-        area: any;
-        addressdetail: any;
-        name: any;
-        phone: any;
+    recieveObjectPrize(_id: string, { activityId, province, city, area, addressdetail, name, phone }: {
+        activityId: string;
+        province: string;
+        city: string;
+        area: string;
+        addressdetail: string;
+        name: string;
+        phone: string | number;
     }): Promise<true | import("taobao-mini-sdk/lib/utils/codetypes").CodeType>;
-    recieveEnamePrize(_id: any, activityId: any): Promise<{}>;
+    recieveEnamePrize(_id: any, activityId: string): Promise<{}>;
     /**
      * 获取活动配置项奖品
      * @param {*} _id

v2.0/src/decorator/check.ts

@@ -63,7 +63,6 @@ export const activityTimeCheck = (target: any, name: string, descriptor: Propert
 
     // 活动基本情况
     const activityInfo = await baseService.getBaseInfo(activityId)
-    console.log(activityInfo, 'activityInfo')
     // 活动不存在
     if (!activityInfo) {
       return resultsModel.error(CODE_TYPES.ERROR_NO_ACTIVITY)

v2.0/src/service/awards.service.ts

@@ -8,7 +8,7 @@ import { BaseDao } from '../sdk'
 import UserService from './user.service'
 import { CODE_TYPES, DRAW_STATUS, PRIZE_TYPE, ACTIVITY_STATUS } from '../constants'
 import { AWARDS_DB_NAME, PRIZE_CONFIG_DB_NAME } from '../db'
-import { sendTBAward, getSellerSession, rand, signFigures } from '../utils'
+import { sendTBAward, getSellerSession } from '../utils'
 
 export default class AwardsService extends UserService {
   awardsdao: IBaseDao
@@ -114,7 +114,7 @@ export default class AwardsService extends UserService {
     // 若有过期时间，且已过期
     if (awardReceiveExpiredTime) {
       let currentTime = Date.now()
-      myprizeList.map(v => {
+      myprizeList.map((v: { drawStatus: number; remark: string; expiredTime: any }) => {
         if (currentTime > awardReceiveExpiredTime) {
           if ([DRAW_STATUS.WAITAWARD, DRAW_STATUS.RETRY].includes(v.drawStatus)) {
             v.drawStatus = DRAW_STATUS.EXPIRED
@@ -128,7 +128,26 @@ export default class AwardsService extends UserService {
   }
 
   // 领取实物
-  async recieveObjectPrize(_id, { activityId, province, city, area, addressdetail, name, phone }) {
+  async recieveObjectPrize(
+    _id: string,
+    {
+      activityId,
+      province,
+      city,
+      area,
+      addressdetail,
+      name,
+      phone
+    }: {
+      activityId: string
+      province: string
+      city: string
+      area: string
+      addressdetail: string
+      name: string
+      phone: string | number
+    }
+  ) {
     // 若有过期时间，且已过期
     let { awardReceiveExpiredTime } = await this.getBaseInfo(activityId)
     if (awardReceiveExpiredTime && Date.now() > awardReceiveExpiredTime) {
@@ -173,7 +192,7 @@ export default class AwardsService extends UserService {
   }
 
   // 发放淘宝权益（奖品数据已插入到awards_info表，且状态drawStatus 为1或者6）
-  async recieveEnamePrize(_id, activityId) {
+  async recieveEnamePrize(_id: any, activityId: string) {
     // 若有过期时间，且已过期
     let { awardReceiveExpiredTime } = await this.getBaseInfo(activityId)
     if (awardReceiveExpiredTime && Date.now() > awardReceiveExpiredTime) {