admin
2019-01-11 8686499a9b856194cea6969cf5261cca0c056f76
修改了搜索的相关bug
5个文件已修改
14 ■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/controller/client/ConfigController.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/client/SearchController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/entity/bus/help/AppPageNotification.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderGoodsMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/client/ConfigController.java
@@ -19,6 +19,7 @@
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
import com.yeshi.fanli.service.inter.user.TBPidService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import net.sf.json.JSONObject;
@@ -51,7 +52,7 @@
    @RequestMapping(value = "getHomeConfig", method = RequestMethod.POST)
    public void getHomeConfig(AcceptData acceptData, PrintWriter out) {
        AppHomeFloatImg appHomeFloatImg = configService.getAppHomeFloatImg();
        if ("ios".equalsIgnoreCase(acceptData.getPlatform()))
        if ("ios".equalsIgnoreCase(acceptData.getPlatform()) && !Constant.IS_TEST)
            appHomeFloatImg = null;
        JSONObject data = new JSONObject();
        if (appHomeFloatImg != null)
fanli/src/main/java/com/yeshi/fanli/controller/client/SearchController.java
@@ -480,6 +480,7 @@
        }
        Gson gson = new GsonBuilder().create();
        if (data != null)
        data.put("words", gson.toJson(listRecommendWords));
        out.print(JsonUtil.loadTrueResult(data));
fanli/src/main/java/com/yeshi/fanli/entity/bus/help/AppPageNotification.java
@@ -28,7 +28,8 @@
        home("首页"), coupon("优惠券页"), invite("邀请有奖页"), activity("动态"), goodsDetail("详情过度页"), mine("我的"), money(
                "资金"), accountDetail("账户明细"), extract("提现"), orderFanli("返利订单"), orderTiCheng("提成订单"), orderTaoBao(
                        "淘宝订单"), coollect("收藏"), scanHistory("足迹"), team("队员"), kefu("联系客服"), taoBaoShoppingCart(
                                "淘宝购物车"), orderFind("订单申诉"), msgCenter("消息中心"), newOrder("订单");
                                "淘宝购物车"), orderFind("订单申诉"), msgCenter(
                                        "消息中心"), newOrder("订单"), shareHistory("分享记录"), goodsStorage("选品库");
        private final String desc;
        private AppPageNotificationTypeEnum(String desc) {
fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderGoodsMapper.xml
@@ -42,7 +42,7 @@
    <select id="listNoTitle" resultMap="BaseResultMap">
        select
        <include refid="Base_Column_List" />
        from yeshi_ec_common_order_goods limit #{start},#{count}
        from yeshi_ec_common_order_goods where cog_title is null limit #{start},#{count}
    </select>
    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java
@@ -1245,10 +1245,7 @@
            }
            return parsePhoneTmAndTb(id);
        } catch (Exception e) {
            try {
                LogHelper.errorDetailInfo(e, "无法解析到淘宝商品ID", burl);
            } catch (Exception e1) {
            }
            LogHelper.error("无法解析到淘宝商品ID:"+burl);
            return null;
        }