|
|
@@ -132,9 +132,10 @@ public class MobileController extends Controller{
|
|
|
result.set("saleLocation", saleProvince+saleCity);
|
|
|
|
|
|
searchInfo.set("kehu", saleProvince+saleCity);
|
|
|
- result.set("fahuoInfo", fahuoInfo);
|
|
|
- status = true;
|
|
|
+
|
|
|
}
|
|
|
+ result.set("fahuoInfo", fahuoInfo);
|
|
|
+ status = true;
|
|
|
}catch(Exception e){
|
|
|
Log.info("em接口查询失败,"+code);
|
|
|
e.printStackTrace();
|
|
|
@@ -180,11 +181,11 @@ public class MobileController extends Controller{
|
|
|
result.set("saleLocation", saleProvince+saleCity);
|
|
|
|
|
|
searchInfo.set("kehu", saleProvince+saleCity);
|
|
|
- result.set("fahuoInfo", fahuoInfo);
|
|
|
- status = true;
|
|
|
}
|
|
|
+ result.set("fahuoInfo", fahuoInfo);
|
|
|
+ status = true;
|
|
|
}catch(Exception e){
|
|
|
- Log.info("em接口查询失败,"+code);
|
|
|
+ Log.info("爱创接口查询失败,"+code);
|
|
|
e.printStackTrace();
|
|
|
}
|
|
|
|
|
|
@@ -240,9 +241,10 @@ public class MobileController extends Controller{
|
|
|
if(jinzai_upload_child!=null){
|
|
|
String master_code = jinzai_upload_child.getStr("master_code");
|
|
|
Record masterInfo = Db.findFirst("select * from jinzai_upload_master where id = ?",master_code);
|
|
|
-
|
|
|
+
|
|
|
String pinxiang = masterInfo.getStr("pinxiang");
|
|
|
- result.set("pinxiang", pinxiang);
|
|
|
+ String kowei = masterInfo.getStr("kowei");
|
|
|
+ result.set("pinxiang", pinxiang+(kowei.isEmpty()?"":kowei));
|
|
|
searchInfo.set("product_name", pinxiang);
|
|
|
if(!WxUtil.isNull(master_code)){
|
|
|
status = true;
|