|
@@ -113,14 +113,14 @@ class StoreProc {
|
|
if($type == 1){
|
|
if($type == 1){
|
|
my_Assert($num < 50, ErrCode::store_StorageEnough);
|
|
my_Assert($num < 50, ErrCode::store_StorageEnough);
|
|
$equipVo = $store->equipment->$uid;
|
|
$equipVo = $store->equipment->$uid;
|
|
- $storage->equipmentlist->$uid = $equipVo;//添加
|
|
|
|
|
|
+ $storage->equipment->$uid = $equipVo;//添加
|
|
|
|
|
|
StoreProc::removeEquipFromStore($uid, $equipVo->typeId);//移除
|
|
StoreProc::removeEquipFromStore($uid, $equipVo->typeId);//移除
|
|
} else {
|
|
} else {
|
|
- $equipVo = $storage->equipmentlist->$uid;
|
|
|
|
|
|
+ $equipVo = $storage->equipment->$uid;
|
|
$store->equipment->$uid = $equipVo;
|
|
$store->equipment->$uid = $equipVo;
|
|
|
|
|
|
- unset($storage->equipmentlist->$uid);
|
|
|
|
|
|
+ unset($storage->equipment->$uid);
|
|
}
|
|
}
|
|
|
|
|
|
break;
|
|
break;
|
|
@@ -128,14 +128,14 @@ class StoreProc {
|
|
if($type == 1){
|
|
if($type == 1){
|
|
my_Assert($num < 50, ErrCode::store_StorageEnough);
|
|
my_Assert($num < 50, ErrCode::store_StorageEnough);
|
|
$yanlingVo = $store->yanling->$uid;
|
|
$yanlingVo = $store->yanling->$uid;
|
|
- $storage->yanlinglist->$uid = $yanlingVo;//添加
|
|
|
|
|
|
+ $storage->yanling->$uid = $yanlingVo;//添加
|
|
|
|
|
|
StoreProc::removeYanlingFromStore($uid, $yanlingVo->typeId);//移除
|
|
StoreProc::removeYanlingFromStore($uid, $yanlingVo->typeId);//移除
|
|
} else {
|
|
} else {
|
|
- $yanlingVo = $storage->yanlinglist->$uid;
|
|
|
|
|
|
+ $yanlingVo = $storage->yanling->$uid;
|
|
$store->yanling->$uid = $yanlingVo;
|
|
$store->yanling->$uid = $yanlingVo;
|
|
|
|
|
|
- unset($storage->yanlinglist->$uid);
|
|
|
|
|
|
+ unset($storage->yanling->$uid);
|
|
}
|
|
}
|
|
|
|
|
|
break;
|
|
break;
|
|
@@ -143,17 +143,17 @@ class StoreProc {
|
|
if($type == 1){
|
|
if($type == 1){
|
|
my_Assert($num < 50, ErrCode::store_StorageEnough);
|
|
my_Assert($num < 50, ErrCode::store_StorageEnough);
|
|
$itemNum = $store->items->$uid;
|
|
$itemNum = $store->items->$uid;
|
|
- if(!StlUtil::dictHasProperty($storage->itemlist, $uid)){
|
|
|
|
- $storage->itemlist->$uid = 0;
|
|
|
|
|
|
+ if(!StlUtil::dictHasProperty($storage->itemDic, $uid)){
|
|
|
|
+ $storage->itemDic->$uid = 0;
|
|
}
|
|
}
|
|
- $storage->itemlist->$uid += $itemNum;//添加
|
|
|
|
|
|
+ $storage->itemDic->$uid += $itemNum;//添加
|
|
StoreProc::removeItemFromStore($store, $uid, $itemNum);
|
|
StoreProc::removeItemFromStore($store, $uid, $itemNum);
|
|
} else {
|
|
} else {
|
|
- $itemNum = $storage->itemlist->$uid;
|
|
|
|
|
|
+ $itemNum = $storage->itemDic->$uid;
|
|
$goodsStr = $uid.",".$itemNum;
|
|
$goodsStr = $uid.",".$itemNum;
|
|
StoreProc::AddMultiItemInStore($goodsStr);
|
|
StoreProc::AddMultiItemInStore($goodsStr);
|
|
|
|
|
|
- unset($storage->itemlist->$uid);
|
|
|
|
|
|
+ unset($storage->itemDic->$uid);
|
|
}
|
|
}
|
|
|
|
|
|
break;
|
|
break;
|
|
@@ -161,7 +161,7 @@ class StoreProc {
|
|
|
|
|
|
$store->storage->$index = $storage;
|
|
$store->storage->$index = $storage;
|
|
|
|
|
|
- ctx()->store(true) = $store;
|
|
|
|
|
|
+ //ctx()->store(true) = $store;
|
|
UserProc::updateUserInfo();
|
|
UserProc::updateUserInfo();
|
|
|
|
|
|
return Resp::ok(array("store"=>$store,));
|
|
return Resp::ok(array("store"=>$store,));
|