Merge branch 'master' of https://t-git.51gjj.com/fangbin/51business

app/controller/house/Export20190425.js

@@ -73,6 +73,7 @@ class Export20190425 extends Controller {
         };
         let mysqlData = await ctx.realestateModel.NewHouse.findAll(filter);
         let ret = [];
+        let reterr = [];
         if (mysqlData.length > 0) {
             for (let i in mysqlData) {
                 let data = {
@@ -91,7 +92,7 @@ class Export20190425 extends Controller {
                     decorationType: mysqlData[i].decoration_type || 0,
                     description: mysqlData[i].description || '',
                     openDate: mysqlData[i].open_date,
-                    dueDate: mysqlData[i].due_date === '0000-00-00 00:00:00' ? null : mysqlData[i].due_date,
+                    dueDate: (mysqlData[i].due_date === undefined || mysqlData[i].due_date === "0000-00-00 00:00:00" || mysqlData[i].due_date === 'Invalid date') ? null : mysqlData[i].due_date,
                     landArea: mysqlData[i].land_area,
                     houseArea: mysqlData[i].house_area,
                     areaRatio: mysqlData[i].area_ratio,
@@ -100,7 +101,7 @@ class Export20190425 extends Controller {
                     planParks: mysqlData[i].plan_parks,
                     planNearBy: mysqlData[i].plan_near_by,
                     preSalePermit: mysqlData[i].pre_sale_permit,
-                    preSalePermitDate: mysqlData[i].pre_sale_permit_date === '暂无信息' ? null : mysqlData[i].pre_sale_permit_date,
+                    preSalePermitDate: (mysqlData[i].pre_sale_permit_date === '暂无信息' || mysqlData[i].pre_sale_permit_date === '-') ? null : mysqlData[i].pre_sale_permit_date,
                     buildingNumbers: mysqlData[i].building_numbers,
                     cornerMarker: mysqlData[i].corner,
                     orderNum: mysqlData[i].order_num,
@@ -109,10 +110,14 @@ class Export20190425 extends Controller {
                 }
                 ctx.logger.info(JSON.stringify(data));
                 let temp = await ctx.helper.send_request(this.config.HOUSE_SERVICE_API + '/v1/newhouse/', data, { method: 'POST' });
-                ret.push(temp);
+                if (temp.status === 201) {
+                    ret.push(temp);
+                } else {
+                    reterr.push(mysqlData[i]);
+                }
             }
         }
-        ctx.success(ret.length);
+        ctx.success({ retL: ret.length, fl: mysqlData.length, error: reterr });
     }
 
 

app/service/house/collection.js

@@ -198,7 +198,7 @@ class CollectionService extends Service {
                     tags: retList[j].tags ? eval(retList[j].tags) : [],
                     image: retList[j].image,
                     area: type === 1 ? retList[j].houseArea : '',
-                    price: type === 1 ? retList[j].referenceAvgPrice : retList[j].price,
+                    price: type === 1 ? (retList[j].referenceAvgPrice === '' || retList[j].referenceAvgPrice === 0 ? '--' : retList[j].referenceAvgPrice) : retList[j].price,
                     type: type === 1 ? 'new_house' : 'rental_house',
                     corner: type === 1 ? retList[j].cornerMarker : '',
                 };

app/service/house/new_house.js

@@ -167,7 +167,7 @@ class NewHouseService extends Service {
                 description: data.description,//描述
                 tags: data.tags ? eval(data.tags) : [],//项目特色
                 favourable_info: data.favourableInfo,//优惠
-                reference_avg_price: data.referenceAvgPrice,//均价
+                reference_avg_price: data.referenceAvgPrice === 0 ? '--' : data.referenceAvgPrice,//均价
                 reference_total_price: data.referenceTotalPrice === 0 ? '--' : data.referenceTotalPrice,//总价
                 property_type: houseType[data.houseType] || '',//物业类型
             }
@@ -185,7 +185,7 @@ class NewHouseService extends Service {
             }
             ret.detail = {
                 basic: {
-                    reference_avg_price: data.referenceAvgPrice,//均价
+                    reference_avg_price: data.referenceAvgPrice === 0 ? '--' : data.referenceAvgPrice,//均价
                     tags: data.tags ? eval(data.tags) : [],//项目特色
                     property_type: houseType[data.houseType] || '',//物业类型
                     property_right_years: data.residential.propertyRightYears,//产权年限
@@ -297,7 +297,7 @@ class NewHouseService extends Service {
                 area: data.area,//面积
                 orientation: data.orientation,//朝向
                 num: data.num,//房源数量
-                price: data.price,//价格
+                price: data.price === 0 ? '--' : data.price,//价格
                 discount: data.discount,//折扣
                 tag: data.tags ? eval(data.tags) : [],//特点
             }
@@ -468,7 +468,7 @@ class NewHouseService extends Service {
                     address: newHouseList.results[i].address,
                     tags: newHouseList.results[i].tags ? eval(newHouseList.results[i].tags) : [],
                     image: newHouseList.results[i].image,
-                    price: newHouseList.results[i].referenceAvgPrice,
+                    price: newHouseList.results[i].referenceAvgPrice === 0 ? '--' : newHouseList.results[i].referenceAvgPrice,
                     corner: newHouseList.results[i].cornerMarker,
                 };
                 list.push(tmp);

app/service/house/order.js

@@ -125,7 +125,7 @@ class OrderService extends Service {
                     tags: retList[j].tags ? eval(retList[j].tags) : [],
                     image: retList[j].image,
                     area: type === 1 ? retList[j].houseArea : '',
-                    price: type === 1 ? retList[j].referenceAvgPrice : retList[j].price,
+                    price: type === 1 ? (retList[j].referenceAvgPrice === '' || retList[j].referenceAvgPrice === 0 ? '--' : retList[j].referenceAvgPrice) : retList[j].price,
                     time: moment().format('YYYY-MM-DD') === moment(orderList.results[j].orderAt).format('YYYY-MM-DD') ? '今天' : moment(orderList.results[j].orderAt).format('YYYY-MM-DD'),
                     type: type === 1 ? 'new_house' : 'rental_house',
                     corner: type === 1 ? retList[j].cornerMarker : '',