Authored by 郭成尧

order-address-udid

@@ -223,6 +223,7 @@ exports.chooseAddress = (req, res, next) => { @@ -223,6 +223,7 @@ exports.chooseAddress = (req, res, next) => {
223 let uid = req.user.uid; 223 let uid = req.user.uid;
224 let orderCode = req.query.orderCode; 224 let orderCode = req.query.orderCode;
225 let addressId = decodeURIComponent(req.query.addressId); 225 let addressId = decodeURIComponent(req.query.addressId);
  226 + let udid = req.cookies._yasvd || '';
226 227
227 if (!addressId || !orderCode) { 228 if (!addressId || !orderCode) {
228 return res.json({ 229 return res.json({
@@ -232,7 +233,7 @@ exports.chooseAddress = (req, res, next) => { @@ -232,7 +233,7 @@ exports.chooseAddress = (req, res, next) => {
232 }); 233 });
233 } 234 }
234 235
235 - addressModel.chooseAddress(orderCode, addressId, uid).then(result => { 236 + addressModel.chooseAddress(orderCode, addressId, uid, udid).then(result => {
236 res.json(result); 237 res.json(result);
237 }).catch(next); 238 }).catch(next);
238 }; 239 };
@@ -202,12 +202,13 @@ const newGetAddress = (params) => { @@ -202,12 +202,13 @@ const newGetAddress = (params) => {
202 * 订单详情选择地址 202 * 订单详情选择地址
203 * @param params 203 * @param params
204 */ 204 */
205 -const chooseAddress = (orderCode, addressId, uid) => { 205 +const chooseAddress = (orderCode, addressId, uid, udid) => {
206 return api.get('', { 206 return api.get('', {
207 method: 'app.SpaceOrders.updateDeliveryAddress', 207 method: 'app.SpaceOrders.updateDeliveryAddress',
208 uid: uid, 208 uid: uid,
209 order_code: orderCode, 209 order_code: orderCode,
210 - address_id: crypto.decrypt(null, addressId) 210 + address_id: crypto.decrypt(null, addressId),
  211 + udid: udid
211 }).then((result) => { 212 }).then((result) => {
212 return result; 213 return result;
213 }); 214 });
@@ -13,8 +13,8 @@ const domains = { @@ -13,8 +13,8 @@ const domains = {
13 liveApi: 'http://testapi.live.yohops.com:9999/', 13 liveApi: 'http://testapi.live.yohops.com:9999/',
14 singleApi: 'http://api-test3.yohops.com:9999/', 14 singleApi: 'http://api-test3.yohops.com:9999/',
15 15
16 - api: 'http://api-test3.yohops.com:9999/',  
17 - service: 'http://service-test3.yohops.com:9999/', 16 + api: 'http://api-test2.yohops.com:9999/',
  17 + service: 'http://service-test2.yohops.com:9999/',
18 18
19 // liveApi: 'http://api.live.yoho.cn/', 19 // liveApi: 'http://api.live.yoho.cn/',
20 // singleApi: 'http://single.yoho.cn/', 20 // singleApi: 'http://single.yoho.cn/',