|
@@ -226,20 +226,14 @@ class PayProc {
|
|
|
}
|
|
|
$user->base()->Add_Cash($cash);
|
|
|
self::$retArr[] = "2,".$cash;
|
|
|
- }
|
|
|
+ }
|
|
|
elseif ($order->product_id >= 801001 && $order->product_id <= 801999) {//限购
|
|
|
self::checklimitBuyRecharge($order->product_id);
|
|
|
- }
|
|
|
+ }
|
|
|
elseif ($order->product_id >= 804001 && $order->product_id <= 804999) {//每日特惠
|
|
|
$mo = GameConfig::shop_limit_getItem($order->product_id);
|
|
|
- if($mo == null){//校验看看是不是60元特惠礼包
|
|
|
- $list = GameConfig::shop_limit_type_getItemArray(Enum_Recharge::DaliySpecialPackages);
|
|
|
- $cur = 0;
|
|
|
- foreach ($list as $item) {
|
|
|
- $cur += $item->price;
|
|
|
- }
|
|
|
- //这临时先注释为了测试正式的应该解开注释
|
|
|
- //my_Assert($cur == $order->amount, ErrCode::err_const_no);
|
|
|
+ my_Assert($mo!=null, ErrCode::err_const_no);
|
|
|
+ if($mo->price == 60){
|
|
|
$user->shopdata->daliySpecial_ts = now();
|
|
|
} else {
|
|
|
$itemid = explode(',', $mo->reward)[0];
|
|
@@ -248,7 +242,7 @@ class PayProc {
|
|
|
StoreProc::AddMultiItemInStore($itemMO->contents);
|
|
|
$user->shopdata->daliySpecialPackages[] = $mo->typeId;
|
|
|
self::$retArr[] = $itemMO->contents;
|
|
|
- }
|
|
|
+ }
|
|
|
}
|
|
|
elseif ($order->product_id >= 805001 && $order->product_id <= 805999) {//限时
|
|
|
$mo = GameConfig::shop_limit_getItem($order->product_id);
|
|
@@ -259,8 +253,7 @@ class PayProc {
|
|
|
$itemid = explode(',', $mo->reward)[0];
|
|
|
$itemMO = GameConfig::item_package_getItem($itemid);
|
|
|
my_Assert(null != $itemMO, ErrCode::err_const_no);
|
|
|
- StoreProc::AddMultiItemInStore($itemMO->contents); //领取奖励
|
|
|
- //StoreProc::AddMultiItemInStore($mo->reward);
|
|
|
+ StoreProc::AddMultiItemInStore($itemMO->contents); //领取奖励
|
|
|
self::$retArr[] = $itemMO->contents;
|
|
|
}
|
|
|
elseif ($order->product_id >= 901001 && $order->product_id <= 999999) {//月卡
|
|
@@ -305,19 +298,8 @@ class PayProc {
|
|
|
//该功能暂时没有开发
|
|
|
}
|
|
|
elseif ($order->product_id >= 804001 && $order->product_id <= 804999) {//每日特惠
|
|
|
- $mo = GameConfig::shop_limit_getItem($order->product_id);
|
|
|
- $num = 0;
|
|
|
- if($mo == null){//校验看看是不是60元特惠礼包
|
|
|
- $list = GameConfig::shop_limit_type_getItemArray(Enum_Recharge::DaliySpecialPackages);
|
|
|
- $cur = 0;
|
|
|
- foreach ($list as $item) {
|
|
|
- $cur += $item->price;
|
|
|
- }
|
|
|
- $num = $cur;
|
|
|
- } else {
|
|
|
- $num = $mo->price;
|
|
|
- }
|
|
|
- my_Assert($num == $order->amount, ErrCode::pay_price_err);
|
|
|
+ $mo = GameConfig::shop_limit_getItem($order->product_id);
|
|
|
+ my_Assert($mo->price == $order->amount, ErrCode::pay_price_err);
|
|
|
}
|
|
|
elseif ($order->product_id >= 805001 && $order->product_id <= 805999) {//限时
|
|
|
//该功能暂时没有开发
|