feat: 🎸 更新模板

server/duibats/dist/constants.d.ts

@@ -260,3 +260,8 @@ export declare const TEMPLATE_INFO: {
     template_id: number;
     template_version: string;
 };
+export declare const SHIP_STATUS: {
+    NO_ADDRESS: number;
+    NO_SHIP: number;
+    HAS_SHIP: number;
+};

server/duibats/dist/constants.js

 "use strict";
 /** @format */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TEMPLATE_INFO = exports.APP_SUB_CODE = exports.PASS_URL_LIST = exports.TASK_CHECK_TYPE = exports.TASK_TYPE_TEXT = exports.DELETE_STATUS = exports._48_HOURS = exports.EIGHT_HOURS = exports.GOODSINFO = exports.B_APP_NAME = exports.errorCode = exports.CODE_TYPES = exports.PRIZE_TYPE = exports.LOGGER_TYPE = exports.DRAW_STATUS = exports.OPEN_PRIZE_STATUS = exports.BusinessError = void 0;
+exports.SHIP_STATUS = exports.TEMPLATE_INFO = exports.APP_SUB_CODE = exports.PASS_URL_LIST = exports.TASK_CHECK_TYPE = exports.TASK_TYPE_TEXT = exports.DELETE_STATUS = exports._48_HOURS = exports.EIGHT_HOURS = exports.GOODSINFO = exports.B_APP_NAME = exports.errorCode = exports.CODE_TYPES = exports.PRIZE_TYPE = exports.LOGGER_TYPE = exports.DRAW_STATUS = exports.OPEN_PRIZE_STATUS = exports.BusinessError = void 0;
 var sdk_1 = require("./sdk");
 exports.BusinessError = {
     // 更新重试失败(用于并发更新)
@@ -257,4 +257,10 @@ exports.TEMPLATE_INFO = {
     template_id: 3000000002590532,
     template_version: '0.0.3'
 };
+//物流状态
+exports.SHIP_STATUS = {
+    NO_ADDRESS: 1,
+    NO_SHIP: 2,
+    HAS_SHIP: 3
+};
 //# sourceMappingURL=constants.js.map
\ No newline at end of file

server/duibats/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":";AAAA,cAAc;;;AAEd,6BAA0C;AAE7B,QAAA,aAAa,GAAG;IAC3B,iBAAiB;IACjB,kBAAkB,EAAE;QAClB,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE,0BAAM;KACnB;IACD,QAAQ;IACR,iBAAiB,EAAE;QACjB,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE,gCAAO;KACpB;IACD,QAAQ;IACR,sBAAsB,EAAE;QACtB,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE,gCAAO;KACpB;IACD,QAAQ;IACR,mBAAmB,EAAE;QACnB,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE,gCAAO;KACpB;IACD,QAAQ;IACR,aAAa,EAAE;QACb,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE,gCAAO;KACpB;IACD,cAAc;IACd,uBAAuB,EAAE;QACvB,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE,aAAa;KAC1B;IACD,QAAQ;IACR,YAAY,EAAE;QACZ,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE,OAAO;KACpB;IACD,UAAU;IACV,yBAAyB,EAAE;QACzB,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE,4CAAS;KACtB;IACD,QAAQ;IACR,mBAAmB,EAAE;QACnB,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE,gCAAO;KACpB;IACD,UAAU;IACV,oBAAoB,EAAE;QACpB,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE,4CAAS;KACtB;IACD,uBAAuB,EAAE;QACvB,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE,gCAAO;KACpB;IACD,gBAAgB,EAAE;QAChB,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE,0BAAM;KACnB;IACD,gBAAgB,EAAE;QAChB,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE,oEAAa;KAC1B;IACD,mBAAmB,EAAE;QACnB,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE,0BAAM;KACnB;IACD,mBAAmB,EAAE;QACnB,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE,gCAAO;KACpB;IACD,gBAAgB,EAAE;QAChB,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE,0BAAM;KACnB;IACD,cAAc,EAAE;QACd,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE,gCAAO;KACpB;IACD,cAAc,EAAE;QACd,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE,0BAAM;KACnB;IACD,mBAAmB,EAAE;QACnB,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE,wDAAW;KACxB;CACF,CAAA;AACD,UAAU;AACG,QAAA,iBAAiB,GAAG;IAC/B,MAAM;IACN,UAAU,EAAE,CAAC;IACb,MAAM;IACN,UAAU,EAAE,CAAC;IACb,OAAO;IACP,OAAO,EAAE,CAAC;IACV,OAAO;IACP,IAAI,EAAE,CAAC;CACR,CAAA;AAED,SAAS;AACI,QAAA,WAAW,GAAG;IACzB,MAAM;IACN,SAAS,EAAE,CAAC;IACZ,MAAM;IACN,UAAU,EAAE,CAAC;IACb,OAAO;IACP,OAAO,EAAE,CAAC;IACV,OAAO;IACP,IAAI,EAAE,CAAC;IACP,MAAM;IACN,OAAO,EAAE,CAAC;IACV,OAAO;IACP,KAAK,EAAE,CAAC;CACT,CAAA;AAED,mBAAmB;AACN,QAAA,WAAW,GAAG;IACzB,KAAK,EAAE,CAAC;IACR,IAAI,EAAE,CAAC;CACR,CAAA;AAEY,QAAA,UAAU,GAAG;IACxB,MAAM,EAAE,CAAC;IACT,OAAO,EAAE,CAAC;IACV,MAAM,EAAE,CAAC;IACT,KAAK,EAAE,CAAC;CACT,CAAA;AAEY,QAAA,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,wBAAkB,EAAE,qBAAa,CAAC,CAAA;AAEjE,QAAA,SAAS,GAAG;IACvB,QAAQ,EAAE,IAAI;IACd,QAAQ,EAAE,SAAS;IACnB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,eAAe;IACzB,QAAQ,EAAE,gBAAgB;IAC1B,QAAQ,EAAE,YAAY;IACtB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,eAAe;IACzB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,SAAS;IACnB,QAAQ,EAAE,iBAAiB;IAC3B,QAAQ,EAAE,cAAc;IACxB,QAAQ,EAAE,YAAY;IACtB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,QAAQ;IAClB,QAAQ,EAAE,WAAW;IACrB,QAAQ,EAAE,SAAS;IACnB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,YAAY;IACtB,QAAQ,EAAE,aAAa;IACvB,QAAQ,EAAE,eAAe;IACzB,QAAQ,EAAE,SAAS;CACpB,CAAA;AACD,cAAc;AACD,QAAA,UAAU,GAAW,8BAA8B,CAAA;AAEnD,QAAA,SAAS,GACpB,0NAA0N,CAAA;AAE/M,QAAA,WAAW,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,IAAI,CAAA;AAEhC,QAAA,SAAS,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAA;AAE/B,QAAA,aAAa,GAAG;IAC3B,KAAK,EAAE,CAAC;IACR,MAAM,EAAE,CAAC;CACV,CAAA;AAEY,QAAA,cAAc,GAAG;IAC5B,MAAM,EAAE,MAAM;IACd,MAAM,EAAE,MAAM;IACd,IAAI,EAAE,IAAI;IACV,eAAe,EAAE,MAAM;IACvB,OAAO,EAAE,MAAM;IACf,UAAU,EAAE,MAAM;IAClB,WAAW,EAAE,MAAM;IACnB,QAAQ,EAAE,MAAM;IAChB,YAAY,EAAE,MAAM;CACrB,CAAA;AAEY,QAAA,eAAe,GAAG;IAC7B,KAAK,EAAE;QACL,IAAI,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,iBAAiB,EAAE,SAAS,EAAE,YAAY,EAAE,UAAU,EAAE,cAAc,CAAC;QAC1G,GAAG,EAAE,QAAQ;QACb,OAAO,EAAE,QAAQ;KAClB;IACD,KAAK,EAAE;QACL,IAAI,EAAE,CAAC,iBAAiB,EAAE,SAAS,EAAE,YAAY,EAAE,aAAa,EAAE,UAAU,EAAE,cAAc,CAAC;KAC9F;IACD,KAAK,EAAE;QACL,IAAI,EAAE,CAAC,SAAS,EAAE,YAAY,EAAE,aAAa,EAAE,UAAU,EAAE,cAAc,CAAC;KAC3E;IACD,OAAO,EAAE;QACP,IAAI,EAAE,CAAC,YAAY,EAAE,aAAa,EAAE,cAAc,CAAC;KACpD;IACD,YAAY,EAAE;QACZ,IAAI,EAAE,CAAC,SAAS,EAAE,YAAY,EAAE,aAAa,EAAE,cAAc,CAAC;KAC/D;IACD,IAAI,EAAE,EAAE,IAAI,EAAE,CAAC,UAAU,CAAC,EAAE;CAC7B,CAAA;AAEY,QAAA,aAAa,GAAa;IACrC,SAAS;IACT,UAAU;IACV,YAAY;IACZ,aAAa;IACb,gBAAgB;IAChB,YAAY;IACZ,aAAa;IACb,eAAe;IACf,YAAY;IACZ,YAAY;IACZ,aAAa;IACb,YAAY;IACZ,aAAa;IACb,YAAY;IACZ,YAAY;IACZ,WAAW;IACX,YAAY;IACZ,WAAW;IACX,YAAY;IACZ,YAAY;IACZ,OAAO;IACP,WAAW;IACX,WAAW;IACX,cAAc;IACd,eAAe;IACf,UAAU;IACV,cAAc;IACd,cAAc;IACd,cAAc;IACd,aAAa;IACb,cAAc;IACd,gBAAgB;IAChB,gBAAgB;IAChB,cAAc;IACd,gBAAgB;IAChB,WAAW;IACX,OAAO;IACP,WAAW;IACX,gBAAgB;IAChB,mBAAmB;IACnB,WAAW;IACX,aAAa;IACb,aAAa;IACb,iBAAiB;IACjB,WAAW;IACX,WAAW;IACX,gBAAgB;IAChB,YAAY;IACZ,YAAY;IACZ,WAAW;CACZ,CAAA;AAED,gBAAgB;AACH,QAAA,YAAY,GAAW,qBAAqB,CAAA;AAE5C,QAAA,aAAa,GAAG;IAC3B,OAAO,EAAE,cAAc;IACvB,WAAW,EAAE,gBAAgB;IAC7B,gBAAgB,EAAE,OAAO;CAC1B,CAAA;AAED,MAAM;AACO,QAAA,WAAW,GAAG;IACzB,UAAU,EAAE,CAAC;IACb,OAAO,EAAE,CAAC;IACV,QAAQ,EAAE,CAAC;CACZ,CAAA"}
\ No newline at end of file

server/duibats/dist/controller/activity.controller.js

@@ -79,7 +79,7 @@ var ActivityController = /** @class */ (function () {
                     case 1:
                         result = _c.sent();
                         if (result) {
-                            result = result.list.map(function (item) {
+                            result.list = result.list.map(function (item) {
                                 return __assign(__assign({}, item), { activityId: item._id });
                             });
                             return [2 /*return*/, sdk_1.resultsModel.success(result)];

server/duibats/dist/controller/activity.controller.js.map

-{"version":3,"file":"activity.controller.js","sourceRoot":"","sources":["../../src/controller/activity.controller.ts"],"names":[],"mappings":";AAAA,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEd,4CAA2C;AAC3C,0CAAoD;AACpD,8BAAqC;AACrC,sCAAkD;AAElD;IAAA;IA6DA,CAAC;IA5DC;;OAEG;IAEG,4CAAe,GAArB,UAAsB,OAAgB,EAAE,EAAE,EAAE,EAAgD;YAA/C,qBAAqB,QAAA;;;;;;wBACxD,MAAM,GAAK,OAAO,OAAZ,CAAY;wBAEb,qBAAM,qBAAqB,CAAC,uBAAuB,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,EAAA;;wBAAlF,MAAM,GAAG,SAAyE;wBACtF,IAAI,MAAM,EAAE;4BACV,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,UAAC,IAAqB;gCAC7C,6BACK,IAAI,KACP,UAAU,EAAE,IAAI,CAAC,GAAG,IACrB;4BACH,CAAC,CAAC,CAAA;4BACF,sBAAO,kBAAY,CAAC,OAAO,CAAC,MAAM,CAAC,EAAA;yBACpC;wBACD,sBAAO,kBAAY,CAAC,KAAK,CAAC,sBAAU,CAAC,YAAY,EAAE,UAAU,CAAC,EAAA;;;;KAC/D;IAED;;OAEG;IAGG,8CAAiB,GAAvB,UAAwB,OAAgB,EAAE,EAAE,EAAE,EAAgD;YAA/C,qBAAqB,QAAA;;;;;;wBAC1D,UAAU,GAAK,OAAO,CAAC,IAAI,WAAjB,CAAiB;wBAEtB,qBAAM,qBAAqB,CAAC,2BAA2B,CAAC,UAAU,CAAC,EAAA;;wBAA5E,MAAM,GAAG,SAAmE;wBAChF,IAAI,CAAC,MAAM;4BAAE,sBAAO,kBAAY,CAAC,KAAK,CAAC,sBAAU,CAAC,YAAY,EAAE,SAAS,CAAC,EAAA;wBAEpE,KAA8B,MAAM,IAAI,EAAE,EAAxC,WAAW,iBAAA,EAAE,UAAU,gBAAA,CAAiB;wBAG1C,MAAM,GAAG,qBAAqB,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAA;wBAE/D,YAAY,uBACd,UAAU,YAAA,IACP,UAAU,GACV,MAAM,CACV,CAAA;wBACD,sBAAO,kBAAY,CAAC,OAAO,CAAC,YAAY,CAAC,EAAA;;;;KAC1C;IAED;;OAEG;IAGG,wCAAW,GAAjB,UAAkB,OAAgB,EAAE,EAAE,EAAE,EAAgD;YAA/C,qBAAqB,QAAA;;;;;;wBACpD,UAAU,GAAK,OAAO,CAAC,IAAI,WAAjB,CAAiB;wBAEtB,qBAAM,qBAAqB,CAAC,0BAA0B,CAAC,UAAU,CAAC,EAAA;;wBAA3E,MAAM,GAAG,SAAkE;wBACzE,aAAa,GAAY,MAAM,KAAK,CAAC,IAAI,MAAM,CAAA;wBACrD,IAAI,aAAa,EAAE;4BACjB,sBAAO,kBAAY,CAAC,OAAO,CAAC,IAAI,CAAC,EAAA;yBAClC;6BAAM;4BACL,sBAAO,kBAAY,CAAC,KAAK,CAAC,sBAAU,CAAC,YAAY,EAAE,QAAQ,CAAC,EAAA;yBAC7D;;;;;KACF;IAvDD;QADC,oBAAQ,CAAC,CAAC,+BAAqB,CAAC,CAAC;;;;6DAejC;IAOD;QAFC,uBAAW,CAAC,CAAC,YAAY,CAAC,CAAC;QAC3B,oBAAQ,CAAC,CAAC,+BAAqB,CAAC,CAAC;;;;+DAkBjC;IAOD;QAFC,uBAAW,CAAC,CAAC,YAAY,CAAC,CAAC;QAC3B,oBAAQ,CAAC,CAAC,+BAAqB,CAAC,CAAC;;;;yDAWjC;IACH,yBAAC;CAAA,AA7DD,IA6DC;kBA7DoB,kBAAkB"}
+{"version":3,"file":"activity.controller.js","sourceRoot":"","sources":["../../src/controller/activity.controller.ts"],"names":[],"mappings":";AAAA,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEd,4CAA2C;AAC3C,0CAAoD;AACpD,8BAAqC;AACrC,sCAAkD;AAElD;IAAA;IA6DA,CAAC;IA5DC;;OAEG;IAEG,4CAAe,GAArB,UAAsB,OAAgB,EAAE,EAAE,EAAE,EAAgD;YAA/C,qBAAqB,QAAA;;;;;;wBACxD,MAAM,GAAK,OAAO,OAAZ,CAAY;wBAEb,qBAAM,qBAAqB,CAAC,uBAAuB,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,EAAA;;wBAAlF,MAAM,GAAG,SAAyE;wBACtF,IAAI,MAAM,EAAE;4BACV,MAAM,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,UAAC,IAAqB;gCAClD,6BACK,IAAI,KACP,UAAU,EAAE,IAAI,CAAC,GAAG,IACrB;4BACH,CAAC,CAAC,CAAA;4BACF,sBAAO,kBAAY,CAAC,OAAO,CAAC,MAAM,CAAC,EAAA;yBACpC;wBACD,sBAAO,kBAAY,CAAC,KAAK,CAAC,sBAAU,CAAC,YAAY,EAAE,UAAU,CAAC,EAAA;;;;KAC/D;IAED;;OAEG;IAGG,8CAAiB,GAAvB,UAAwB,OAAgB,EAAE,EAAE,EAAE,EAAgD;YAA/C,qBAAqB,QAAA;;;;;;wBAC1D,UAAU,GAAK,OAAO,CAAC,IAAI,WAAjB,CAAiB;wBAEtB,qBAAM,qBAAqB,CAAC,2BAA2B,CAAC,UAAU,CAAC,EAAA;;wBAA5E,MAAM,GAAG,SAAmE;wBAChF,IAAI,CAAC,MAAM;4BAAE,sBAAO,kBAAY,CAAC,KAAK,CAAC,sBAAU,CAAC,YAAY,EAAE,SAAS,CAAC,EAAA;wBAEpE,KAA8B,MAAM,IAAI,EAAE,EAAxC,WAAW,iBAAA,EAAE,UAAU,gBAAA,CAAiB;wBAG1C,MAAM,GAAG,qBAAqB,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAA;wBAE/D,YAAY,uBACd,UAAU,YAAA,IACP,UAAU,GACV,MAAM,CACV,CAAA;wBACD,sBAAO,kBAAY,CAAC,OAAO,CAAC,YAAY,CAAC,EAAA;;;;KAC1C;IAED;;OAEG;IAGG,wCAAW,GAAjB,UAAkB,OAAgB,EAAE,EAAE,EAAE,EAAgD;YAA/C,qBAAqB,QAAA;;;;;;wBACpD,UAAU,GAAK,OAAO,CAAC,IAAI,WAAjB,CAAiB;wBAEtB,qBAAM,qBAAqB,CAAC,0BAA0B,CAAC,UAAU,CAAC,EAAA;;wBAA3E,MAAM,GAAG,SAAkE;wBACzE,aAAa,GAAY,MAAM,KAAK,CAAC,IAAI,MAAM,CAAA;wBACrD,IAAI,aAAa,EAAE;4BACjB,sBAAO,kBAAY,CAAC,OAAO,CAAC,IAAI,CAAC,EAAA;yBAClC;6BAAM;4BACL,sBAAO,kBAAY,CAAC,KAAK,CAAC,sBAAU,CAAC,YAAY,EAAE,QAAQ,CAAC,EAAA;yBAC7D;;;;;KACF;IAvDD;QADC,oBAAQ,CAAC,CAAC,+BAAqB,CAAC,CAAC;;;;6DAejC;IAOD;QAFC,uBAAW,CAAC,CAAC,YAAY,CAAC,CAAC;QAC3B,oBAAQ,CAAC,CAAC,+BAAqB,CAAC,CAAC;;;;+DAkBjC;IAOD;QAFC,uBAAW,CAAC,CAAC,YAAY,CAAC,CAAC;QAC3B,oBAAQ,CAAC,CAAC,+BAAqB,CAAC,CAAC;;;;yDAWjC;IACH,yBAAC;CAAA,AA7DD,IA6DC;kBA7DoB,kBAAkB"}
\ No newline at end of file

server/duibats/dist/controller/awards.controller.d.ts

@@ -13,4 +13,13 @@ export default class BaseController {
     exportAwardsList(context: Context, { session }: {
         session: any;
     }, [awardsService]: [AwardsService]): Promise<import("taobao-mini-sdk/lib/utils/resultmodel").Result>;
+    exportAwardsInfoBySearch(context: Context, { session }: {
+        session: any;
+    }, [awardsService]: [AwardsService]): Promise<import("taobao-mini-sdk/lib/utils/resultmodel").Result>;
+    findWinnerInfoListBySearch(context: Context, { session }: {
+        session: any;
+    }, [awardsService]: [AwardsService]): Promise<import("taobao-mini-sdk/lib/utils/resultmodel").Result>;
+    downloadFile(context: Context, { session }: {
+        session: any;
+    }, [awardsService]: [AwardsService]): Promise<import("taobao-mini-sdk/lib/utils/resultmodel").Result>;
 }

server/duibats/dist/index.d.ts

@@ -11,6 +11,15 @@ declare const _default: {
     exportAwardsList: (context: Context, { session }: {
         session: any;
     }, [awardsService]: [import("./service").AwardsService]) => Promise<import("taobao-mini-sdk/lib/utils/resultmodel").Result>;
+    findWinnerInfoListBySearch: (context: Context, { session }: {
+        session: any;
+    }, [awardsService]: [import("./service").AwardsService]) => Promise<import("taobao-mini-sdk/lib/utils/resultmodel").Result>;
+    downloadFile: (context: Context, { session }: {
+        session: any;
+    }, [awardsService]: [import("./service").AwardsService]) => Promise<import("taobao-mini-sdk/lib/utils/resultmodel").Result>;
+    exportAwardsInfoBySearch: (context: Context, { session }: {
+        session: any;
+    }, [awardsService]: [import("./service").AwardsService]) => Promise<import("taobao-mini-sdk/lib/utils/resultmodel").Result>;
     findItemListByStatus: (context: Context, { session }: {
         session: any;
     }, [taobaoTopService]: [import("./service").TaobaoTopService]) => Promise<import("taobao-mini-sdk/lib/utils/resultmodel").Result>;

server/duibats/dist/index.js

@@ -9,7 +9,7 @@ var taobaoItem_controller_1 = require("./controller/taobaoItem.controller");
 var save_controller_1 = require("./controller/save.controller");
 var _a = new activity_controller_1.default(), getActivityList = _a.getActivityList, getActivityDetail = _a.getActivityDetail, delActivity = _a.delActivity;
 var _b = new seller_controller_1.default(), sellerSaasSave = _b.sellerSaasSave, sellerSave = _b.sellerSave;
-var _c = new awards_controller_1.default(), findWinnerInfoList = _c.findWinnerInfoList, exportAwardsList = _c.exportAwardsList;
+var _c = new awards_controller_1.default(), findWinnerInfoList = _c.findWinnerInfoList, exportAwardsList = _c.exportAwardsList, findWinnerInfoListBySearch = _c.findWinnerInfoListBySearch, downloadFile = _c.downloadFile, exportAwardsInfoBySearch = _c.exportAwardsInfoBySearch;
 var generateRule = new rule_controller_1.default().generateRule;
 var _d = new taobaoItem_controller_1.default(), findItemListByStatus = _d.findItemListByStatus, findItemListByIds = _d.findItemListByIds, queryBenefitByEname = _d.queryBenefitByEname;
 var saveActivityInfo = new save_controller_1.default().saveActivityInfo;
@@ -21,6 +21,9 @@ exports.default = {
     sellerSave: sellerSave,
     findWinnerInfoList: findWinnerInfoList,
     exportAwardsList: exportAwardsList,
+    findWinnerInfoListBySearch: findWinnerInfoListBySearch,
+    downloadFile: downloadFile,
+    exportAwardsInfoBySearch: exportAwardsInfoBySearch,
     findItemListByStatus: findItemListByStatus,
     findItemListByIds: findItemListByIds,
     queryBenefitByEname: queryBenefitByEname

server/duibats/dist/index.js.map

-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA,cAAc;;AAEd,wEAAiE;AACjE,oEAA6D;AAC7D,oEAA6D;AAC7D,gEAAyD;AACzD,4EAAqE;AACrE,gEAAyD;AAEnD,IAAA,KAAsD,IAAI,6BAAkB,EAAE,EAA5E,eAAe,qBAAA,EAAE,iBAAiB,uBAAA,EAAE,WAAW,iBAA6B,CAAA;AAC9E,IAAA,KAAiC,IAAI,2BAAgB,EAAE,EAArD,cAAc,oBAAA,EAAE,UAAU,gBAA2B,CAAA;AACvD,IAAA,KAA2C,IAAI,2BAAgB,EAAE,EAA/D,kBAAkB,wBAAA,EAAE,gBAAgB,sBAA2B,CAAA;AAC/D,IAAA,YAAY,GAAK,IAAI,yBAAc,EAAE,aAAzB,CAAyB;AACvC,IAAA,KAAmE,IAAI,+BAAoB,EAAE,EAA3F,oBAAoB,0BAAA,EAAE,iBAAiB,uBAAA,EAAE,mBAAmB,yBAA+B,CAAA;AAC3F,IAAA,gBAAgB,GAAK,IAAI,yBAAc,EAAE,iBAAzB,CAAyB;AAEjD,kBAAe;IACb,eAAe,iBAAA;IACf,iBAAiB,mBAAA;IACjB,WAAW,aAAA;IACX,gBAAgB,kBAAA;IAChB,UAAU,YAAA;IACV,kBAAkB,oBAAA;IAClB,gBAAgB,kBAAA;IAChB,oBAAoB,sBAAA;IACpB,iBAAiB,mBAAA;IACjB,mBAAmB,qBAAA;CACpB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA,cAAc;;AAEd,wEAAiE;AACjE,oEAA6D;AAC7D,oEAA6D;AAC7D,gEAAyD;AACzD,4EAAqE;AACrE,gEAAyD;AAEnD,IAAA,KAAsD,IAAI,6BAAkB,EAAE,EAA5E,eAAe,qBAAA,EAAE,iBAAiB,uBAAA,EAAE,WAAW,iBAA6B,CAAA;AAC9E,IAAA,KAAiC,IAAI,2BAAgB,EAAE,EAArD,cAAc,oBAAA,EAAE,UAAU,gBAA2B,CAAA;AACvD,IAAA,KAMF,IAAI,2BAAgB,EAAE,EALxB,kBAAkB,wBAAA,EAClB,gBAAgB,sBAAA,EAChB,0BAA0B,gCAAA,EAC1B,YAAY,kBAAA,EACZ,wBAAwB,8BACA,CAAA;AAClB,IAAA,YAAY,GAAK,IAAI,yBAAc,EAAE,aAAzB,CAAyB;AACvC,IAAA,KAAmE,IAAI,+BAAoB,EAAE,EAA3F,oBAAoB,0BAAA,EAAE,iBAAiB,uBAAA,EAAE,mBAAmB,yBAA+B,CAAA;AAC3F,IAAA,gBAAgB,GAAK,IAAI,yBAAc,EAAE,iBAAzB,CAAyB;AAEjD,kBAAe;IACb,eAAe,iBAAA;IACf,iBAAiB,mBAAA;IACjB,WAAW,aAAA;IACX,gBAAgB,kBAAA;IAChB,UAAU,YAAA;IACV,kBAAkB,oBAAA;IAClB,gBAAgB,kBAAA;IAChB,0BAA0B,4BAAA;IAC1B,YAAY,cAAA;IACZ,wBAAwB,0BAAA;IACxB,oBAAoB,sBAAA;IACpB,iBAAiB,mBAAA;IACjB,mBAAmB,qBAAA;CACpB,CAAA"}
\ No newline at end of file

server/duibats/dist/service/awards.service.d.ts

@@ -5,4 +5,8 @@ export default class AwardsService {
     constructor(context: Context);
     addWaitAwardsList(list: any): Promise<boolean>;
     getAwardslistByActivityId(activityId: string, pageNo?: number, pageSize?: number): Promise<any>;
+    getAwardslistCount(activityId: string): Promise<any>;
+    getUserPrizeByActivityId(activityId: string, pageNo: number, pageSize: number, prizeId: string, userNick: string, timeStart: number, timeEnd: number, shipStatus: number, type: number): Promise<any>;
+    getTotalObjectCount(activityId: string, prizeId: string, userNick: string, timeStart: number, timeEnd: number, shipStatus: number, type: number): Promise<any>;
+    setUserShipStatus(activityId: string, prizeId: string, shipCompany: string, shipNum: number | string): Promise<any>;
 }

server/duibats/dist/service/awards.service.js

@@ -100,13 +100,132 @@ var AwardsService = /** @class */ (function () {
                                     rankTime: -1
                                 },
                                 limit: pageSize,
-                                skip: (pageNo - 1) * pageSize,
+                                skip: (pageNo - 1) * pageSize
                             })];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
         });
     };
+    //获取中奖名单长度
+    AwardsService.prototype.getAwardslistCount = function (activityId) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (!activityId) {
+                            return [2 /*return*/, false];
+                        }
+                        return [4 /*yield*/, this.awardsdao.count({
+                                activityId: activityId
+                            })];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
+            });
+        });
+    };
+    // 条件搜索--查询中奖信息
+    AwardsService.prototype.getUserPrizeByActivityId = function (activityId, pageNo, pageSize, prizeId, userNick, timeStart, timeEnd, shipStatus, type) {
+        return __awaiter(this, void 0, void 0, function () {
+            var p, u, c, s, t, arr;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        p = prizeId ? { _id: prizeId } : '';
+                        u = userNick ? { userNick: { $regex: '.*' + userNick + '.*' } } : '';
+                        c = timeStart > 0 && timeEnd > 0 ? { createTime: { $gt: timeStart, $lt: timeEnd } } : '';
+                        s = shipStatus
+                            ? shipStatus == 1
+                                ? { shipStatus: { $in: [constants_1.SHIP_STATUS.NO_ADDRESS, constants_1.SHIP_STATUS.NO_SHIP, constants_1.SHIP_STATUS.HAS_SHIP] } }
+                                : shipStatus == 2
+                                    ? { shipStatus: { $in: [constants_1.SHIP_STATUS.NO_ADDRESS, constants_1.SHIP_STATUS.NO_SHIP] } }
+                                    : { shipStatus: constants_1.SHIP_STATUS.HAS_SHIP }
+                            : '';
+                        t = type ? { type: +type } : '';
+                        arr = [p, u, c, s, t];
+                        arr = arr.filter(function (i) {
+                            return i;
+                        });
+                        console.log('arr--222---', arr);
+                        return [4 /*yield*/, this.awardsdao.find({
+                                activityId: activityId,
+                                $and: arr
+                            }, {
+                                limit: pageSize,
+                                skip: (pageNo - 1) * pageSize
+                            })];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
+            });
+        });
+    };
+    //《条件搜索》获取中奖名单长度
+    AwardsService.prototype.getTotalObjectCount = function (activityId, prizeId, userNick, timeStart, timeEnd, shipStatus, type) {
+        return __awaiter(this, void 0, void 0, function () {
+            var p, u, c, s, t, arr;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        p = prizeId ? { _id: prizeId } : '';
+                        u = userNick ? { userNick: { $regex: '.*' + userNick + '.*' } } : '';
+                        c = timeStart > 0 && timeEnd > 0 ? { createTime: { $gt: timeStart, $lt: timeEnd } } : '';
+                        s = shipStatus
+                            ? shipStatus == 1
+                                ? { shipStatus: { $in: [constants_1.SHIP_STATUS.NO_ADDRESS, constants_1.SHIP_STATUS.NO_SHIP, constants_1.SHIP_STATUS.HAS_SHIP] } }
+                                : shipStatus == 2
+                                    ? { shipStatus: { $in: [constants_1.SHIP_STATUS.NO_ADDRESS, constants_1.SHIP_STATUS.NO_SHIP] } }
+                                    : { shipStatus: constants_1.SHIP_STATUS.HAS_SHIP }
+                            : '';
+                        t = type ? { type: +type } : '';
+                        arr = [p, u, c, s, t];
+                        arr = arr.filter(function (i) {
+                            return i;
+                        });
+                        console.log('arr--111---', arr, 's>>>', s);
+                        return [4 /*yield*/, this.awardsdao.count({
+                                activityId: activityId,
+                                $and: arr
+                            })];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
+            });
+        });
+    };
+    //《条件搜索》导入发货状态
+    AwardsService.prototype.setUserShipStatus = function (activityId, prizeId, shipCompany, shipNum) {
+        return __awaiter(this, void 0, void 0, function () {
+            var status;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        prizeId = prizeId ? prizeId : '/';
+                        shipCompany = shipCompany ? shipCompany : '';
+                        shipNum = shipNum !== null ? shipNum : '';
+                        status = 0;
+                        if (shipCompany && shipNum) {
+                            status = constants_1.SHIP_STATUS.HAS_SHIP;
+                        }
+                        else {
+                            status = constants_1.SHIP_STATUS.NO_SHIP;
+                        }
+                        if (!(status == constants_1.SHIP_STATUS.HAS_SHIP)) return [3 /*break*/, 2];
+                        return [4 /*yield*/, this.awardsdao.update({
+                                activityId: activityId,
+                                _id: prizeId,
+                                shipStatus: constants_1.SHIP_STATUS.NO_SHIP
+                            }, {
+                                $set: {
+                                    shipCompany: shipCompany,
+                                    shipNum: shipNum,
+                                    shipStatus: constants_1.SHIP_STATUS.HAS_SHIP
+                                }
+                            })];
+                    case 1: return [2 /*return*/, _a.sent()];
+                    case 2: return [2 /*return*/, 0];
+                }
+            });
+        });
+    };
     return AwardsService;
 }());
 exports.default = AwardsService;

server/duibats/dist/service/awards.service.js.map

-{"version":3,"file":"awards.service.js","sourceRoot":"","sources":["../../src/service/awards.service.ts"],"names":[],"mappings":";AAAA,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEd,UAAU;AAEV,8BAAgC;AAChC,4BAAsC;AAEtC,0CAA0C;AAC1C;IAGE,uBAAY,OAAgB;QAC1B,IAAI,CAAC,SAAS,GAAG,IAAI,aAAO,CAAC,OAAO,EAAE,mBAAc,CAAC,CAAA;IACvD,CAAC;IAED,aAAa;IACP,yCAAiB,GAAvB,UAAwB,IAAI;;;;;;wBAC1B,IAAI,CAAC,IAAI,CAAC,MAAM;4BAAE,sBAAO,IAAI,EAAA;wBAC7B,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,UAAA,CAAC;4BACf,6BACK,CAAC,KACJ,UAAU,EAAE,uBAAW,CAAC,SAAS,EACjC,OAAO,EAAE,EAAE,IACZ;wBACH,CAAC,CAAC,CAAA;;;;wBAEA,qBAAM,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,EAAA;;wBAArC,SAAqC,CAAA;wBACrC,sBAAO,IAAI,EAAA;;;wBAEX,OAAO,CAAC,GAAG,CAAC,mFAAgB,GAAG,CAAC,CAAA;wBAChC,sBAAO,KAAK,EAAA;;;;;KAEf;IAED,eAAe;IACT,iDAAyB,GAA/B,UAAgC,UAAkB,EAAE,MAAU,EAAE,QAAc;QAA1B,uBAAA,EAAA,UAAU;QAAE,yBAAA,EAAA,cAAc;;;;;wBAC5E,IAAI,CAAC,UAAU;4BAAE,sBAAO,KAAK,EAAA;wBACtB,qBAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAC9B,EAAE,UAAU,YAAA,EAAE,EACd;gCACE,IAAI,EAAE;oCACJ,KAAK,EAAE,CAAC,CAAC;oCACT,QAAQ,EAAE,CAAC,CAAC;iCACb;gCACD,KAAK,EAAE,QAAQ;gCACf,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,QAAQ;6BAC9B,CACF,EAAA;4BAVD,sBAAO,SAUN,EAAA;;;;KACF;IACH,oBAAC;AAAD,CAAC,AAzCD,IAyCC"}
+{"version":3,"file":"awards.service.js","sourceRoot":"","sources":["../../src/service/awards.service.ts"],"names":[],"mappings":"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"}
\ No newline at end of file

server/duibats/src/constants.ts

@@ -271,3 +271,10 @@ export const TEMPLATE_INFO = {
   template_id: 3000000002590532,
   template_version: '0.0.3'
 }
+
+//物流状态
+export const SHIP_STATUS = {
+  NO_ADDRESS: 1,
+  NO_SHIP: 2,
+  HAS_SHIP: 3
+}

server/duibats/src/index.ts

@@ -9,7 +9,13 @@ import SaveController from './controller/save.controller'
 
 const { getActivityList, getActivityDetail, delActivity } = new ActivityController()
 const { sellerSaasSave, sellerSave } = new SellerController()
-const { findWinnerInfoList, exportAwardsList } = new AwardsController()
+const {
+  findWinnerInfoList,
+  exportAwardsList,
+  findWinnerInfoListBySearch,
+  downloadFile,
+  exportAwardsInfoBySearch
+} = new AwardsController()
 const { generateRule } = new RuleController()
 const { findItemListByStatus, findItemListByIds, queryBenefitByEname } = new RaobaoItemController()
 const { saveActivityInfo } = new SaveController()
@@ -22,6 +28,9 @@ export default {
   sellerSave,
   findWinnerInfoList,
   exportAwardsList,
+  findWinnerInfoListBySearch,
+  downloadFile,
+  exportAwardsInfoBySearch,
   findItemListByStatus,
   findItemListByIds,
   queryBenefitByEname

server/duibats/src/service/awards.service.ts

@@ -5,7 +5,7 @@
 import { BaseDao } from '../sdk'
 import { AWARDS_DB_NAME } from '../db'
 
-import { DRAW_STATUS } from '../constants'
+import { DRAW_STATUS, SHIP_STATUS } from '../constants'
 export default class AwardsService {
   context: Context
   awardsdao: IBaseDao
@@ -43,8 +43,121 @@ export default class AwardsService {
           rankTime: -1
         },
         limit: pageSize,
-        skip: (pageNo - 1) * pageSize,
+        skip: (pageNo - 1) * pageSize
       }
     )
   }
+
+  //获取中奖名单长度
+  async getAwardslistCount(activityId: string) {
+    if (!activityId) {
+      return false
+    }
+    return await this.awardsdao.count({
+      activityId: activityId
+    })
+  }
+
+  // 条件搜索--查询中奖信息
+  async getUserPrizeByActivityId(
+    activityId: string,
+    pageNo: number,
+    pageSize: number,
+    prizeId: string,
+    userNick: string,
+    timeStart: number,
+    timeEnd: number,
+    shipStatus: number,
+    type: number
+  ) {
+    let p = prizeId ? { _id: prizeId } : ''
+    let u = userNick ? { userNick: { $regex: '.*' + userNick + '.*' } } : ''
+    let c = timeStart > 0 && timeEnd > 0 ? { createTime: { $gt: timeStart, $lt: timeEnd } } : ''
+    let s = shipStatus
+      ? shipStatus == 1
+        ? { shipStatus: { $in: [SHIP_STATUS.NO_ADDRESS, SHIP_STATUS.NO_SHIP, SHIP_STATUS.HAS_SHIP] } }
+        : shipStatus == 2
+        ? { shipStatus: { $in: [SHIP_STATUS.NO_ADDRESS, SHIP_STATUS.NO_SHIP] } }
+        : { shipStatus: SHIP_STATUS.HAS_SHIP }
+      : ''
+    let t = type ? { type: +type } : ''
+    let arr = [p, u, c, s, t]
+    arr = arr.filter(i => {
+      return i
+    })
+    console.log('arr--222---', arr)
+    return await this.awardsdao.find(
+      {
+        activityId,
+        $and: arr
+      },
+      {
+        limit: pageSize,
+        skip: (pageNo - 1) * pageSize
+      }
+    )
+  }
+
+  //《条件搜索》获取中奖名单长度
+  async getTotalObjectCount(
+    activityId: string,
+    prizeId: string,
+    userNick: string,
+    timeStart: number,
+    timeEnd: number,
+    shipStatus: number,
+    type: number
+  ) {
+    let p = prizeId ? { _id: prizeId } : ''
+    let u = userNick ? { userNick: { $regex: '.*' + userNick + '.*' } } : ''
+    let c = timeStart > 0 && timeEnd > 0 ? { createTime: { $gt: timeStart, $lt: timeEnd } } : ''
+    let s = shipStatus
+      ? shipStatus == 1
+        ? { shipStatus: { $in: [SHIP_STATUS.NO_ADDRESS, SHIP_STATUS.NO_SHIP, SHIP_STATUS.HAS_SHIP] } }
+        : shipStatus == 2
+        ? { shipStatus: { $in: [SHIP_STATUS.NO_ADDRESS, SHIP_STATUS.NO_SHIP] } }
+        : { shipStatus: SHIP_STATUS.HAS_SHIP }
+      : ''
+    let t = type ? { type: +type } : ''
+    let arr = [p, u, c, s, t]
+    arr = arr.filter(i => {
+      return i
+    })
+    console.log('arr--111---', arr, 's>>>', s)
+    return await this.awardsdao.count({
+      activityId,
+      $and: arr
+    })
+  }
+
+  //《条件搜索》导入发货状态
+  async setUserShipStatus(activityId: string, prizeId: string, shipCompany: string, shipNum: number | string) {
+    prizeId = prizeId ? prizeId : '/'
+    shipCompany = shipCompany ? shipCompany : ''
+    shipNum = shipNum !== null ? shipNum : ''
+    let status = 0
+    if (shipCompany && shipNum) {
+      status = SHIP_STATUS.HAS_SHIP
+    } else {
+      status = SHIP_STATUS.NO_SHIP
+    }
+    if (status == SHIP_STATUS.HAS_SHIP) {
+      return await this.awardsdao.update(
+        {
+          activityId,
+          _id: prizeId,
+          shipStatus: SHIP_STATUS.NO_SHIP
+        },
+        {
+          $set: {
+            shipCompany,
+            shipNum,
+            shipStatus: SHIP_STATUS.HAS_SHIP
+          }
+        }
+      )
+    } else {
+      return 0
+    }
+  }
 }