fe / yohobuywap-node · Commits

Go to a project

Authored by zhangxiaoru
Commit 6c2883cffffa76f3c4154353973bbecb6bc48a97 1 parent 5ecd4eb5

orderDetail

Inline Side-by-side
Showing 4 changed files with 103 additions and 92 deletions
@@ -9,11 +9,11 @@ @@ -9,11 +9,11 @@
9 const headerModel = require('../../../doraemon/models/header'); // 头部model 9 const headerModel = require('../../../doraemon/models/header'); // 头部model
10 const orderDetailModel = require('../models/orderDetail'); 10 const orderDetailModel = require('../models/orderDetail');
11 11
12 -const orderDetail = (req, res, next) => {  
13 - let uid = req.user.uid ||8039759;  
14 - let orderCode = req.query.order_code || 1606343171; 12 +const orderDetailData = (req, res, next) => {
  13 + let uid = req.user.uid || 8039759;
  14 + let orderCode = req.query.order_code || 1618346759;
15 15
16 - orderDetailModel.orderDetail(uid, orderCode).then(result => { 16 + orderDetailModel.orderDetailData(uid, orderCode).then(result => {
17 17
18 res.render('orderDetail', { 18 res.render('orderDetail', {
19 module: 'home', 19 module: 'home',
@@ -29,7 +29,7 @@ const orderDetail = (req, res, next) => { @@ -29,7 +29,7 @@ const orderDetail = (req, res, next) => {
29 29
30 }; 30 };
31 31
32 -//删除订单 32 +// 删除订单
33 const delOrder = (req, res, next) => { 33 const delOrder = (req, res, next) => {
34 let orderCode = req.query.order_code || 1612441404; 34 let orderCode = req.query.order_code || 1612441404;
35 let uid = req.user.uid || 8039759; 35 let uid = req.user.uid || 8039759;
@@ -37,9 +37,9 @@ const delOrder = (req, res, next) => { @@ -37,9 +37,9 @@ const delOrder = (req, res, next) => {
37 orderDetailModel.delOrder(orderCode, uid).then((result) => { 37 orderDetailModel.delOrder(orderCode, uid).then((result) => {
38 res.json(result); 38 res.json(result);
39 }).catch(next); 39 }).catch(next);
40 -} 40 +};
41 41
42 -//再次购买 42 +// 再次购买
43 const readdData = (req, res, next) => { 43 const readdData = (req, res, next) => {
44 let orderCode = req.query.order_code || 1606343171; 44 let orderCode = req.query.order_code || 1606343171;
45 let uid = req.user.uid || 8039759; 45 let uid = req.user.uid || 8039759;
@@ -47,21 +47,21 @@ const readdData = (req, res, next) => { @@ -47,21 +47,21 @@ const readdData = (req, res, next) => {
47 orderDetailModel.readdData(orderCode, uid).then((result) => { 47 orderDetailModel.readdData(orderCode, uid).then((result) => {
48 res.json(result); 48 res.json(result);
49 }).catch(next); 49 }).catch(next);
50 -} 50 +};
51 51
52 -//取消订单 52 +// 取消订单
53 const cancelOrder = (req, res, next) => { 53 const cancelOrder = (req, res, next) => {
54 let orderCode = req.query.order_code || 1606343171; 54 let orderCode = req.query.order_code || 1606343171;
55 - let uid = req.user.uid ||8039759; 55 + let uid = req.user.uid || 8039759;
56 let reasonId = 1; 56 let reasonId = 1;
57 57
58 orderDetailModel.cancelOrder(orderCode, uid, reasonId).then((result) => { 58 orderDetailModel.cancelOrder(orderCode, uid, reasonId).then((result) => {
59 res.json(result); 59 res.json(result);
60 }).catch(next); 60 }).catch(next);
61 -} 61 +};
62 62
63 module.exports = { 63 module.exports = {
64 - orderDetail, 64 + orderDetailData,
65 delOrder, 65 delOrder,
66 readdData, 66 readdData,
67 cancelOrder 67 cancelOrder
@@ -4,24 +4,40 @@ @@ -4,24 +4,40 @@
4 const api = global.yoho.API; 4 const api = global.yoho.API;
5 5
6 const _ = require('lodash'); 6 const _ = require('lodash');
7 -const config = global.yoho.config; 7 +
  8 +// const config = global.yoho.config;
8 const helpers = global.yoho.helpers; 9 const helpers = global.yoho.helpers;
9 const camelCase = global.yoho.camelCase; 10 const camelCase = global.yoho.camelCase;
  11 +const logger = global.yoho.logger;
10 12
11 const closeReasons = () => { 13 const closeReasons = () => {
12 return api.get('', { 14 return api.get('', {
13 method: 'app.SpaceOrders.closeReasons' 15 method: 'app.SpaceOrders.closeReasons'
14 }).then((result) => { 16 }).then((result) => {
15 - //console.log(result)  
16 - if(result && result.code === 200) {  
17 - //console.log(result)  
18 - return result.data; 17 + // console.log(result)
  18 + if (result && result.code === 200) {
  19 + // console.log(result)
  20 + return result.data;
19 } else { 21 } else {
20 - //console.log('bushi 200'); 22 + // console.log('bushi 200');
21 return {}; 23 return {};
22 } 24 }
23 - })  
24 -} 25 + });
  26 +};
  27 +
  28 +/**
  29 + * 获取快递有关信息
  30 + * @private
  31 + */
  32 +const _assignExpressInfo = (showLogistics, order, result) => {
  33 + if (showLogistics && order.express_company.caption && order.express_number) {
  34 + Object.assign(result, {
  35 + logisticsUrl: helpers.urlFormat('/home/logistic', {order_code: order.order_code}),
  36 + logisticsCompany: order.express_company.caption,
  37 + logisticsNum: order.express_number
  38 + });
  39 + }
  40 +};
25 41
26 /** 42 /**
27 * 获取订单状态 43 * 获取订单状态
@@ -29,6 +45,7 @@ const closeReasons = () => { @@ -29,6 +45,7 @@ const closeReasons = () => {
29 */ 45 */
30 const _getOrderStatus = (order, showLogistics) => { 46 const _getOrderStatus = (order, showLogistics) => {
31 let result = {}; 47 let result = {};
  48 +
32 // let order.status = 3; 49 // let order.status = 3;
33 50
34 if (order.isCancel === 'Y') { 51 if (order.isCancel === 'Y') {
@@ -139,53 +156,40 @@ const _getOrderStatus = (order, showLogistics) => { @@ -139,53 +156,40 @@ const _getOrderStatus = (order, showLogistics) => {
139 return result; 156 return result;
140 }; 157 };
141 158
142 -/**  
143 - * 获取快递有关信息  
144 - * @private  
145 - */  
146 -const _assignExpressInfo = (showLogistics, order, result) => {  
147 - if (showLogistics && order.express_company.caption && order.express_number) {  
148 - Object.assign(result, {  
149 - logisticsUrl: helpers.urlFormat('/home/logistic', {order_code: order.order_code}),  
150 - logisticsCompany: order.express_company.caption,  
151 - logisticsNum: order.express_number  
152 - });  
153 - }  
154 -};  
155 159
156 -const orderDetail = (uid, orderCode) => { 160 +const orderDetailData = (uid, orderCode) => {
157 161
158 return api.get('', { 162 return api.get('', {
159 method: 'app.SpaceOrders.detail', 163 method: 'app.SpaceOrders.detail',
160 uid: uid, 164 uid: uid,
161 order_code: orderCode 165 order_code: orderCode
162 }).then((result) => { 166 }).then((result) => {
163 - //console.log(result)  
164 - if(result && result.code === 200) { 167 + // console.log(result)
  168 + if (result && result.code === 200) {
165 let orderDetail = camelCase(result.data); 169 let orderDetail = camelCase(result.data);
166 - let goods = []; 170 + let goods = [];
  171 +
  172 + let status = _getOrderStatus(orderDetail);
167 173
168 - // let obj = _getOrderStatus(orderDetail);  
169 - let obj = {unpaid: true};  
170 -  
171 - orderDetail = _.assign(orderDetail, obj); 174 + orderDetail = _.assign(orderDetail, status);
172 175
173 - if(orderDetail.virtualType && orderDetail.virtualType === 3) { 176 + if (orderDetail.virtualType && orderDetail.virtualType === 3) {
174 orderDetail = _.assign(orderDetail, { 177 orderDetail = _.assign(orderDetail, {
175 isVirtual: true, 178 isVirtual: true,
176 mobile: result.data.mobile 179 mobile: result.data.mobile
177 - }) 180 + });
178 } 181 }
179 182
180 orderDetail = _.assign(orderDetail, { 183 orderDetail = _.assign(orderDetail, {
181 addressAll: orderDetail.area + orderDetail.address 184 addressAll: orderDetail.area + orderDetail.address
  185 +
182 // createTime: date('Y-m-d H:i:s', orderDetail.createTime) 186 // createTime: date('Y-m-d H:i:s', orderDetail.createTime)
183 - }) 187 + });
184 188
185 - if(orderDetail.counterFlag && orderDetail.counterFlag === 'Y') { 189 + if (orderDetail.counterFlag && orderDetail.counterFlag === 'Y') {
186 orderDetail = _.assign(orderDetail, { 190 orderDetail = _.assign(orderDetail, {
187 leftTime: parseInt(orderDetail.payLefttime, 10) * 1000 191 leftTime: parseInt(orderDetail.payLefttime, 10) * 1000
188 - }) 192 + });
189 } 193 }
190 194
191 _.forEach(orderDetail.orderGoods, function(data) { 195 _.forEach(orderDetail.orderGoods, function(data) {
@@ -200,114 +204,124 @@ const orderDetail = (uid, orderCode) => { @@ -200,114 +204,124 @@ const orderDetail = (uid, orderCode) => {
200 size: data.sizeName, 204 size: data.sizeName,
201 price: data.goodsPrice, 205 price: data.goodsPrice,
202 count: count 206 count: count
203 - }) 207 + });
204 208
205 - if(data.goodsType === 'gift') { 209 + if (data.goodsType === 'gift') {
206 obj = _.assign(obj, { 210 obj = _.assign(obj, {
207 gift: true 211 gift: true
208 - })  
209 - } else if(data.goodsType === 'priceGift') { 212 + });
  213 + } else if (data.goodsType === 'priceGift') {
210 obj = _.assign(obj, { 214 obj = _.assign(obj, {
211 advanceBuy: true 215 advanceBuy: true
212 - }) 216 + });
213 } 217 }
214 218
215 - if(data.expectArrivalTime) { 219 + if (data.expectArrivalTime) {
216 obj = _.assign(obj, { 220 obj = _.assign(obj, {
217 appearDate: data.expectArrivalTime 221 appearDate: data.expectArrivalTime
218 - }) 222 + });
219 } 223 }
220 224
221 - if(data.productSkn) { 225 + if (data.productSkn) {
222 obj = _.assign(obj, { 226 obj = _.assign(obj, {
223 link: '/product/show_' + data.productSkn + '.html' 227 link: '/product/show_' + data.productSkn + '.html'
224 - }) 228 + });
225 } 229 }
226 230
227 goods.push(obj); 231 goods.push(obj);
228 232
229 orderDetail = _.assign(orderDetail, { 233 orderDetail = _.assign(orderDetail, {
230 orderCount: count 234 orderCount: count
231 - }) 235 + });
232 236
233 }); 237 });
234 238
235 orderDetail.goods = goods; 239 orderDetail.goods = goods;
236 240
237 - if(orderDetail.paymentStatus === 'Y') { 241 + if (orderDetail.paymentStatus === 'Y') {
238 orderDetail = _.assign(orderDetail, { 242 orderDetail = _.assign(orderDetail, {
239 - isPay: true  
240 - }) 243 + isPay: true
  244 + });
241 } 245 }
  246 + console.log(orderDetail.canUpdateDeliveryAddress)
242 247
243 - //判断是否可以修改地址  
244 - if(orderDetail.canUpdateDeliveryAddress === 'Y') { 248 + // 判断是否可以修改地址
  249 + if (orderDetail.canUpdateDeliveryAddress === 'Y') {
245 orderDetail = _.assign(orderDetail, { 250 orderDetail = _.assign(orderDetail, {
246 - changable: true  
247 - }) 251 + changeable: true
  252 + });
  253 + } else {
  254 + orderDetail = _.assign(orderDetail, {
  255 + changeable: false
  256 + });
248 } 257 }
249 258
250 - //判断是否有关联订单  
251 - if(orderDetail.relateOrderCode === 'Y') { 259 + // 判断是否有关联订单
  260 + if (orderDetail.relateOrderCode === 'Y') {
252 orderDetail = _.assign(orderDetail, { 261 orderDetail = _.assign(orderDetail, {
253 - relation: true  
254 - }) 262 + relation: true
  263 + });
  264 + } else {
  265 + orderDetail = _.assign(orderDetail, {
  266 + relation: false
  267 + });
255 } 268 }
256 269
257 orderDetail = _.assign(orderDetail, { 270 orderDetail = _.assign(orderDetail, {
258 goodsAmount: orderDetail.paymentAmount, 271 goodsAmount: orderDetail.paymentAmount,
259 url: '/home/addressModify?orderCode=' + orderCode + '&relation=' + orderDetail.relation 272 url: '/home/addressModify?orderCode=' + orderCode + '&relation=' + orderDetail.relation
260 - }) 273 + });
261 274
262 - //为支付的拆单配送信息  
263 - if(orderDetail.isMultiPackage && orderDetail.isMultiPackage === 'Y') { 275 + // 为支付的拆单配送信息
  276 + if (orderDetail.isMultiPackage && orderDetail.isMultiPackage === 'Y') {
264 orderDetail = _.assign(orderDetail, { 277 orderDetail = _.assign(orderDetail, {
265 - isJit: true, 278 + isJit: true,
266 // jitDetailUrl: '/cart/index/jitDetailUrl' 279 // jitDetailUrl: '/cart/index/jitDetailUrl'
267 - }) 280 + });
268 } 281 }
269 282
270 - //取消订单原因列表 283 + // 取消订单原因列表
271 let resons = closeReasons(); 284 let resons = closeReasons();
272 - return closeReasons().then(result => {  
273 - resons = result; 285 +
  286 + return closeReasons().then(list => {
  287 + resons = list;
274 288
275 orderDetail = _.assign(orderDetail, { 289 orderDetail = _.assign(orderDetail, {
276 - cancelReason: resons  
277 - }) 290 + cancelReason: resons
  291 + });
278 292
279 - //console.log(orderDetail) 293 + //console.log(orderDetail);
280 return orderDetail; 294 return orderDetail;
281 }); 295 });
282 296
283 - return orderDetail; 297 + // return orderDetail;
284 } else { 298 } else {
285 logger.error('详情信息 返回不是200'); 299 logger.error('详情信息 返回不是200');
286 return {}; 300 return {};
287 } 301 }
288 - 302 +
289 }); 303 });
290 }; 304 };
291 305
292 -//删除订单 306 +// 删除订单
293 const delOrder = (orderCode, uid) => { 307 const delOrder = (orderCode, uid) => {
294 return api.get('', { 308 return api.get('', {
295 method: 'app.SpaceOrders.delOrderByCode', 309 method: 'app.SpaceOrders.delOrderByCode',
296 uid: uid, 310 uid: uid,
297 order_code: orderCode 311 order_code: orderCode
298 }); 312 });
299 -} 313 +};
300 314
301 -//再次购买 315 +// 再次购买
302 const readdData = (orderCode, uid) => { 316 const readdData = (orderCode, uid) => {
303 return api.get('', { 317 return api.get('', {
304 method: 'app.Shopping.readd', 318 method: 'app.Shopping.readd',
305 uid: uid, 319 uid: uid,
306 order_code: orderCode 320 order_code: orderCode
307 }); 321 });
308 -} 322 +};
309 323
310 -//取消订单 324 +// 取消订单
311 const cancelOrder = (orderCode, uid, reasonId) => { 325 const cancelOrder = (orderCode, uid, reasonId) => {
312 return api.get('', { 326 return api.get('', {
313 method: 'app.SpaceOrders.close', 327 method: 'app.SpaceOrders.close',
@@ -315,10 +329,10 @@ const cancelOrder = (orderCode, uid, reasonId) => { @@ -315,10 +329,10 @@ const cancelOrder = (orderCode, uid, reasonId) => {
315 order_code: orderCode, 329 order_code: orderCode,
316 reasonId: reasonId 330 reasonId: reasonId
317 }); 331 });
318 -} 332 +};
319 333
320 module.exports = { 334 module.exports = {
321 - orderDetail, 335 + orderDetailData,
322 closeReasons, 336 closeReasons,
323 delOrder, 337 delOrder,
324 readdData, 338 readdData,
@@ -34,7 +34,7 @@ router.get('/locationList', addressController.locationList); // 异步获å–三ç @@ -34,7 +34,7 @@ router.get('/locationList', addressController.locationList); // 异步获å–三ç
34 /* 个人中心订单相关路由 */ 34 /* 个人中心订单相关路由 */
35 router.get('/orders', orderController.order); // 订单列表 35 router.get('/orders', orderController.order); // 订单列表
36 router.get('/getOrders', orderController.getOrders); // 获取订单列表数据 36 router.get('/getOrders', orderController.getOrders); // 获取订单列表数据
37 -router.get('/orderDetail', orderDetailController.orderDetail); // 订单详情页 37 +router.get('/orderDetail', orderDetailController.orderDetailData); // 订单详情页
38 router.get('/delOrder', orderDetailController.delOrder); // 删除订单 38 router.get('/delOrder', orderDetailController.delOrder); // 删除订单
39 router.get('/readd', orderDetailController.readdData); // 再次购买 39 router.get('/readd', orderDetailController.readdData); // 再次购买
40 router.get('/cancelOrder', orderDetailController.cancelOrder); // 取消订单 40 router.get('/cancelOrder', orderDetailController.cancelOrder); // 取消订单
@@ -567,6 +567,7 @@ let _getRefundExchange = (skn) => { @@ -567,6 +567,7 @@ let _getRefundExchange = (skn) => {
567 method: 'app.product.refundExchange', 567 method: 'app.product.refundExchange',
568 product_skn: _.toString(skn) 568 product_skn: _.toString(skn)
569 }).then((result) => { 569 }).then((result) => {
  570 + // console.log(result)
570 // result ={ 571 // result ={
571 // "alg": "SALT_MD5", 572 // "alg": "SALT_MD5",
572 // "code": 200, 573 // "code": 200,
@@ -585,7 +586,6 @@ let _getRefundExchange = (skn) => { @@ -585,7 +586,6 @@ let _getRefundExchange = (skn) => {
585 } 586 }
586 return limit; 587 return limit;
587 } 588 }
588 - return {};  
589 }); 589 });
590 }; 590 };
591 591
@@ -615,9 +615,6 @@ let getProductData = (data) => { @@ -615,9 +615,6 @@ let getProductData = (data) => {
615 615
616 finalResult.limit = info[2]; 616 finalResult.limit = info[2];
617 617
618 - // console.log(info[2])  
619 -  
620 - // console.log(finalResult)  
621 return finalResult; 618 return finalResult;
622 }); 619 });
623 620