|
@@ -59,15 +59,27 @@ class PayProc {
|
|
|
return Resp::err(ErrCode::cmd_err);
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ static $retArr;
|
|
|
|
|
|
static function text() {
|
|
|
+ //$result = pay_op::CheckAndDrawOrder(req()->uid,1912111624,array(new PayProc,'distributePayGoods_NEW'));
|
|
|
+ //my_Assert($result->err != 0, ErrCode::shop_firstRechargeNotRepeat);
|
|
|
+ //var_dump($result);
|
|
|
+
|
|
|
return Resp::ok(array(
|
|
|
- "ret"=>null,
|
|
|
+ "ret"=>self::$retArr,
|
|
|
));
|
|
|
}
|
|
|
|
|
|
+ static function distributePayGoods_NEW($order) {
|
|
|
+ $cash = 10;
|
|
|
+
|
|
|
+ self::$retArr = array();
|
|
|
+ self::$retArr[] = "2,".$cash;
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
- static $retArr;
|
|
|
/**
|
|
|
* 领取奖励
|
|
|
* @return type
|
|
@@ -96,8 +108,8 @@ class PayProc {
|
|
|
$ts = $user->shopdata->daliySpecial_ts + 7*24*60*60;
|
|
|
my_Assert(now() < $ts, ErrCode::shop_daliySpecialRewardNotRepeat);
|
|
|
}
|
|
|
-
|
|
|
- $itemMO = GameConfig::item_package_getItem($mo->reward);
|
|
|
+ $itemid = explode(',', $mo->reward)[0];
|
|
|
+ $itemMO = GameConfig::item_package_getItem($itemid);
|
|
|
my_Assert(null != $itemMO, ErrCode::err_const_no);
|
|
|
StoreProc::AddMultiItemInStore($itemMO->contents);
|
|
|
self::$retArr[] =$itemMO->contents;
|
|
@@ -131,11 +143,11 @@ class PayProc {
|
|
|
|
|
|
UserProc::updateUserInfo();
|
|
|
return Resp::ok(array(
|
|
|
+ "ret"=>self::$retArr,
|
|
|
"pay"=>$user->pay,
|
|
|
"shopdata"=>req()->userInfo->game->shopdata,
|
|
|
"base" => $user->baseInfo,
|
|
|
- "store" => $user->store,
|
|
|
- "ret"=>self::$retArr,
|
|
|
+ "store" => $user->store,
|
|
|
));
|
|
|
}
|
|
|
|
|
@@ -182,17 +194,19 @@ class PayProc {
|
|
|
list($cpOrderId) = req()->paras;
|
|
|
$user = req()->userInfo->game;
|
|
|
|
|
|
- pay_op::CheckAndDrawOrder(req()->uid,$cpOrderId,array(new PayProc,'distributePayGoods'));
|
|
|
+ $result = pay_op::CheckAndDrawOrder(req()->uid,$cpOrderId,array(new PayProc,'distributePayGoods'));
|
|
|
+ my_Assert($result->err == 0, ErrCode::pay_fail);
|
|
|
|
|
|
req()->userInfo->game = $user;
|
|
|
|
|
|
UserProc::updateUserInfo(); # 回写玩家数据
|
|
|
return Resp::ok(array(
|
|
|
+ "ret"=>self::$retArr,
|
|
|
"pay"=>$user->pay,
|
|
|
"base" => $user->baseInfo,
|
|
|
"shopdata"=>$user->shopdata,
|
|
|
"store" => $user->store,
|
|
|
- "ret"=>self::$retArr,
|
|
|
+
|
|
|
));
|
|
|
}
|
|
|
|
|
@@ -227,7 +241,8 @@ class PayProc {
|
|
|
//my_Assert($cur == $order->amount, ErrCode::err_const_no);
|
|
|
$user->shopdata->daliySpecial_ts = now();
|
|
|
} else {
|
|
|
- $itemMO = GameConfig::item_package_getItem($mo->reward);
|
|
|
+ $itemid = explode(',', $mo->reward)[0];
|
|
|
+ $itemMO = GameConfig::item_package_getItem($itemid);
|
|
|
my_Assert(null != $itemMO, ErrCode::err_const_no);
|
|
|
StoreProc::AddMultiItemInStore($itemMO->contents);
|
|
|
$user->shopdata->daliySpecialPackages[] = $mo->typeId;
|
|
@@ -240,8 +255,8 @@ class PayProc {
|
|
|
my_Assert(!in_array($order->product_id, $user->shopdata->limitTsActiveRewardsList), ErrCode::err_const_no);
|
|
|
|
|
|
$user->shopdata->limitTsActiveRewardsList[] = $mo->typeId;
|
|
|
-
|
|
|
- $itemMO = GameConfig::item_package_getItem($mo->reward);
|
|
|
+ $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);
|