活动：支付添加错误码返回

game-server/app/services/popUpShopService.ts

@@ -1,4 +1,4 @@
-import { ACTIVITY_TYPE, TASK_TYPE } from '../consts';
+import { ACTIVITY_TYPE, STATUS, TASK_TYPE } from '../consts';
 import { ActivityModel, ActivityModelType } from '../db/Activity';
 import { PopUpShopData, } from '../domain/activityField/popUpShopField';
 import { RewardParam } from '../domain/activityField/rewardField';
@@ -69,23 +69,26 @@ export async function makePopUpShopReward(roleId: string, roleName: string, sid:
     activityId: number, productID: string) {
     let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
     if (!activityData) {
-        return null;
+        return STATUS.ACTIVITY_MISSING;
     }
     if (activityData.type !== ACTIVITY_TYPE.POP_UP_SHOP) {
-        return null;
+        return STATUS.ACTIVITY_TYPE_ERROR;
     }
     let allTaskData: any[] = JSON.parse(activityData.data);
     let taskIndex = allTaskData.findIndex(obj => { return obj && obj.data.productID == productID });
     if (taskIndex == -1) {
-        return null;
+        return STATUS.ACTIVITY_NO_PRODUCT;
     }
     let playerData = new PopUpShopData(allTaskData[taskIndex]);
     let playerRecords: ActivityPopUpShopModelType = await ActivityPopUpShopModel.addRecord(serverId, activityId, roleId, playerData.id);
     if (!playerRecords) {
-        return null;
+        return STATUS.APPLY_ORDER_ERROR;
     }
 
     let rewardParamArr: Array<RewardParam> = stringToRewardParam(playerData.reward);
     let result = await addReward(roleId, roleName, sid, serverId, funcs, rewardParamArr)
-    return Object.assign(result, { item: { isBuy: true }, activityId: activityData.activityId })
+    return {
+        code: 0,
+        data: Object.assign(result, { item: { isBuy: true }, activityId: activityData.activityId })
+    }
 }