🐞 fix(shop): 修复弱网下商品可买次数为负问题

This commit is contained in:
dingchaolin
2023-03-06 15:00:28 +08:00
parent df88325372
commit 7719a2ad86
4 changed files with 63 additions and 4 deletions
@@ -6,11 +6,12 @@ import { UserShopModel } from "../../../db/UserShop";
import { handleCost, addItems } from "../../../services/role/rewardService";
import { SHOP } from "../../../pubUtils/dicParam";
import { HeroModel } from "../../../db/Hero";
import { checkShopInPurchase, getShopDicById, getShopListByType, getShopPrice } from "../../../services/shopService";
import { checkShopInPurchase, getShopDicById, getShopListByType, getShopPrice, getShopMaxBuyTimes } from "../../../services/shopService";
import { RewardInter } from "../../../pubUtils/interface";
import { UserShopTypeModel } from "../../../db/UserShopType";
import { nowSeconds } from "../../../pubUtils/timeUtil";
import { isGoodsHidden } from "../../../services/dataService";
import { RoleModel } from './../../../db/Role';
export default function(app: Application) {
return new ShopHandler(app);
@@ -70,14 +71,28 @@ export class ShopHandler {
return resResult(checkResult);
}
// 总计可买次数(从配置表读取)
const totalCanBuyTimes = getShopMaxBuyTimes(dicShopItem.price);
if (!totalCanBuyTimes || totalCanBuyTimes <= 0) {
return resResult(STATUS.BATTLE_CONSUMES_NOT_ENOUGH);
}
// 最大已买次数 = 总计可买次数 - 本次要买次数
const maxAlreadyBuyTimes = totalCanBuyTimes - count;
// 消耗
let cost = getShopPrice(dicShopItem.money, count, userShop?.count||0, dicShopItem.price);
let costResult = await handleCost(roleId, sid, cost, ITEM_CHANGE_REASON.SHOP_PURCHASE);
if(!costResult) return resResult(STATUS.BATTLE_CONSUMES_NOT_ENOUGH);
// 次数
userShop = await UserShopModel.purchase(roleId, roleName, activityId, dicShopItem, count, seasonNum);
if(!userShop) return resResult(STATUS.BUY_COUNT_OVER);
userShop = await UserShopModel.protectedPurchase(roleId, roleName, activityId, dicShopItem, count, seasonNum, maxAlreadyBuyTimes);
if (!userShop) {
// rollback 消耗
let role = await RoleModel.findByRoleId(roleId);
addItems(roleId, role.roleName, sid, cost, ITEM_CHANGE_REASON.SHOP_PURCHASE);
return resResult(STATUS.BUY_COUNT_OVER);
}
// 获得
let reward = [{
+16
View File
@@ -106,6 +106,22 @@ export function getShopPrice(goodId: number, count: number, buyCount: number, st
}]
}
/**
* 获取商品的最大购买次数
*
* @export
* @param {string} str 比如: 1&0|2&50|3&100|4&150|5&200
*/
export function getShopMaxBuyTimes(str: string) {
let arr = parseShopPrice(str);
for (let { times, maxTimes } of arr) {
if (maxTimes === -1) {
return times;
}
}
return 0;
}
function parseShopPrice(str: string) {
let result = new Array<{ times: number, price: number, maxTimes: number }>();
if (!str) return result;