活动：元宝充值商店

game-server/app/servers/activity/handler/yuanbaoShopHandler.ts

@@ -0,0 +1,32 @@
+import { Application, BackendSession } from 'pinus';
+import { resResult } from '../../../pubUtils/util';
+import { STATUS, ACTIVITY_RESOURCES_TYPE, ACTIVITY_TYPE } from '../../../consts';
+import { yuanbaoActivity, getPlayerYuanbaoShopData } from '../../../services/yuanbaoService';
+
+
+export default function (app: Application) {
+    return new YuanbaoShopHandler(app);
+}
+
+export class YuanbaoShopHandler {
+    constructor(private app: Application) {
+    }
+
+    /************************元宝商店****************************/
+
+    /**
+    * @description 获取商店活动数据
+    * @param {BackendSession} session
+    * @memberof YuanbaoShopHandler
+    */
+    async getShopActivity(msg: { activityId: number }, session: BackendSession) {
+        const { activityId } = msg;
+        const roleId = session.get('roleId');
+        const serverId = session.get('serverId');
+
+        let playerData = await getPlayerYuanbaoShopData(activityId, serverId, roleId);
+        if (!playerData) return resResult(STATUS.ACTIVITY_MISSING);
+
+        return resResult(STATUS.SUCCESS, playerData);
+    }
+}

game-server/app/servers/order/handler/orderHandler.ts

@@ -1,8 +1,6 @@
 import { Application, BackendSession } from 'pinus';
 import { genCode, resResult } from '../../../pubUtils/util';
 import { ACTIVITY_TYPE, ORDER_STATE, PAY_TYPE, STATUS } from '../../../consts';
-import { RoleModel } from '../../../db/Role';
-import { addReward, stringToRewardParam, useGiftPackage } from '../../../services/giftPackageService';
 import { dicRMB } from '../../../pubUtils/dictionary/DicRMB';
 import { UserOrderModel } from '../../../db/UserOrder';
 import _ = require('underscore');
@@ -22,15 +20,16 @@ export class orderHandler {
 
     /**
     * @description 获取订单号
-    * @param {{productID:string, payType:number  }} msg
+    * @param {{productID:string, payType:number ,activityId: number }} msg
     * @param {BackendSession} session
     * @memberof orderHandler
     */
-    async applyOrder(msg: { productID: string, payType: number }, session: BackendSession) {
-        const { productID, payType } = msg;
+    async applyOrder(msg: { productID: string, payType: number, activityId: number }, session: BackendSession) {
+        const { productID, payType, activityId } = msg;
         const roleId = session.get('roleId');
         const serverId = session.get('serverId');
 
+        //如果有特殊情况，activityId可为0
         if (!productID || !_.isString(productID) || !payType || !_.isNumber(payType)) {
             return resResult(STATUS.WRONG_PARMS);
         }
@@ -80,7 +79,7 @@ export class orderHandler {
                 console.log('未知支付类型');
                 return resResult(STATUS.NO_PAY_TYPE);
         }
-        await UserOrderModel.applyOrder(serverId, roleId, productID, localOrderID, orderID, price, payType);
+        await UserOrderModel.applyOrder(serverId, roleId, productID, localOrderID, orderID, price, payType, activityId);
         return resResult(STATUS.SUCCESS, { orderInfo: sdkOrderInfo, productInfo, localOrderID });
     }
 
@@ -174,7 +173,7 @@ export class orderHandler {
         orderInfo = await UserOrderModel.success(roleId, localOrderID);
         if (orderInfo) {
             //结算奖励
-            let result = await makeOrder(localOrderID);
+            let result = await makeOrder(localOrderID, sid);
             console.log('结算完成', localOrderID)
             return resResult(STATUS.SUCCESS, result);
         }