fe / YOHOBUYPC · Commits

Go to a project

Authored by 郝肖肖
Commit fc433a038a6d9831d9dc5d06a5b6aa9f3aa55096 2 parents 9c6ec27e e9cbef62

Merge branch 'release/5.2' of git.yoho.cn:fe/YOHOBUYPC into release/5.2

Inline Side-by-side
Showing 6 changed files with 4 additions and 6 deletions
... ... @@ -200,7 +200,7 @@ class OrderData
* @param type $address_id
* @return type
*/
public static function updateDeliveryAddress($order_code, $user_name, $area_code, $address, $mobile, $phone)
public static function updateDeliveryAddress($order_code, $user_name, $area_code, $address, $mobile, $phone, $uid)
{
// 构建必传参数
$param = Yohobuy::param();
... ... @@ -210,6 +210,7 @@ class OrderData
$param['area_code'] = $area_code;
$param['address'] = $address;
$param['mobile'] = $mobile;
$param['uid'] = $uid;
if($phone){
$param['phone'] = $phone;
}
... ...
... ... @@ -281,7 +281,6 @@ function addPoint(operate, parameter) {
window._yas.sendCustomInfo({
'op': operate,
'uid': getUid(),
'param': JSON.stringify(parameter)
}, true);
}
... ... @@ -294,7 +293,6 @@ function givePoint(parameter) {
'REC_ID': RECID,
'PRD_ID': '',
'PRD_NUM': 0,
'C_ID': CID,
'ACTION_ID': 0,
'page_num': 1
}, parameter);
... ...
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
... ... @@ -223,7 +223,6 @@ function addPoint(operate, parameter) {
window._yas.sendCustomInfo({
'op': operate,
'uid': getUid(),
'param': JSON.stringify(parameter)
}, true);
}
... ... @@ -236,7 +235,6 @@ function givePoint(parameter) {
'REC_ID': RECID,
'PRD_ID': '',
'PRD_NUM': 0,
'C_ID': CID,
'ACTION_ID': 0,
'page_num': 1
}, parameter);
... ...
... ... @@ -266,7 +266,8 @@ class OrdersController extends WebAction
$result = array('code' => 400, 'message' => '缺失必填项', 'data' => '');
break;
}
$result = OrderData::updateDeliveryAddress($order_code, $user_name, $area_code, $address, $mobile, $phone);
$uid = $this->getUid();
$result = OrderData::updateDeliveryAddress($order_code, $user_name, $area_code, $address, $mobile, $phone, $uid);
if (!isset($result['code'])) {
break;
}
... ...