xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

商店：不需要后台了，删除一部分后台相关的

Browse Source
This commit is contained in:
luying
2021-09-16 19:25:47 +08:00
parent fd6d2ac2e3
commit 063d46e4db
3 changed files with 14 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
game-server/app/servers/role/handler/shopHandler.ts
View File

@@ -62,16 +62,6 @@ export class ShopHandler {
if(!hero) return resResult(STATUS.SKIN_HAS_NOT_HERO);
}
let dbShop = await DicShopListModel.findByShopId(dicShopItem.shop);
let discount = 1;
if(dbShop) {
let item = dbShop.items.find(cur => cur.id == shopItemId);
if(item) {
discount = item.discount;
}
}
let userShop = await UserShopModel.findByRoleAndItem(roleId, dicShopItem.id);
if(dicShopItem.purchaseLimit != -1) {
if(userShop && userShop.count + count > dicShopItem.purchaseLimit) {
@@ -82,7 +72,7 @@ export class ShopHandler {
// 消耗
let cost = [{
id: dicShopItem.money,
count: Math.round(dicShopItem.price * count * discount)
count: Math.round(dicShopItem.price * count)
}];
let costResult = await handleCost(roleId, sid, cost);
if(!costResult) return resResult(STATUS.BATTLE_CONSUMES_NOT_ENOUGH);
@@ -151,14 +141,6 @@ export class ShopHandler {
});
}
// !测试接口，初始化：将json表中的内容加入数据库内
async initShopList() {
let index = gameData.shopItem.size;
for(let [id, dic] of gameData.shopItem) {
await DicShopListModel.createShop(dic.shop, true, { id, order: index--, discount: 1 })
}
}
// !测试接口。 去除限购次数
async debugClearPurchaseLimit(msg: { }, session: BackendSession) {
let roleId = session.get('roleId');

38
game-server/app/services/shopService.ts
View File

@@ -1,47 +1,19 @@
import { gameData } from "../pubUtils/data";
import { DicShopListModel } from "../db/DicShopList";
import { ShopItem } from "../domain/dbGeneral";
import { ShopItemListParam } from '../domain/roleField/shop';
import { UserShopModel } from "../db/UserShop";
export async function getShopListById(shopId: number, roleId: string) {
let shopItemList = new Array<ShopItemListParam>(); // 返回
let dbDicShop = await DicShopListModel.findByShopId(shopId);
let userShopRecs = await UserShopModel.findMapByShopId(roleId, shopId);
// console.log(JSON.stringify([...userShopRecs]))
let dicShop = gameData.shop.get(shopId)||[];
for(let { id, type } of dicShop) {
let buyCount = userShopRecs.has(id)?userShopRecs.get(id).count: 0;
if(!dbDicShop || dbDicShop.useJson) { // 完全使用json中配置的商品，数据库只做排序用，数据库内没有的排到最后
let items = dbDicShop?.items||[];
let map = new Map<number, ShopItem>();
for(let item of items) {
map.set(item.id, item);
}
let dicShop = gameData.shop.get(shopId)||[];
for(let { id, type } of dicShop) {
let buyCount = userShopRecs.has(id)?userShopRecs.get(id).count: 0;
if(map.has(id)) {
let item = map.get(id);
let param = new ShopItemListParam(id, item.discount, type, buyCount, item.order);
shopItemList.push(param);
} else {
let param = new ShopItemListParam(id, 1, type, buyCount, 0);
shopItemList.push(param);
}
}
} else { // 只返回数据库内的商品
let items = dbDicShop?.items||[];
for(let item of items) {
let { id, order, discount } = item;
let buyCount = userShopRecs.has(id)?userShopRecs.get(id).count: 0;
let dicShop = gameData.shopItem.get(id);
if(dicShop) {
let param = new ShopItemListParam(id, discount, dicShop.type, buyCount, order);
shopItemList.push(param);
}
}
let param = new ShopItemListParam(id, 1, type, buyCount, 0);
shopItemList.push(param);
}
shopItemList = shopItemList.sort((a, b) => b.order - a.order);

16
shared/db/DicShopList.ts
View File

@@ -18,15 +18,15 @@ export default class DicShopList extends BaseModel {
@prop({ required: true, default: [], _id: false, type: () => ShopItem })
items: ShopItem[]; // 商店id dic_zyz_shopList内的id
public static async findByShopId(shopId: number) {
const rec: DicShopListType = await DicShopListModel.findOne({ shopId }).lean();
return rec;
}
// public static async findByShopId(shopId: number) {
// const rec: DicShopListType = await DicShopListModel.findOne({ shopId }).lean();
// return rec;
// }
public static async createShop(shopId: number, useJson: boolean, item: ShopItem) {
const rec: DicShopListType = await DicShopListModel.findOneAndUpdate({ shopId }, { useJson, $push: { items: item } }, { new: true, upsert: true }).lean();
return rec;
}
// public static async createShop(shopId: number, useJson: boolean, item: ShopItem) {
// const rec: DicShopListType = await DicShopListModel.findOneAndUpdate({ shopId }, { useJson, $push: { items: item } }, { new: true, upsert: true }).lean();
// return rec;
// }
}