init: ts

server/duiba/controller/activity.controller.js

@@ -103,12 +103,12 @@ const saveActivityInfoByHasId = async function (context) {
       "活动名称不可超过12个字"
     );
   }
-  const taskList = Object.keys(tasks).map(type => {
+  const taskList = Object.keys(tasks).map((type) => {
     return {
       ...tasks[type],
-      type
-    }
-  })
+      type,
+    };
+  });
   if (taskList.length === 0) {
     return resultsModel.error(CODE_TYPES.PARAMS_ERROR, "任务配置必须配置一项");
   } else {

server/duibats/dist/config/index.js

@@ -10,6 +10,6 @@ var configs = {
 };
 exports.getConfig = function (context) {
     var env = context.env;
-    return configs[env] || configs.test;
+    return configs[env] || configs.online;
 };
 //# sourceMappingURL=index.js.map
\ No newline at end of file

server/duibats/dist/config/index.js.map

-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":";AAAA,cAAc;;;AAEd,mCAA6B;AAC7B,+BAAyB;AAOzB,IAAM,OAAO,GAAG;IACd,MAAM,kBAAA;IACN,IAAI,gBAAA;CACL,CAAA;AAEY,QAAA,SAAS,GAAG,UAAC,OAAgB;IACxC,IAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAA;IACvB,OAAO,OAAO,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,IAAI,CAAA;AACrC,CAAC,CAAA"}
\ No newline at end of file
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":";AAAA,cAAc;;;AAEd,mCAA6B;AAC7B,+BAAyB;AAOzB,IAAM,OAAO,GAAG;IACd,MAAM,kBAAA;IACN,IAAI,gBAAA;CACL,CAAA;AAEY,QAAA,SAAS,GAAG,UAAC,OAAgB;IACxC,IAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAA;IACvB,OAAO,OAAO,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,MAAM,CAAA;AACvC,CAAC,CAAA"}
\ No newline at end of file

server/duibats/dist/constants.d.ts

@@ -215,9 +215,10 @@ export declare const errorCode: {
 export declare const B_APP_NAME: string;
 export declare const GOODSINFO = "detail_url,approve_status,num_iid,title,nick,type,cid,pic_url,num,props,valid_thru,list_time,price,has_discount,has_invoice,has_warranty,has_showcase,modified,delist_time,postage_id,seller_cids,outer_id,sold_quantity";
 export declare const EIGHT_HOURS: number;
+export declare const _48_HOURS: number;
 export declare const DELETE_STATUS: {
-    DELETE: number;
     EXIST: number;
+    DELETE: number;
 };
 export declare const TASK_TYPE_TEXT: {
     beMembership: string;
@@ -252,6 +253,7 @@ export declare const TASK_CHECK_TYPE: {
         list: string[];
     };
 };
+export declare const PASS_URL_LIST: string[];
 export declare const APP_SUB_CODE: string;
 export declare const TEMPLATE_INFO: {
     clients: string;

server/duibats/dist/constants.js

 "use strict";
 /** @format */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TEMPLATE_INFO = exports.APP_SUB_CODE = exports.TASK_CHECK_TYPE = exports.TASK_TYPE_TEXT = exports.DELETE_STATUS = 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.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 = {
     // 更新重试失败(用于并发更新)
@@ -162,9 +162,10 @@ exports.errorCode = {
 exports.B_APP_NAME = 'promotioncenter-<%=bizCode%>';
 exports.GOODSINFO = 'detail_url,approve_status,num_iid,title,nick,type,cid,pic_url,num,props,valid_thru,list_time,price,has_discount,has_invoice,has_warranty,has_showcase,modified,delist_time,postage_id,seller_cids,outer_id,sold_quantity';
 exports.EIGHT_HOURS = 60 * 60 * 8 * 1000;
+exports._48_HOURS = 48 * 60 * 60 * 1000;
 exports.DELETE_STATUS = {
-    DELETE: 2,
-    EXIST: 1
+    EXIST: 1,
+    DELETE: 2
 };
 exports.TASK_TYPE_TEXT = {
     beMembership: '成为会员',
@@ -206,6 +207,58 @@ exports.TASK_CHECK_TYPE = {
     },
     link: { list: ['jumpLink'] }
 };
+exports.PASS_URL_LIST = [
+    '1688.cn',
+    '1688.com',
+    'alibaba.cn',
+    'alibaba.com',
+    'aliexpress.com',
+    'alimama.cn',
+    'alimama.com',
+    'alipay.com.cn',
+    'alipay.com',
+    'alipay.net',
+    'aliplay.com',
+    'alisoft.cn',
+    'alisoft.com',
+    'aliyun.com',
+    'aliyun.net',
+    'koubei.cn',
+    'koubei.com',
+    'taobao.cn',
+    'taobao.com',
+    'taobao.net',
+    'tb.cn',
+    'tmall.com',
+    'zhifu.com',
+    'zhifubao.com',
+    'juhuasuan.com',
+    'tmall.hk',
+    'tmall.com.hk',
+    'jiyoujia.com',
+    'pailitao.com',
+    'cainiao.com',
+    'dingtalk.com',
+    'yushanfang.com',
+    'guoguo-app.com',
+    'alihealth.cn',
+    'miaostreet.com',
+    'uc123.com',
+    'uc.cn',
+    'ucweb.com',
+    'aliyun-inc.com',
+    'cainiaoyizhan.com',
+    'umeng.com',
+    'aliplus.com',
+    'aliplay.com',
+    'taopiaopiao.com',
+    'youku.com',
+    'tudou.com',
+    'xinlingshou.cn',
+    'fliggy.com',
+    'feizhu.com',
+    'feizhu.cn'
+];
 //saas订购码 根据需求改变
 exports.APP_SUB_CODE = 'FW_GOODS-1001086450';
 exports.TEMPLATE_INFO = {

server/duibats/dist/constants.js.map

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

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

 /** @format */
 import { ActivityconfigService } from '../service';
+interface ISavePrizeParams {
+    prizeList?: Array<IActivityPrize>;
+}
 interface ISaveActivityContext extends Context {
-    data: {
-        activityId?: string;
-        title: string;
-        startTime: number;
-        endTime: number;
-        tasks: ITasks;
-        rule: string;
-    };
+    data: IActivityBaseInfo & ISavePrizeParams;
 }
 export default class ActivitSaveController {
     /**
      *  保存活动
      */
-    saveActivityInfo(context: ISaveActivityContext, {}: {}, [activityconfigService]: [ActivityconfigService]): Promise<void>;
+    saveActivityInfo(context: ISaveActivityContext, {}: {}, [activityconfigService]: [ActivityconfigService]): Promise<import("taobao-mini-sdk/lib/utils/resultmodel").Result>;
 }
 export {};

server/duibats/dist/controller/save.controller.js

@@ -45,8 +45,17 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __spreadArrays = (this && this.__spreadArrays) || function () {
+    for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;
+    for (var r = Array(s), k = 0, i = 0; i < il; i++)
+        for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)
+            r[k] = a[j];
+    return r;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+var constants_1 = require("./../constants");
 var decorator_1 = require("../decorator");
+var sdk_1 = require("../sdk");
 var service_1 = require("../service");
 var saveValidate_1 = require("../utils/saveValidate");
 var ActivitSaveController = /** @class */ (function () {
@@ -59,18 +68,64 @@ var ActivitSaveController = /** @class */ (function () {
     ActivitSaveController.prototype.saveActivityInfo = function (context, _a, _b) {
         var activityconfigService = _b[0];
         return __awaiter(this, void 0, void 0, function () {
-            var _c, _d, title, _e, activityId, startTime, endTime, _f, tasks, rule, nowTime, initialData;
-            return __generator(this, function (_g) {
-                switch (_g.label) {
+            var _c, _d, title, _e, activityId, startTime, endTime, _f, tasks, rule, prizeList, openId, baseData, allPrizeList, result, result, _g, bothIds, deleteIds;
+            return __generator(this, function (_h) {
+                switch (_h.label) {
                     case 0:
-                        _c = context.data, _d = _c.title, title = _d === void 0 ? '' : _d, _e = _c.activityId, activityId = _e === void 0 ? '' : _e, startTime = _c.startTime, endTime = _c.endTime, _f = _c.tasks, tasks = _f === void 0 ? {} : _f, rule = _c.rule;
-                        nowTime = Date.now();
-                        if (!activityId) return [3 /*break*/, 2];
-                        return [4 /*yield*/, activityconfigService.getActivityInfoByActivityId(activityId)];
+                        _c = context.data, _d = _c.title, title = _d === void 0 ? '' : _d, _e = _c.activityId, activityId = _e === void 0 ? '' : _e, startTime = _c.startTime, endTime = _c.endTime, _f = _c.tasks, tasks = _f === void 0 ? {} : _f, rule = _c.rule, prizeList = _c.prizeList;
+                        openId = context.openId;
+                        baseData = {
+                            title: title,
+                            startTime: startTime,
+                            endTime: endTime,
+                            rule: rule,
+                            openId: openId,
+                            tasks: tasks,
+                            // 奖品过期时间, 根据需求领奖是否有过期时间
+                            awardReceiveExpiredTime: endTime + constants_1._48_HOURS
+                        };
+                        allPrizeList = __spreadArrays(prizeList);
+                        if (!!activityId) return [3 /*break*/, 2];
+                        return [4 /*yield*/, activityconfigService.saveNewActivity(baseData, allPrizeList, openId)];
                     case 1:
-                        initialData = _g.sent();
-                        _g.label = 2;
-                    case 2: return [2 /*return*/];
+                        result = _h.sent();
+                        if (result || result === 0) {
+                            return [2 /*return*/, sdk_1.resultsModel.success(true)];
+                        }
+                        else {
+                            console.log(result, '保存活动失败');
+                            return [2 /*return*/, sdk_1.resultsModel.error(constants_1.CODE_TYPES.SYSTEM_ERROR, '保存活动失败')];
+                        }
+                        return [3 /*break*/, 7];
+                    case 2: return [4 /*yield*/, activityconfigService.updateBaseConfigInfo(activityId, baseData)
+                        // 找到更新的和删除的奖品id
+                    ];
+                    case 3:
+                        result = _h.sent();
+                        return [4 /*yield*/, activityconfigService.diffPrizeList(activityId, allPrizeList)
+                            // 将删除的奖品逻辑删除
+                        ];
+                    case 4:
+                        _g = _h.sent(), bothIds = _g.bothIds, deleteIds = _g.deleteIds;
+                        return [4 /*yield*/, activityconfigService.deletePrizeByIds(deleteIds)
+                            // 添加和更新奖品
+                        ];
+                    case 5:
+                        // 将删除的奖品逻辑删除
+                        result = _h.sent();
+                        return [4 /*yield*/, activityconfigService.insertAndUpdatePrize(activityId, allPrizeList, bothIds)];
+                    case 6:
+                        // 添加和更新奖品
+                        result = _h.sent();
+                        if (result || result === 0) {
+                            return [2 /*return*/, sdk_1.resultsModel.success(true)];
+                        }
+                        else {
+                            console.log(result, '保存活动失败');
+                            return [2 /*return*/, sdk_1.resultsModel.error(constants_1.CODE_TYPES.SYSTEM_ERROR, '保存活动失败')];
+                        }
+                        _h.label = 7;
+                    case 7: return [2 /*return*/];
                 }
             });
         });

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

-{"version":3,"file":"save.controller.js","sourceRoot":"","sources":["../../src/controller/save.controller.ts"],"names":[],"mappings":";AAAA,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGd,0CAAoE;AAEpE,sCAAkD;AAClD,sDAAkD;AAYlD;IAAA;IAiBA,CAAC;IAhBC;;OAEG;IACH,mEAAmE;IAG7D,gDAAgB,GAAtB,UAAuB,OAA6B,EAAE,EAAE,EAAE,EAAgD;YAA/C,qBAAqB,QAAA;;;;;;wBACxE,KAAwE,OAAO,CAAC,IAAI,EAAlF,aAAU,EAAV,KAAK,mBAAG,EAAE,KAAA,EAAE,kBAAe,EAAf,UAAU,mBAAG,EAAE,KAAA,EAAE,SAAS,eAAA,EAAE,OAAO,aAAA,EAAE,aAAU,EAAV,KAAK,mBAAG,EAAE,KAAA,EAAE,IAAI,UAAA,CAAiB;wBAEpF,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;6BAGtB,UAAU,EAAV,wBAAU;wBACE,qBAAM,qBAAqB,CAAC,2BAA2B,CAAC,UAAU,CAAC,EAAA;;wBAAjF,WAAW,GAAG,SAAmE,CAAA;;;;;;KAEpF;IATD;QAFC,0BAAc,CAAC,yBAAU,CAAC;QAC1B,oBAAQ,CAAC,CAAC,+BAAqB,CAAC,CAAC;;;;iEAUjC;IACH,4BAAC;CAAA,AAjBD,IAiBC;kBAjBoB,qBAAqB"}
\ No newline at end of file
+{"version":3,"file":"save.controller.js","sourceRoot":"","sources":["../../src/controller/save.controller.ts"],"names":[],"mappings":";AAAA,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEd,4CAAsD;AACtD,0CAAoE;AACpE,8BAAqC;AACrC,sCAAkD;AAClD,sDAAkD;AAgBlD;IAAA;IA2DA,CAAC;IA1DC;;OAEG;IACH,mEAAmE;IAG7D,gDAAgB,GAAtB,UAAuB,OAA6B,EAAE,EAAE,EAAE,EAAgD;YAA/C,qBAAqB,QAAA;;;;;;wBACxE,KAAmF,OAAO,CAAC,IAAI,EAA7F,aAAU,EAAV,KAAK,mBAAG,EAAE,KAAA,EAAE,kBAAe,EAAf,UAAU,mBAAG,EAAE,KAAA,EAAE,SAAS,eAAA,EAAE,OAAO,aAAA,EAAE,aAAU,EAAV,KAAK,mBAAG,EAAE,KAAA,EAAE,IAAI,UAAA,EAAE,SAAS,eAAA,CAAiB;wBAC7F,MAAM,GAAK,OAAO,OAAZ,CAAY;wBAGpB,QAAQ,GAAsB;4BAClC,KAAK,OAAA;4BACL,SAAS,WAAA;4BACT,OAAO,SAAA;4BACP,IAAI,MAAA;4BACJ,MAAM,QAAA;4BACN,KAAK,OAAA;4BACL,wBAAwB;4BACxB,uBAAuB,EAAE,OAAO,GAAG,qBAAS;yBAC7C,CAAA;wBAGK,YAAY,kBAA8B,SAAS,CAAC,CAAA;6BAGtD,CAAC,UAAU,EAAX,wBAAW;wBAEE,qBAAM,qBAAqB,CAAC,eAAe,CAAC,QAAQ,EAAE,YAAY,EAAE,MAAM,CAAC,EAAA;;wBAApF,MAAM,GAAG,SAA2E;wBAC1F,IAAI,MAAM,IAAI,MAAM,KAAK,CAAC,EAAE;4BAC1B,sBAAO,kBAAY,CAAC,OAAO,CAAC,IAAI,CAAC,EAAA;yBAClC;6BAAM;4BACL,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;4BAC7B,sBAAO,kBAAY,CAAC,KAAK,CAAC,sBAAU,CAAC,YAAY,EAAE,QAAQ,CAAC,EAAA;yBAC7D;;4BAKY,qBAAM,qBAAqB,CAAC,oBAAoB,CAAC,UAAU,EAAE,QAAQ,CAAC;wBAEnF,gBAAgB;sBAFmE;;wBAA/E,MAAM,GAAG,SAAsE;wBAGpD,qBAAM,qBAAqB,CAAC,aAAa,CAAC,UAAU,EAAE,YAAY,CAAC;4BAElG,aAAa;0BAFqF;;wBAA5F,KAAyB,SAAmE,EAA1F,OAAO,aAAA,EAAE,SAAS,eAAA;wBAGjB,qBAAM,qBAAqB,CAAC,gBAAgB,CAAC,SAAS,CAAC;4BAEhE,UAAU;0BAFsD;;wBADhE,aAAa;wBACb,MAAM,GAAG,SAAuD,CAAA;wBAGvD,qBAAM,qBAAqB,CAAC,oBAAoB,CAAC,UAAU,EAAE,YAAY,EAAE,OAAO,CAAC,EAAA;;wBAD5F,UAAU;wBACV,MAAM,GAAG,SAAmF,CAAA;wBAE5F,IAAI,MAAM,IAAI,MAAM,KAAK,CAAC,EAAE;4BAC1B,sBAAO,kBAAY,CAAC,OAAO,CAAC,IAAI,CAAC,EAAA;yBAClC;6BAAM;4BACL,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;4BAC7B,sBAAO,kBAAY,CAAC,KAAK,CAAC,sBAAU,CAAC,YAAY,EAAE,QAAQ,CAAC,EAAA;yBAC7D;;;;;;KAEJ;IAnDD;QAFC,0BAAc,CAAC,yBAAU,CAAC;QAC1B,oBAAQ,CAAC,CAAC,+BAAqB,CAAC,CAAC;;;;iEAoDjC;IACH,4BAAC;CAAA,AA3DD,IA2DC;kBA3DoB,qBAAqB"}
\ No newline at end of file

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

@@ -3,13 +3,19 @@ export default class ActivityConfigService {
     activityconfigDao: IBaseDao;
     activityconfigPrizeDao: IBaseDao;
     constructor(context: Context);
-    saveNewActivity(data: any, prize: any, openId: any): Promise<any>;
-    updateBaseConfigInfo(id: any, data: any): Promise<any>;
+    saveNewActivity(baseConfig: IActivityBaseInfo, prize: Array<IActivityPrize>, openId: string): Promise<any>;
+    updateBaseConfigInfo(id: string, data: IActivityBaseInfo): Promise<any>;
     getPrizeInfoById(id: any): Promise<any>;
     updateDeleteStatusById(id: any): Promise<any>;
+    deletePrizeByIds(ids: string[]): Promise<any>;
+    insertAndUpdatePrize(activityId: string, allPrizeList: Array<IActivityPrize>, bothIds: string[]): Promise<any>;
     updateOnePrizeById(id: any, data: any): Promise<any>;
     insertPrizeByActivityId(activityId: any, data: any): Promise<any>;
-    getAllOldPrizeList(activityId: any): Promise<any>;
+    getAllOldPrizeList(activityId: string): Promise<any>;
+    diffPrizeList(activityId: string, pirzeList: Array<IActivityPrize>): Promise<{
+        deleteIds: string[];
+        bothIds: string[];
+    }>;
     updateActivity(activityId: any, data: any, prizeNoId: any): Promise<[unknown, unknown, unknown, unknown, unknown, unknown, unknown, unknown, unknown, unknown]>;
     getActivityListByOpenId(openId: string, { pageSize, pageNo }: {
         pageSize?: number;

server/duibats/dist/service/activityconfig.service.js

@@ -64,14 +64,14 @@ var ActivityConfigService = /** @class */ (function () {
         this.activityconfigPrizeDao = new sdk_1.BaseDao(context, db_1.PRIZE_CONFIG_DB_NAME);
     }
     //保存新建活动
-    ActivityConfigService.prototype.saveNewActivity = function (data, prize, openId) {
+    ActivityConfigService.prototype.saveNewActivity = function (baseConfig, prize, openId) {
         return __awaiter(this, void 0, void 0, function () {
             var result_1, e_1, e_2;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         _a.trys.push([0, 7, , 8]);
-                        return [4 /*yield*/, this.activityconfigDao.count(__assign(__assign({}, data), { createTime: Date.now(), updateTime: Date.now(), deleteStatus: constants_1.DELETE_STATUS.EXIST, openPrizeStatus: constants_1.OPEN_PRIZE_STATUS.WAIT_AWARD }))];
+                        return [4 /*yield*/, this.activityconfigDao.insertOne(__assign(__assign({}, baseConfig), { createTime: Date.now(), updateTime: Date.now(), deleteStatus: constants_1.DELETE_STATUS.EXIST, openPrizeStatus: constants_1.OPEN_PRIZE_STATUS.WAIT_AWARD }))];
                     case 1:
                         result_1 = _a.sent();
                         console.log(result_1, '保存基础配置result');
@@ -79,13 +79,8 @@ var ActivityConfigService = /** @class */ (function () {
                         _a.label = 2;
                     case 2:
                         _a.trys.push([2, 4, , 6]);
-                        prize.map(function (item) {
-                            item.activityId = result_1;
-                            item.openId = openId;
-                            item.createTime = Date.now();
-                            item.updateTime = Date.now();
-                            item.deleteStatus = constants_1.DELETE_STATUS.EXIST;
-                            return item;
+                        prize = prize.map(function (item) {
+                            return __assign(__assign({}, item), { activityId: result_1, openId: openId, createTime: Date.now(), updateTime: Date.now(), deleteStatus: constants_1.DELETE_STATUS.EXIST });
                         });
                         return [4 /*yield*/, this.activityconfigPrizeDao.insertMany(prize)];
                     case 3: return [2 /*return*/, _a.sent()];
@@ -116,9 +111,7 @@ var ActivityConfigService = /** @class */ (function () {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.activityconfigDao.update({
-                            _id: id
-                        }, {
+                    case 0: return [4 /*yield*/, this.activityconfigDao.update({ _id: id }, {
                             $set: __assign(__assign({}, data), { updateTime: Date.now(), deleteStatus: constants_1.DELETE_STATUS.EXIST })
                         })];
                     case 1: return [2 /*return*/, _a.sent()];
@@ -162,6 +155,60 @@ var ActivityConfigService = /** @class */ (function () {
             });
         });
     };
+    ActivityConfigService.prototype.deletePrizeByIds = function (ids) {
+        return __awaiter(this, void 0, void 0, function () {
+            var result, i;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        i = 0;
+                        _a.label = 1;
+                    case 1:
+                        if (!(i < ids.length)) return [3 /*break*/, 4];
+                        return [4 /*yield*/, this.updateDeleteStatusById(ids[i])];
+                    case 2:
+                        result = _a.sent();
+                        _a.label = 3;
+                    case 3:
+                        i++;
+                        return [3 /*break*/, 1];
+                    case 4: return [2 /*return*/, result];
+                }
+            });
+        });
+    };
+    ActivityConfigService.prototype.insertAndUpdatePrize = function (activityId, allPrizeList, bothIds) {
+        return __awaiter(this, void 0, void 0, function () {
+            var result, i, isNewPrize, isEditPrize;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        i = 0;
+                        _a.label = 1;
+                    case 1:
+                        if (!(i < allPrizeList.length)) return [3 /*break*/, 7];
+                        isNewPrize = !allPrizeList[i]._id;
+                        if (!isNewPrize) return [3 /*break*/, 3];
+                        return [4 /*yield*/, this.insertPrizeByActivityId(activityId, allPrizeList[i])];
+                    case 2:
+                        result = _a.sent();
+                        _a.label = 3;
+                    case 3:
+                        isEditPrize = bothIds.includes(allPrizeList[i]._id);
+                        if (!isEditPrize) return [3 /*break*/, 5];
+                        return [4 /*yield*/, this.updateOnePrizeById(allPrizeList[i]._id, allPrizeList[i])];
+                    case 4:
+                        result = _a.sent();
+                        _a.label = 5;
+                    case 5: return [2 /*return*/, result];
+                    case 6:
+                        i++;
+                        return [3 /*break*/, 1];
+                    case 7: return [2 /*return*/];
+                }
+            });
+        });
+    };
     // 更新单条数据
     ActivityConfigService.prototype.updateOnePrizeById = function (id, data) {
         return __awaiter(this, void 0, void 0, function () {
@@ -193,14 +240,50 @@ var ActivityConfigService = /** @class */ (function () {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.activityconfigPrizeDao.find({
-                            activityId: activityId
-                        })];
+                    case 0: return [4 /*yield*/, this.activityconfigPrizeDao.find({ activityId: activityId })];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
         });
     };
+    // 编辑活动时, 对比新旧奖品配置, 找出删除的id和更新的id
+    ActivityConfigService.prototype.diffPrizeList = function (activityId, pirzeList) {
+        return __awaiter(this, void 0, void 0, function () {
+            function getIds(pirzeList) {
+                return pirzeList.reduce(function (s, v) {
+                    if (v._id) {
+                        s = __spreadArrays(s, [v._id]);
+                    }
+                    return s;
+                }, []);
+            }
+            var allNewIds, oldPrizeList, oldIds, deleteIds, bothIds;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        allNewIds = getIds(pirzeList);
+                        return [4 /*yield*/, this.getAllOldPrizeList(activityId)];
+                    case 1:
+                        oldPrizeList = _a.sent();
+                        oldIds = getIds(oldPrizeList);
+                        deleteIds = [];
+                        bothIds = oldIds.reduce(function (s, i) {
+                            if (allNewIds.includes(i)) {
+                                s = __spreadArrays(s, [i]);
+                            }
+                            else {
+                                deleteIds.push(i);
+                            }
+                            return s;
+                        }, []);
+                        return [2 /*return*/, {
+                                deleteIds: deleteIds,
+                                bothIds: bothIds
+                            }];
+                }
+            });
+        });
+    };
     //更新活动配置
     ActivityConfigService.prototype.updateActivity = function (activityId, data, prizeNoId) {
         return __awaiter(this, void 0, void 0, function () {
@@ -315,7 +398,10 @@ var ActivityConfigService = /** @class */ (function () {
                 switch (_b.label) {
                     case 0:
                         _a = {};
-                        return [4 /*yield*/, this.activityconfigDao.findOne({ _id: activityId, deleteStatus: constants_1.DELETE_STATUS.EXIST })];
+                        return [4 /*yield*/, this.activityconfigDao.findOne({
+                                _id: activityId,
+                                deleteStatus: constants_1.DELETE_STATUS.EXIST
+                            })];
                     case 1:
                         _a.baseConfig = _b.sent();
                         return [4 /*yield*/, this.activityconfigPrizeDao.find({ activityId: activityId, deleteStatus: constants_1.DELETE_STATUS.EXIST }, { sort: { level: 1 } })];

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

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

server/duibats/dist/utils/getSeller.d.ts

+/** @format */
 export declare const getConsumerSeller: ({ accessToken, openId }: {
     accessToken: any;
     openId: any;

server/duibats/dist/utils/getSeller.js

 "use strict";
+/** @format */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getConsumerSeller = void 0;
 exports.getConsumerSeller = function (_a) {
@@ -8,7 +9,8 @@ exports.getConsumerSeller = function (_a) {
         open_id: openId,
         // 'appkey': appKey,
         // 'appsecret': secret,
-        session: accessToken,
+        session: accessToken
+        // REST_URL: 'http://gw.api.taobao.com/router/rest'
     };
 };
 //# sourceMappingURL=getSeller.js.map
\ No newline at end of file

server/duibats/dist/utils/getSeller.js.map

-{"version":3,"file":"getSeller.js","sourceRoot":"","sources":["../../src/utils/getSeller.ts"],"names":[],"mappings":";;;AAAa,QAAA,iBAAiB,GAAG,UAAC,EAAuB;QAArB,WAAW,iBAAA,EAAE,MAAM,YAAA;IACrD,OAAO;QACL,4DAA4D;QAC5D,OAAO,EAAE,MAAM;QACf,oBAAoB;QACpB,uBAAuB;QACvB,OAAO,EAAE,WAAW;KAErB,CAAC;AACJ,CAAC,CAAC"}
\ No newline at end of file
+{"version":3,"file":"getSeller.js","sourceRoot":"","sources":["../../src/utils/getSeller.ts"],"names":[],"mappings":";AAAA,cAAc;;;AAED,QAAA,iBAAiB,GAAG,UAAC,EAAuB;QAArB,WAAW,iBAAA,EAAE,MAAM,YAAA;IACrD,OAAO;QACL,4DAA4D;QAC5D,OAAO,EAAE,MAAM;QACf,oBAAoB;QACpB,uBAAuB;QACvB,OAAO,EAAE,WAAW;QACpB,mDAAmD;KACpD,CAAA;AACH,CAAC,CAAA"}
\ No newline at end of file

server/duibats/dist/utils/saveValidate.js

@@ -13,6 +13,7 @@ var __assign = (this && this.__assign) || function () {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.saveParams = void 0;
+var constants_1 = require("../constants");
 exports.saveParams = {
     title: {
         required: true,
@@ -59,7 +60,95 @@ exports.saveParams = {
             if (taskList.length === 0)
                 return new Error('任务配置必须配置一项');
             var canPassTask = { status: true, message: '' };
+            taskList.forEach(function (i) {
+                if (!i.type) {
+                    canPassTask = {
+                        status: false,
+                        message: '任务必须配置'
+                    };
+                }
+                if (constants_1.TASK_CHECK_TYPE.link.list.includes(i.type)) {
+                    if (canPassTask.status) {
+                        canPassTask = urlCheck(i.link, constants_1.PASS_URL_LIST);
+                    }
+                }
+                if (constants_1.TASK_CHECK_TYPE.itemIds.list.includes(i.type)) {
+                    if (!i.itemIds) {
+                        canPassTask = {
+                            status: false,
+                            message: constants_1.TASK_TYPE_TEXT[i.type] + '必须配置'
+                        };
+                    }
+                }
+                if (constants_1.TASK_CHECK_TYPE.value.list.includes(i.type)) {
+                    if (!i.value) {
+                        canPassTask = {
+                            status: false,
+                            message: constants_1.TASK_TYPE_TEXT[i.type] + '任务值必须配置'
+                        };
                     }
+                    if (!constants_1.TASK_CHECK_TYPE.value.reg.test(i.value)) {
+                        canPassTask = {
+                            status: false,
+                            message: constants_1.TASK_TYPE_TEXT[i.type] + '任务值在' + constants_1.TASK_CHECK_TYPE.value.regName
+                        };
+                    }
+                }
+                if (constants_1.TASK_CHECK_TYPE.times.list.includes(i.type)) {
+                    if (!i.times) {
+                        canPassTask = {
+                            status: false,
+                            message: constants_1.TASK_TYPE_TEXT[i.type] + '任务次数必须配置'
+                        };
+                    }
+                }
+                if (constants_1.TASK_CHECK_TYPE.title.list.includes(i.type)) {
+                    if (!i.title) {
+                        canPassTask = {
+                            status: false,
+                            message: constants_1.TASK_TYPE_TEXT[i.type] + '任务标题必须配置'
+                        };
                     }
+                }
+                if (constants_1.TASK_CHECK_TYPE.taskRateType.list.includes(i.type)) {
+                    if (!i.taskRateType) {
+                        canPassTask = {
+                            status: false,
+                            message: constants_1.TASK_TYPE_TEXT[i.type] + '任务类型必须配置'
+                        };
+                    }
+                }
+                i.value = +i.value;
+                i.times = +i.times || '';
+                i.taskRateType = +i.taskRateType || '';
+                return i;
+            });
+            if (!canPassTask.status)
+                return new Error(canPassTask.message);
+            return cb();
+        }
+    }
+};
+var urlCheck = function (link, passUrlList) {
+    if (!link.startsWith('http://') && !link.startsWith('https://')) {
+        return { status: false, message: '页面链接必须以https://或http://开头' };
+    }
+    var passUrl = false;
+    passUrlList.some(function (i) {
+        if (~link.indexOf(i)) {
+            passUrl = true;
+            return true;
+        }
+        return false;
+    });
+    if (!passUrl)
+        return {
+            status: false,
+            message: '域名校验不通过'
+        };
+    return {
+        status: true,
+        message: ''
+    };
 };
 //# sourceMappingURL=saveValidate.js.map
\ No newline at end of file

server/duibats/dist/utils/saveValidate.js.map

-{"version":3,"file":"saveValidate.js","sourceRoot":"","sources":["../../src/utils/saveValidate.ts"],"names":[],"mappings":";AAAA,cAAc;;;;;;;;;;;;;;AAID,QAAA,UAAU,GAAU;IAC/B,KAAK,EAAE;QACL,QAAQ,EAAE,IAAI;QACd,IAAI,EAAE,QAAQ;QACd,SAAS,YAAC,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM;YAC/B,KAAK,GAAG,KAAK,CAAC,IAAI,EAAE,CAAA;YACpB,IAAI,CAAC,KAAK;gBAAE,OAAO,IAAI,KAAK,CAAC,QAAQ,CAAC,CAAA;YACtC,IAAI,KAAK,CAAC,MAAM,GAAG,EAAE;gBAAE,OAAO,IAAI,KAAK,CAAC,cAAc,CAAC,CAAA;YACvD,OAAO,EAAE,EAAE,CAAA;QACb,CAAC;KACF;IACD,IAAI,EAAE;QACJ,QAAQ,EAAE,IAAI;QACd,OAAO,EAAE,UAAU;KACpB;IACD,SAAS,EAAE;QACT,QAAQ,EAAE,IAAI;QACd,SAAS,YAAC,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM;YACvB,IAAA,OAAO,GAAiB,MAAM,QAAvB,EAAE,UAAU,GAAK,MAAM,WAAX,CAAW;YACtC,IAAI,CAAC,KAAK;gBAAE,OAAO,IAAI,KAAK,CAAC,WAAW,CAAC,CAAA;YACzC,IAAI,KAAK,GAAG,OAAO;gBAAE,OAAO,IAAI,KAAK,CAAC,cAAc,CAAC,CAAA;YACrD,IAAI,CAAC,UAAU,IAAI,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE;gBAAE,OAAO,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAA;YAC1E,OAAO,EAAE,EAAE,CAAA;QACb,CAAC;KACF;IACD,OAAO,EAAE;QACP,QAAQ,EAAE,IAAI;QACd,SAAS,YAAC,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM;YAC/B,IAAI,CAAC,KAAK;gBAAE,OAAO,IAAI,KAAK,CAAC,WAAW,CAAC,CAAA;QAC3C,CAAC;KACF;IACD,KAAK,EAAE;QACL,QAAQ,EAAE,IAAI;QACd,SAAS,YAAC,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM;YAC/B,IAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,UAAA,IAAI;gBAC1C,6BAAY,KAAK,CAAC,IAAI,CAAC,KAAE,IAAI,MAAA,IAAE;YACjC,CAAC,CAAC,CAAA;YACF,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;gBAAE,OAAO,IAAI,KAAK,CAAC,YAAY,CAAC,CAAA;YACzD,IAAI,WAAW,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,CAAA;QACjD,CAAC;KACF;CACF,CAAA"}
\ No newline at end of file
+{"version":3,"file":"saveValidate.js","sourceRoot":"","sources":["../../src/utils/saveValidate.ts"],"names":[],"mappings":"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"}
\ No newline at end of file

server/duibats/mockServer/sdk/request.js

@@ -11,7 +11,7 @@ const request = async (path, params) => {
   })
   if (!res.data.data) {
     console.log(`调用${path}${JSON.stringify(params)}\n返回结果`, res.data)
-    return false
+    return res.data
   }
   return res.data.data
 }

server/duibats/src/config/index.ts

@@ -15,5 +15,5 @@ const configs = {
 
 export const getConfig = (context: Context): Iconfig => {
   const env = context.env
-  return configs[env] || configs.test
+  return configs[env] || configs.online
 }

server/duibats/src/constants.ts

@@ -170,9 +170,11 @@ export const GOODSINFO =
 
 export const EIGHT_HOURS = 60 * 60 * 8 * 1000
 
+export const _48_HOURS = 48 * 60 * 60 * 1000
+
 export const DELETE_STATUS = {
-  DELETE: 2,
-  EXIST: 1
+  EXIST: 1,
+  DELETE: 2
 }
 
 export const TASK_TYPE_TEXT = {
@@ -217,6 +219,59 @@ export const TASK_CHECK_TYPE = {
   link: { list: ['jumpLink'] }
 }
 
+export const PASS_URL_LIST: string[] = [
+  '1688.cn',
+  '1688.com',
+  'alibaba.cn',
+  'alibaba.com',
+  'aliexpress.com',
+  'alimama.cn',
+  'alimama.com',
+  'alipay.com.cn',
+  'alipay.com',
+  'alipay.net',
+  'aliplay.com',
+  'alisoft.cn',
+  'alisoft.com',
+  'aliyun.com',
+  'aliyun.net',
+  'koubei.cn',
+  'koubei.com',
+  'taobao.cn',
+  'taobao.com',
+  'taobao.net',
+  'tb.cn',
+  'tmall.com',
+  'zhifu.com',
+  'zhifubao.com',
+  'juhuasuan.com',
+  'tmall.hk',
+  'tmall.com.hk',
+  'jiyoujia.com',
+  'pailitao.com',
+  'cainiao.com',
+  'dingtalk.com',
+  'yushanfang.com',
+  'guoguo-app.com',
+  'alihealth.cn',
+  'miaostreet.com',
+  'uc123.com',
+  'uc.cn',
+  'ucweb.com',
+  'aliyun-inc.com',
+  'cainiaoyizhan.com',
+  'umeng.com',
+  'aliplus.com',
+  'aliplay.com',
+  'taopiaopiao.com',
+  'youku.com',
+  'tudou.com',
+  'xinlingshou.cn',
+  'fliggy.com',
+  'feizhu.com',
+  'feizhu.cn'
+]
+
 //saas订购码 根据需求改变
 export const APP_SUB_CODE: string = 'FW_GOODS-1001086450'
 

server/duibats/src/controller/save.controller.ts

 /** @format */
 
-import { CODE_TYPES } from './../constants'
+import { CODE_TYPES, _48_HOURS } from './../constants'
 import { services, paramsCheck, paramsValidate } from '../decorator'
 import { resultsModel } from '../sdk'
 import { ActivityconfigService } from '../service'
 import { saveParams } from '../utils/saveValidate'
+
+// 奖品参数
+interface ISavePrizeParams {
+  prizeList?: Array<IActivityPrize>
+}
+
+// interface IActivityInfo {
+//   baseConfig: IActivityBaseInfo
+//   prizeConfig: Array<IActivityPrize>
+// }
+
 interface ISaveActivityContext extends Context {
-  data: {
-    activityId?: string
-    title: string
-    startTime: number
-    endTime: number
-    tasks: ITasks
-    rule: string
-  }
+  data: IActivityBaseInfo & ISavePrizeParams
 }
 
 export default class ActivitSaveController {
@@ -24,13 +28,55 @@ export default class ActivitSaveController {
   @paramsValidate(saveParams)
   @services([ActivityconfigService])
   async saveActivityInfo(context: ISaveActivityContext, {}, [activityconfigService]: [ActivityconfigService]) {
-    const { title = '', activityId = '', startTime, endTime, tasks = {}, rule } = context.data
+    const { title = '', activityId = '', startTime, endTime, tasks = {}, rule, prizeList } = context.data
+    const { openId } = context
+
+    // 存在b_activity_config表里属于基础配置
+    const baseData: IActivityBaseInfo = {
+      title,
+      startTime,
+      endTime,
+      rule,
+      openId,
+      tasks,
+      // 奖品过期时间, 根据需求领奖是否有过期时间
+      awardReceiveExpiredTime: endTime + _48_HOURS
+    }
 
-    const nowTime = Date.now()
+    // 所有奖品均存在b_prize_config表里,  根据需求定义的奖品参数都要整合到allPrizeLists里
+    const allPrizeList: Array<IActivityPrize> = [...prizeList]
 
-    let initialData
-    if (activityId) {
-      initialData = await activityconfigService.getActivityInfoByActivityId(activityId)
+    // 保存新活动
+    if (!activityId) {
+      // 所有奖品均存在b_prize_config表里,  根据需求定义的奖品参数都要整合到prizeList里
+      const result = await activityconfigService.saveNewActivity(baseData, allPrizeList, openId)
+      if (result || result === 0) {
+        return resultsModel.success(true)
+      } else {
+        console.log(result, '保存活动失败')
+        return resultsModel.error(CODE_TYPES.SYSTEM_ERROR, '保存活动失败')
+      }
+    }
+    // 有activityId 属于修改活动
+    else {
+      // 更新b_activity_config基础信息
+      let result = await activityconfigService.updateBaseConfigInfo(activityId, baseData)
+
+      // 找到更新的和删除的奖品id
+      const { bothIds, deleteIds } = await activityconfigService.diffPrizeList(activityId, allPrizeList)
+
+      // 将删除的奖品逻辑删除
+      result = await activityconfigService.deletePrizeByIds(deleteIds)
+
+      // 添加和更新奖品
+      result = await activityconfigService.insertAndUpdatePrize(activityId, allPrizeList, bothIds)
+
+      if (result || result === 0) {
+        return resultsModel.success(true)
+      } else {
+        console.log(result, '保存活动失败')
+        return resultsModel.error(CODE_TYPES.SYSTEM_ERROR, '保存活动失败')
+      }
     }
   }
 }

server/duibats/src/service/activityconfig.service.ts

@@ -14,10 +14,10 @@ export default class ActivityConfigService {
   }
 
   //保存新建活动
-  async saveNewActivity(data, prize, openId) {
+  async saveNewActivity(baseConfig: IActivityBaseInfo, prize: Array<IActivityPrize>, openId: string) {
     try {
-      let result = await this.activityconfigDao.count({
-        ...data,
+      let result = await this.activityconfigDao.insertOne({
+        ...baseConfig,
         createTime: Date.now(),
         updateTime: Date.now(),
         deleteStatus: DELETE_STATUS.EXIST,
@@ -26,13 +26,15 @@ export default class ActivityConfigService {
       console.log(result, '保存基础配置result')
       if (result) {
         try {
-          prize.map(item => {
-            item.activityId = result
-            item.openId = openId
-            item.createTime = Date.now()
-            item.updateTime = Date.now()
-            item.deleteStatus = DELETE_STATUS.EXIST
-            return item
+          prize = prize.map(item => {
+            return {
+              ...item,
+              activityId: result,
+              openId,
+              createTime: Date.now(),
+              updateTime: Date.now(),
+              deleteStatus: DELETE_STATUS.EXIST
+            }
           })
           return await this.activityconfigPrizeDao.insertMany(prize)
         } catch (e) {
@@ -50,11 +52,9 @@ export default class ActivityConfigService {
   }
 
   // 更新活动基本信息
-  async updateBaseConfigInfo(id, data) {
+  async updateBaseConfigInfo(id: string, data: IActivityBaseInfo) {
     return await this.activityconfigDao.update(
-      {
-        _id: id
-      },
+      { _id: id },
       {
         $set: {
           ...data,
@@ -90,6 +90,32 @@ export default class ActivityConfigService {
     )
   }
 
+  async deletePrizeByIds(ids: string[]) {
+    let result: any
+    for (let i = 0; i < ids.length; i++) {
+      result = await this.updateDeleteStatusById(ids[i])
+    }
+    return result
+  }
+
+  async insertAndUpdatePrize(activityId: string, allPrizeList: Array<IActivityPrize>, bothIds: string[]) {
+    let result: any
+    for (let i = 0; i < allPrizeList.length; i++) {
+      // 新奖品
+      const isNewPrize = !allPrizeList[i]._id
+      if (isNewPrize) {
+        result = await this.insertPrizeByActivityId(activityId, allPrizeList[i])
+      }
+
+      // 更新的奖品
+      const isEditPrize = bothIds.includes(allPrizeList[i]._id)
+      if (isEditPrize) {
+        result = await this.updateOnePrizeById(allPrizeList[i]._id, allPrizeList[i])
+      }
+      return result
+    }
+  }
+
   // 更新单条数据
   async updateOnePrizeById(id, data) {
     return await this.activityconfigPrizeDao.update(
@@ -118,10 +144,41 @@ export default class ActivityConfigService {
   }
 
   // 获取奖品所有配置
-  async getAllOldPrizeList(activityId) {
-    return await this.activityconfigPrizeDao.find({
-      activityId
-    })
+  async getAllOldPrizeList(activityId: string) {
+    return await this.activityconfigPrizeDao.find({ activityId })
+  }
+
+  // 编辑活动时, 对比新旧奖品配置, 找出删除的id和更新的id
+  async diffPrizeList(activityId: string, pirzeList: Array<IActivityPrize>) {
+    const allNewIds = getIds(pirzeList)
+
+    const oldPrizeList = await this.getAllOldPrizeList(activityId)
+
+    const oldIds = getIds(oldPrizeList)
+
+    let deleteIds: string[] = []
+    let bothIds: string[] = oldIds.reduce((s, i) => {
+      if (allNewIds.includes(i)) {
+        s = [...s, i]
+      } else {
+        deleteIds.push(i)
+      }
+      return s
+    }, [])
+
+    return {
+      deleteIds,
+      bothIds
+    }
+
+    function getIds(pirzeList: Array<IActivityPrize>) {
+      return pirzeList.reduce((s, v) => {
+        if (v._id) {
+          s = [...s, v._id]
+        }
+        return s
+      }, [])
+    }
   }
 
   //更新活动配置
@@ -216,7 +273,10 @@ export default class ActivityConfigService {
   //通过activityId去获取活动配置信息
   async getActivityInfoByActivityId(activityId: string) {
     return {
-      baseConfig: await this.activityconfigDao.findOne({ _id: activityId, deleteStatus: DELETE_STATUS.EXIST }),
+      baseConfig: await this.activityconfigDao.findOne({
+        _id: activityId,
+        deleteStatus: DELETE_STATUS.EXIST
+      }),
       prizeConfig: await this.activityconfigPrizeDao.find(
         { activityId, deleteStatus: DELETE_STATUS.EXIST },
         { sort: { level: 1 } }

server/duibats/src/typings/activity.d.ts

 /** @format */
 interface IActivityBaseInfo {
-  _id: string
+  _id?: string
   activityId?: string
   openId?: string
   rule: string
   startTime: number
   endTime: number
   title: string
-  deleteStatus: 1 | 2
+  deleteStatus?: 1 | 2
   openPrizeStatus?: 1 | 2 | 3 | 4
   remark?: string
   createTime?: number
@@ -17,6 +17,7 @@ interface IActivityBaseInfo {
 }
 
 interface IActivityPrize {
+  _id?: string
   activityId?: string
   ename?: string
   prizeType: 1 | 2
@@ -32,7 +33,8 @@ interface IActivityPrize {
   useUrl?: string
   stock: number
   useStock: number
-  deleteStatus: 1 | 2
+  openId?: string
+  deleteStatus: number
   createTime: number
   updateTime: number
 }

server/duibats/src/utils/getSeller.ts

+/** @format */
+
 export const getConsumerSeller = ({ accessToken, openId }) => {
   return {
     // timestamp: formatTime(new Date(), "yyyy-MM-dd hh:mm:ss"),
     open_id: openId,
     // 'appkey': appKey,
     // 'appsecret': secret,
-    session: accessToken,
+    session: accessToken
     // REST_URL: 'http://gw.api.taobao.com/router/rest'
-  };
-};
\ No newline at end of file
+  }
+}

server/duibats/src/utils/saveValidate.ts

 /** @format */
 
 import { Rules } from 'async-validator'
+import { TASK_CHECK_TYPE, TASK_TYPE_TEXT, PASS_URL_LIST } from '../constants'
 
 export const saveParams: Rules = {
   title: {
@@ -41,6 +42,94 @@ export const saveParams: Rules = {
       })
       if (taskList.length === 0) return new Error('任务配置必须配置一项')
       let canPassTask = { status: true, message: '' }
+      taskList.forEach(i => {
+        if (!i.type) {
+          canPassTask = {
+            status: false,
+            message: '任务必须配置'
           }
         }
+        if (TASK_CHECK_TYPE.link.list.includes(i.type)) {
+          if (canPassTask.status) {
+            canPassTask = urlCheck(i.link, PASS_URL_LIST)
+          }
+        }
+        if (TASK_CHECK_TYPE.itemIds.list.includes(i.type)) {
+          if (!i.itemIds) {
+            canPassTask = {
+              status: false,
+              message: TASK_TYPE_TEXT[i.type] + '必须配置'
+            }
+          }
+        }
+        if (TASK_CHECK_TYPE.value.list.includes(i.type)) {
+          if (!i.value) {
+            canPassTask = {
+              status: false,
+              message: TASK_TYPE_TEXT[i.type] + '任务值必须配置'
+            }
+          }
+          if (!TASK_CHECK_TYPE.value.reg.test(i.value)) {
+            canPassTask = {
+              status: false,
+              message: TASK_TYPE_TEXT[i.type] + '任务值在' + TASK_CHECK_TYPE.value.regName
+            }
+          }
+        }
+        if (TASK_CHECK_TYPE.times.list.includes(i.type)) {
+          if (!i.times) {
+            canPassTask = {
+              status: false,
+              message: TASK_TYPE_TEXT[i.type] + '任务次数必须配置'
+            }
+          }
+        }
+        if (TASK_CHECK_TYPE.title.list.includes(i.type)) {
+          if (!i.title) {
+            canPassTask = {
+              status: false,
+              message: TASK_TYPE_TEXT[i.type] + '任务标题必须配置'
+            }
+          }
+        }
+        if (TASK_CHECK_TYPE.taskRateType.list.includes(i.type)) {
+          if (!i.taskRateType) {
+            canPassTask = {
+              status: false,
+              message: TASK_TYPE_TEXT[i.type] + '任务类型必须配置'
+            }
+          }
+        }
+        i.value = +i.value
+        i.times = +i.times || ''
+        i.taskRateType = +i.taskRateType || ''
+        return i
+      })
+      if (!canPassTask.status) return new Error(canPassTask.message)
+      return cb()
+    }
+  }
+}
+
+const urlCheck = (link: string, passUrlList: string[]) => {
+  if (!link.startsWith('http://') && !link.startsWith('https://')) {
+    return { status: false, message: '页面链接必须以https://或http://开头' }
+  }
+  let passUrl = false
+  passUrlList.some(i => {
+    if (~link.indexOf(i)) {
+      passUrl = true
+      return true
+    }
+    return false
+  })
+  if (!passUrl)
+    return {
+      status: false,
+      message: '域名校验不通过'
+    }
+  return {
+    status: true,
+    message: ''
+  }
 }