fe / yohobuy-node · Commits

Go to a project

Authored by 郭成尧
Commit 90c9fb9b7252b35b5d2480b5261c8cdcbf8d4eb9 1 parent 117ed1b2

首页限时海沟即将结束数据处理

Inline Side-by-side
Showing 2 changed files with 37 additions and 14 deletions
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 * @Author: Targaryen 2 * @Author: Targaryen
3 * @Date: 2016-06-01 14:37:03 3 * @Date: 2016-06-01 14:37:03
4 * @Last Modified by: Targaryen 4 * @Last Modified by: Targaryen
5 -* @Last Modified time: 2016-06-01 16:22:06 5 +* @Last Modified time: 2016-06-02 10:09:02
6 */ 6 */
7 7
8 'use strict'; 8 'use strict';
@@ -26,11 +26,11 @@ exports.getOutletsActivityOrigin = (params) => { @@ -26,11 +26,11 @@ exports.getOutletsActivityOrigin = (params) => {
26 return api.get('', sign.apiSign({ 26 return api.get('', sign.apiSign({
27 method: 'app.outlets.activityGet', 27 method: 'app.outlets.activityGet',
28 28
29 - id: params.id || null, 29 + // id: params.id || null,
30 platform: 2, // 1 没有数据，暂时用 2，待处理 30 platform: 2, // 1 没有数据，暂时用 2，待处理
31 size: params.size || 0, 31 size: params.size || 0,
32 yh_channel: 1, 32 yh_channel: 1,
33 - type: params.type || 3 // 0 没有数据，暂时用 3 33 + type: params.type || 2 // 0 没有数据，暂时用 3
34 })); 34 }));
35 }; 35 };
36 36
@@ -2,13 +2,13 @@ @@ -2,13 +2,13 @@
2 * @Author: Targaryen 2 * @Author: Targaryen
3 * @Date: 2016-05-30 16:20:03 3 * @Date: 2016-05-30 16:20:03
4 * @Last Modified by: Targaryen 4 * @Last Modified by: Targaryen
5 - * @Last Modified time: 2016-06-02 09:47:12 5 + * @Last Modified time: 2016-06-02 10:26:33
6 */ 6 */
7 7
8 'use strict'; 8 'use strict';
9 const library = '../../../library'; 9 const library = '../../../library';
10 const utils = '../../../utils'; 10 const utils = '../../../utils';
11 - 11 +const helpers = require(`${library}/helpers`);
12 const _ = require('lodash'); 12 const _ = require('lodash');
13 const API = require(`${library}/api`).API; 13 const API = require(`${library}/api`).API;
14 const api = new API(); 14 const api = new API();
@@ -25,6 +25,23 @@ const productProcess = require(`${utils}/product-process`); @@ -25,6 +25,23 @@ const productProcess = require(`${utils}/product-process`);
25 const handleOutletsActivityData = (origin) => { 25 const handleOutletsActivityData = (origin) => {
26 let dest = {}; 26 let dest = {};
27 27
  28 + dest.name = '限时嗨购'; // 需要根据 origin 传值修改
  29 + dest.topic = [];
  30 +
  31 + // 处理奥莱活动列表数据
  32 + _.forEach(origin, value => {
  33 + let activity = {};
  34 +
  35 + activity.href = helpers.urlFormat('/outlets/special/detail', { id: value.id });
  36 + activity.img = value.coverUrl;
  37 + activity.logo = value.logoUrl;
  38 + activity.discount = value.promotionName;
  39 + activity.title = value.title;
  40 + activity.limit = value.productPoolId; // 不清楚什么数据 待处理
  41 +
  42 + dest.topic.push(activity);
  43 + });
  44 +
28 let nowTime = Math.round(new Date().getTime() / 1000); 45 let nowTime = Math.round(new Date().getTime() / 1000);
29 46
30 dest.specialHead = { 47 dest.specialHead = {
@@ -68,19 +85,25 @@ const handleOutletsBannersData = (origin) => { @@ -68,19 +85,25 @@ const handleOutletsBannersData = (origin) => {
68 */ 85 */
69 exports.getOutletsIndexData = (params) => { 86 exports.getOutletsIndexData = (params) => {
70 return api.all([ 87 return api.all([
71 - outletsApi.getOutletsActivityOrigin(params),  
72 - outletsApi.getChannelResouceData({ content_code: 'e0565dad65fb8da1f39bc1ac83fc8346' }) 88 + outletsApi.getChannelResouceData({ content_code: 'e0565dad65fb8da1f39bc1ac83fc8346' }),
  89 + outletsApi.getOutletsActivityOrigin(params), // 获取限时活动列表
  90 + outletsApi.getOutletsActivityOrigin(params), // 获取即将结束列表
73 ]).then(result => { 91 ]).then(result => {
74 let finalResult = {}; 92 let finalResult = {};
75 93
76 - // 处理奥莱活动列表数据 94 + // 处理资源位数据
77 if (result[0].code === 200) { 95 if (result[0].code === 200) {
78 - finalResult.limitedBuy = handleOutletsActivityData(result[0].data); 96 + finalResult = Object.assign(finalResult, handleOutletsBannersData(result[0].data));
79 } 97 }
80 98
81 - // 处理资源位数据 99 + // 处理限时嗨购列表数据
82 if (result[1].code === 200) { 100 if (result[1].code === 200) {
83 - finalResult = Object.assign(finalResult, handleOutletsBannersData(result[1].data)); 101 + finalResult.limitedBuy = handleOutletsActivityData(result[1].data);
  102 + }
  103 +
  104 + // 处理即将结束列表数据
  105 + if (result[2].code === 200) {
  106 + finalResult.nearOver = handleOutletsActivityData(result[2].data);
84 } 107 }
85 108
86 return finalResult; 109 return finalResult;
@@ -105,8 +128,8 @@ exports.getOutletsChannelData = (params) => { @@ -105,8 +128,8 @@ exports.getOutletsChannelData = (params) => {
105 let channelData = {}; 128 let channelData = {};
106 129
107 return api.all([ 130 return api.all([
108 - outletsApi.getChannelResouceData({content_code: channelCode[params.channel]}),  
109 - outletsApi.getOutletsActivityOrigin({platform: 2, size: 0, type: 1}), 131 + outletsApi.getChannelResouceData({ content_code: channelCode[params.channel] }),
  132 + outletsApi.getOutletsActivityOrigin({ platform: 2, size: 0, type: 1 }),
110 saleApi.getSaleGoodsList(params) 133 saleApi.getSaleGoodsList(params)
111 ]).then(result => { 134 ]).then(result => {
112 // 资源楼层 135 // 资源楼层
@@ -116,7 +139,7 @@ exports.getOutletsChannelData = (params) => { @@ -116,7 +139,7 @@ exports.getOutletsChannelData = (params) => {
116 139
117 // 限时嗨购 140 // 限时嗨购
118 if (result[1].code === 200) { 141 if (result[1].code === 200) {
119 - Object.assign(channelData, {flashSale: outletsProcess.formatActivityData(result[1].data)}); 142 + Object.assign(channelData, { flashSale: outletsProcess.formatActivityData(result[1].data) });
120 } 143 }
121 144
122 // 商品列表 145 // 商品列表