feat: 🎸 增加发货状态

v2.0/dist/constants.d.ts

@@ -211,6 +211,11 @@ export declare enum SWICH_TOCK {
     LIMIT = 1,
     NO_LIMIT = 2
 }
+export declare const SHIP_STATUS: {
+    NO_ADDRESS: number;
+    NO_SHIP: number;
+    HAS_SHIP: number;
+};
 export declare enum STAT_TYPE {
     CLICK_INVITE = 1,
     CLICK_FOLLOW_TASK = 2

v2.0/dist/constants.js

 "use strict";
 /** @format */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.STAT_TYPE = exports.SWICH_TOCK = exports.PRIZE_DATA_TYPE = exports.PRIZE_TYPE = exports.TASK_STATUS = exports.TASK_RATE_TYPE = exports.TAOBAO_SUCCESS_ORDER_STATUS = exports.C_APP_NAME = exports.appId = exports.DRAW_STATUS = exports.TBERROR = exports.CODE_TYPES = exports.BusinessError = void 0;
+exports.STAT_TYPE = exports.SHIP_STATUS = exports.SWICH_TOCK = exports.PRIZE_DATA_TYPE = exports.PRIZE_TYPE = exports.TASK_STATUS = exports.TASK_RATE_TYPE = exports.TAOBAO_SUCCESS_ORDER_STATUS = exports.C_APP_NAME = exports.appId = exports.DRAW_STATUS = exports.TBERROR = exports.CODE_TYPES = exports.BusinessError = void 0;
 var sdk_1 = require("./sdk");
 exports.BusinessError = {
     // 更新重试失败(用于并发更新)
@@ -158,6 +158,12 @@ var SWICH_TOCK;
     SWICH_TOCK[SWICH_TOCK["LIMIT"] = 1] = "LIMIT";
     SWICH_TOCK[SWICH_TOCK["NO_LIMIT"] = 2] = "NO_LIMIT";
 })(SWICH_TOCK = exports.SWICH_TOCK || (exports.SWICH_TOCK = {}));
+//物流状态
+exports.SHIP_STATUS = {
+    NO_ADDRESS: 1,
+    NO_SHIP: 2,
+    HAS_SHIP: 3
+};
 // 记录数据
 var STAT_TYPE;
 (function (STAT_TYPE) {

v2.0/dist/constants.js.map

-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"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"}
\ No newline at end of file

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

@@ -32,11 +32,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: {
             type: number;
             name: string;

v2.0/dist/controller/awards.controller.js

@@ -168,14 +168,14 @@ var AwardsController = /** @class */ (function () {
                                 })];
                         }
                         reduceResult = 1;
-                        if (!(prize.type !== constants_1.PRIZE_TYPE.CREDITS)) return [3 /*break*/, 4];
+                        if (!(prize.type !== constants_1.PRIZE_TYPE.CREDITS && prize.type !== constants_1.PRIZE_TYPE.THANKS)) return [3 /*break*/, 4];
                         return [4 /*yield*/, awardSer.reduceStock(prize._id)];
                     case 3:
                         reduceResult = _e.sent();
                         _e.label = 4;
                     case 4:
                         // 扣库存失败
-                        if ((_c = reduceResult) === null || _c === void 0 ? void 0 : _c.code)
+                        if (((_c = reduceResult) === null || _c === void 0 ? void 0 : _c.code) || !reduceResult)
                             return [2 /*return*/, sdk_1.resultsModel.error(reduceResult)];
                         type = prize.type, _id = prize._id, ename = prize.ename, image = prize.image, name = prize.name;
                         userNick = userInfo.userNick;

v2.0/dist/controller/awards.controller.js.map

-{"version":3,"file":"awards.controller.js","sourceRoot":"","sources":["../../src/controller/awards.controller.ts"],"names":[],"mappings":"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"}
+{"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/dist/controller/stat.controller.d.ts

@@ -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>>;
 }

v2.0/dist/index.d.ts

@@ -15,8 +15,8 @@ declare const _default: {
         list: 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 | 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>>;
-    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;

v2.0/dist/service/awards.service.js

@@ -134,7 +134,7 @@ var AwardsService = /** @class */ (function (_super) {
                 switch (_a.label) {
                     case 0:
                         _a.trys.push([0, 2, , 3]);
-                        return [4 /*yield*/, this.awardsdao.insertOne(__assign(__assign({}, award), { createTime: Date.now(), updateTime: Date.now() }))];
+                        return [4 /*yield*/, this.awardsdao.insertOne(__assign(__assign({}, award), { shipStatus: (award === null || award === void 0 ? void 0 : award.type) === constants_1.PRIZE_TYPE.OBJECT ? constants_1.SHIP_STATUS.NO_ADDRESS : '', createTime: Date.now(), updateTime: Date.now() }))];
                     case 1: return [2 /*return*/, _a.sent()];
                     case 2:
                         e_2 = _a.sent();
@@ -285,6 +285,7 @@ var AwardsService = /** @class */ (function (_super) {
                                     receiveName: name,
                                     phone: phone,
                                     drawStatus: constants_1.DRAW_STATUS.SUCCESS,
+                                    shipStatus: constants_1.SHIP_STATUS.NO_SHIP,
                                     province: province,
                                     city: city,
                                     area: area,

v2.0/dist/service/task.service.js

@@ -211,7 +211,7 @@ var TaskService = /** @class */ (function (_super) {
     };
     // 初始化签到任务
     TaskService.prototype.initSignTask = function (userInfo, tasks) {
-        var value = tasks.sign.value;
+        var _a = tasks.sign, value = _a.value, times = _a.times;
         var remainTimes = userInfo.remainTimes;
         var completeList = this.getCompleteTaskByUserTaskInfo('sign', userInfo);
         var todayCompleteTimes = this.getTodayCompleteTask('sign', userInfo).todayCompleteTimes;
@@ -219,12 +219,12 @@ var TaskService = /** @class */ (function (_super) {
             taskType: "sign",
             title: "\u6BCF\u65E5\u7B7E\u5230",
             rewards: value,
-            times: 1,
+            times: times,
             taskRateType: constants_1.TASK_RATE_TYPE.EVERYDAY,
             waitReceive: remainTimes.sign,
             completeTimes: completeList.length,
             todayCompleteTimes: todayCompleteTimes,
-            status: this.setTaskStatus(userInfo, 'sign', constants_1.TASK_RATE_TYPE.EVERYDAY)
+            status: this.setTaskStatus(userInfo, 'sign', constants_1.TASK_RATE_TYPE.EVERYDAY, times)
         };
     };
     // 积分兑换 /固定为每日限制
@@ -400,7 +400,7 @@ var TaskService = /** @class */ (function (_super) {
         var completeTimes = this.getCompleteTaskByUserTaskInfo(taskType, useInfo).length;
         switch (taskRateType) {
             case constants_1.TASK_RATE_TYPE.FOREVER:
-                return completeTimes > 0 ? constants_1.TASK_STATUS.DONE : constants_1.TASK_STATUS.WAIT_DO;
+                return completeTimes > 0 && completeTimes >= limitTimesEveryday ? constants_1.TASK_STATUS.DONE : constants_1.TASK_STATUS.WAIT_DO;
                 break;
             case constants_1.TASK_RATE_TYPE.EVERYDAY:
                 return todayCompleteTimes >= limitTimesEveryday ? constants_1.TASK_STATUS.DONE : constants_1.TASK_STATUS.WAIT_DO;

v2.0/dist/utils/package/vip.js

@@ -4,11 +4,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatVipCbUrl = exports.isUseVipMock = void 0;
 var index_1 = require("../../config/index");
 /** @format */
-// 测试环境 duib2账户mock数据
+// 测试环境 duib2账户mock数据  或者本地
 exports.isUseVipMock = function (context, userNick) {
     var isTestEnv = context.env === 'test';
+    var isMockEnv = context.env === 'mock';
     var isDuibaAccount = userNick.startsWith('duiba2');
-    return isTestEnv && isDuibaAccount;
+    return (isTestEnv && isDuibaAccount) || isMockEnv;
 };
 // 格式化Vip回调地址
 exports.formatVipCbUrl = function (context) {

v2.0/dist/utils/package/vip.js.map

-{"version":3,"file":"vip.js","sourceRoot":"","sources":["../../../src/utils/package/vip.ts"],"names":[],"mappings":";AAAA,cAAc;;;AAEd,4CAA8C;AAC9C,cAAc;AAEd,qBAAqB;AACR,QAAA,YAAY,GAAG,UAAC,OAA0B,EAAE,QAAgB;IACvE,IAAM,SAAS,GAAG,OAAO,CAAC,GAAG,KAAK,MAAM,CAAA;IACxC,IAAM,cAAc,GAAG,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAA;IAEpD,OAAO,SAAS,IAAI,cAAc,CAAA;AACpC,CAAC,CAAA;AAED,aAAa;AACA,QAAA,cAAc,GAAG,UAAC,OAA0B;IACjD,IAAA,KAAgC,OAAO,CAAC,IAAI,EAA1C,UAAU,gBAAA,EAAE,gBAAa,EAAb,QAAQ,mBAAG,EAAE,KAAiB,CAAA;IAC5C,IAAA,cAAc,GAAK,iBAAS,CAAC,OAAO,CAAC,eAAvB,CAAuB;IAE3C,SAAS;IACT,IAAI,KAAK,GAAG,gBAAc,UAAU,kBAAa,QAAU,CAAA;IAC3D,IAAI,WAAW,GAAc,cAAc,eAAU,kBAAkB,CAAC,KAAK,CAAG,CAAA;IAChF,OAAO,WAAW,CAAA;AACpB,CAAC,CAAA"}
+{"version":3,"file":"vip.js","sourceRoot":"","sources":["../../../src/utils/package/vip.ts"],"names":[],"mappings":";AAAA,cAAc;;;AAEd,4CAA8C;AAC9C,cAAc;AAEd,2BAA2B;AACd,QAAA,YAAY,GAAG,UAAC,OAA0B,EAAE,QAAgB;IACvE,IAAM,SAAS,GAAG,OAAO,CAAC,GAAG,KAAK,MAAM,CAAA;IACxC,IAAM,SAAS,GAAG,OAAO,CAAC,GAAG,KAAK,MAAM,CAAA;IACxC,IAAM,cAAc,GAAG,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAA;IAEpD,OAAO,CAAC,SAAS,IAAI,cAAc,CAAC,IAAI,SAAS,CAAA;AACnD,CAAC,CAAA;AAED,aAAa;AACA,QAAA,cAAc,GAAG,UAAC,OAA0B;IACjD,IAAA,KAAgC,OAAO,CAAC,IAAI,EAA1C,UAAU,gBAAA,EAAE,gBAAa,EAAb,QAAQ,mBAAG,EAAE,KAAiB,CAAA;IAC5C,IAAA,cAAc,GAAK,iBAAS,CAAC,OAAO,CAAC,eAAvB,CAAuB;IAE3C,SAAS;IACT,IAAI,KAAK,GAAG,gBAAc,UAAU,kBAAa,QAAU,CAAA;IAC3D,IAAI,WAAW,GAAc,cAAc,eAAU,kBAAkB,CAAC,KAAK,CAAG,CAAA;IAChF,OAAO,WAAW,CAAA;AACpB,CAAC,CAAA"}
\ No newline at end of file

v2.0/src/constants.ts

@@ -180,6 +180,13 @@ export enum SWICH_TOCK {
   NO_LIMIT = 2
 }
 
+//物流状态
+export const SHIP_STATUS = {
+  NO_ADDRESS: 1,
+  NO_SHIP: 2,
+  HAS_SHIP: 3
+}
+
 // 记录数据
 export enum STAT_TYPE {
   CLICK_INVITE = 1,

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

@@ -6,7 +6,15 @@
 
 import { BaseDao } from '../sdk'
 import UserService from './user.service'
-import { CODE_TYPES, DRAW_STATUS, PRIZE_TYPE, ACTIVITY_STATUS, DELETE_STATUS, SWICH_TOCK } from '../constants'
+import {
+  CODE_TYPES,
+  DRAW_STATUS,
+  PRIZE_TYPE,
+  ACTIVITY_STATUS,
+  DELETE_STATUS,
+  SWICH_TOCK,
+  SHIP_STATUS
+} from '../constants'
 import { AWARDS_DB_NAME, PRIZE_CONFIG_DB_NAME } from '../db'
 import { sendTBAward, getSellerSession, rand, signFigures } from '../utils'
 import { CodeType } from 'taobao-mini-sdk/lib/utils/codetypes'
@@ -62,6 +70,7 @@ export default class AwardsService extends UserService {
     try {
       return await this.awardsdao.insertOne({
         ...award,
+        shipStatus: award?.type === PRIZE_TYPE.OBJECT ? SHIP_STATUS.NO_ADDRESS : '',
         createTime: Date.now(),
         updateTime: Date.now()
       })
@@ -207,6 +216,7 @@ export default class AwardsService extends UserService {
             receiveName: name,
             phone,
             drawStatus: DRAW_STATUS.SUCCESS,
+            shipStatus: SHIP_STATUS.NO_SHIP,
             province,
             city,
             area,