Merge branch 'star' of git.kingsome.cn:server/game2006api into star
This commit is contained in:
commit
3a8e7810f2
@ -1030,7 +1030,8 @@ CREATE TABLE `t_chip_page` (
|
|||||||
`createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间',
|
`createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间',
|
||||||
`modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间',
|
`modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间',
|
||||||
PRIMARY KEY (`idx`),
|
PRIMARY KEY (`idx`),
|
||||||
UNIQUE KEY `account_page_id` (`account_id`, `page_id`)
|
UNIQUE KEY `account_page_id` (`account_id`, `page_id`),
|
||||||
|
KEY `account_id` (`account_id`)
|
||||||
) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
|
) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
|
||||||
/*!40101 SET character_set_client = @saved_cs_client */;
|
/*!40101 SET character_set_client = @saved_cs_client */;
|
||||||
|
|
||||||
@ -1287,7 +1288,7 @@ CREATE TABLE `t_web2_order` (
|
|||||||
`item_id` int(11) NOT NULL COMMENT '物品id',
|
`item_id` int(11) NOT NULL COMMENT '物品id',
|
||||||
`item_num` bigint(20) NOT NULL COMMENT '物品数量',
|
`item_num` bigint(20) NOT NULL COMMENT '物品数量',
|
||||||
`id` int(11) NOT NULL COMMENT '商店中的配置id,',
|
`id` int(11) NOT NULL COMMENT '商店中的配置id,',
|
||||||
`goods_num` int(11) NOT NULL COMMENT '购买商品个数',
|
`goods_num` bigint(20) NOT NULL COMMENT '购买商品个数',
|
||||||
`price` varchar(64) DEFAULT NULL COMMENT '价格',
|
`price` varchar(64) DEFAULT NULL COMMENT '价格',
|
||||||
`ext_data` mediumblob COMMENT '扩展自定义数据',
|
`ext_data` mediumblob COMMENT '扩展自定义数据',
|
||||||
`channel` varchar(64) DEFAULT NULL COMMENT 'google or apple',
|
`channel` varchar(64) DEFAULT NULL COMMENT 'google or apple',
|
||||||
|
@ -62,6 +62,7 @@ CREATE TABLE `t_market_transaction_record` (
|
|||||||
|
|
||||||
|
|
||||||
ALTER TABLE t_web2_order MODIFY COLUMN `item_num` bigint(20) DEFAULT NULL COMMENT '道具数量';
|
ALTER TABLE t_web2_order MODIFY COLUMN `item_num` bigint(20) DEFAULT NULL COMMENT '道具数量';
|
||||||
|
ALTER TABLE t_web2_order MODIFY COLUMN `goods_num` bigint(20) DEFAULT NULL COMMENT '购买商品个数';
|
||||||
ALTER TABLE t_web2_order CHANGE account_Id account_id varchar(64) NOT NULL COMMENT '申请账号id';
|
ALTER TABLE t_web2_order CHANGE account_Id account_id varchar(64) NOT NULL COMMENT '申请账号id';
|
||||||
ALTER TABLE t_web2_order MODIFY COLUMN `createtime` int(11) NOT NULL COMMENT '创建时间';
|
ALTER TABLE t_web2_order MODIFY COLUMN `createtime` int(11) NOT NULL COMMENT '创建时间';
|
||||||
|
|
||||||
|
@ -554,6 +554,10 @@ class MarketController extends BaseAuthedController
|
|||||||
'c_id' => $c_id,
|
'c_id' => $c_id,
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
if (!$r) {
|
||||||
|
$this->_rspErr(3, "sell failed");
|
||||||
|
return;
|
||||||
|
}
|
||||||
$lastId = $this->lastInsertId($conn);
|
$lastId = $this->lastInsertId($conn);
|
||||||
$order_id = $this->genOrderId($lastId);
|
$order_id = $this->genOrderId($lastId);
|
||||||
$test = SqlHelper::update($conn, 't_market_store', array('idx' => $lastId), array('order_id' => $order_id));
|
$test = SqlHelper::update($conn, 't_market_store', array('idx' => $lastId), array('order_id' => $order_id));
|
||||||
|
Loading…
x
Reference in New Issue
Block a user