fix city check

app/service/gjj/product.js

@@ -423,11 +423,11 @@ class ProductService extends Service {
 
     const ret = [];
     for (const v of loanList) {
-      //以下代码是为了处理渠道包下不展示特殊的4个业务
-      //start
-      let sepecial_business_ids = [95,  7, 130, 51, 99, 111];
-      let place_cids = [1210, 1211, 5492, 5719, 2420]
-      if(ctx.helper.toInt(place_cid) > 0 && place_cids.includes(ctx.helper.toInt(place_cid)) && sepecial_business_ids.includes(ctx.helper.toInt(v.business_id))) {
+      // 以下代码是为了处理渠道包下不展示特殊的4个业务
+      // start
+      const sepecial_business_ids = [ 95, 7, 130, 51, 99, 111 ];
+      const place_cids = [ 1210, 1211, 5492, 5719, 2420 ];
+      if (ctx.helper.toInt(place_cid) > 0 && place_cids.includes(ctx.helper.toInt(place_cid)) && sepecial_business_ids.includes(ctx.helper.toInt(v.business_id))) {
         ctx.logger.info('get_phone_by_user_place_business:' + place_cid + '--business_id--' + v.business_id);
         continue;
       }
@@ -500,9 +500,9 @@ class ProductService extends Service {
     ctx.logger.info('get_phone_by_user_place:' + place_cid);
     // end
 
-    if(type == 4) {
-      let city_res = await ctx.helper.parseIp();
-      if(city_res && city_res.content && city_res.content.address_detail && city_res.content.address_detail.city) {
+    if (type == 4) {
+      const city_res = await ctx.helper.parseIp();
+      if (city_res && city_res.content && city_res.content.address_detail && city_res.content.address_detail.city) {
         city = city_res.content.address_detail.city.replace('市', '');
       }
       ctx.logger.info(JSON.stringify(city_res));
@@ -510,17 +510,17 @@ class ProductService extends Service {
 
     ctx.logger.info('check loan city:' + city);
     for (const v of products) {
-      //ctx.logger.info('imh------begin----------')
+      // ctx.logger.info('imh------begin----------')
 
-      //以下代码是为了处理渠道包下不展示特殊的4个业务
-      //start
-      let sepecial_business_ids = [95,  7, 130, 51, 99, 111];
-      let place_cids = [1210, 1211, 5492, 5719, 2420]
-      if(ctx.helper.toInt(place_cid) > 0 && place_cids.includes(ctx.helper.toInt(place_cid)) && sepecial_business_ids.includes(ctx.helper.toInt(v.business_id))) {
+      // 以下代码是为了处理渠道包下不展示特殊的4个业务
+      // start
+      const sepecial_business_ids = [ 95, 7, 130, 51, 99, 111 ];
+      const place_cids = [ 1210, 1211, 5492, 5719, 2420 ];
+      if (ctx.helper.toInt(place_cid) > 0 && place_cids.includes(ctx.helper.toInt(place_cid)) && sepecial_business_ids.includes(ctx.helper.toInt(v.business_id))) {
         ctx.logger.info('get_phone_by_user_place_business:' + place_cid + '--business_id--' + v.business_id);
         continue;
       }
-      //end
+      // end
 
       if (Number(v.type) === 2 || Number(v.type) === 3) {
         v.rate = '';
@@ -535,13 +535,13 @@ class ProductService extends Service {
       if (Number(v.type) === 4 && !url.includes('51yhdai')) {
         url = url.includes('?') ? url + '&from=51gjj_loan_channel' : url + '?from=51gjj_loan_channel';
       }
-      url = this.config.PHP_URL + '/app/track/url?url=' + encodeURI(url) + '&source=51gjj&location=' + location;
-      //ctx.logger.info(v.cities)
-      //ctx.logger.info(city)
-      if(v.cities && v.cities.length > 0 && city != '') {
-        //ctx.logger.info('imh------222----------')
-        if(v.cities.includes(city)) {
-          //ctx.logger.info('imh----------------')
+      url = this.config.PHP_URL + '/app/track/url?url=' + encodeURIComponent(url) + '&source=51gjj&location=' + location;
+      // ctx.logger.info(v.cities)
+      // ctx.logger.info(city)
+      if (v.cities && v.cities.length > 0 && city != '') {
+        // ctx.logger.info('imh------222----------')
+        if ((v.cities.includes(city) && Number(v.city_state) === 1) || (!v.cities.includes(city) && Number(v.city_state) === 0)) {
+          // ctx.logger.info('imh----------------')
           const tmp = {
             type: v.type,
             business_id: v.business_id,