配置文件修改

admin

2019-09-29 02d65bf44ae94ee5c8f126181fbb08faf7e65f7e

配置文件修改

 fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java

@@ -261,7 +261,7 @@
        if (params != null)

            down = params.getValue();



        if (!state.equals(wxState)) {// 不是微信返回的！

        if (state!=null&&!state.equals(wxState)) {// 不是微信返回的！

            // request.setAttribute("error", "1");

            return "redirect:" + down;

        }


 fanli/src/main/java/com/yeshi/fanli/controller/TestController.java

@@ -588,13 +588,13 @@
    @RequestMapping(value = "testListTLJGoods")

    public void getGoodsList(String callback,PrintWriter out) {

        SearchFilter sf = new SearchFilter();

        sf.setMaterialId("19450");

        sf.setQuan(1);

        sf.setTmall(true);

        sf.setStartTkRate(5);

        sf.setEndPrice(new BigDecimal(1000));

//        sf.setEndPrice(new BigDecimal(1000));

        sf.setPage(1);

        sf.setPage(100);

        sf.setCateIds("16");

        sf.setSort(TaoBaoUtil.SORT_SALE_HIGH_TO_LOW);

        

        TaoBaoSearchResult result = TaoKeApiUtil.searchWuLiao(sf);

        Gson gson = new Gson();


 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java

@@ -10,6 +10,7 @@
import org.yeshi.utils.JsonUtil;

import org.yeshi.utils.encrypt.DESUtil;



import com.taobao.api.TaobaoClient;

import com.yeshi.fanli.entity.accept.AcceptData;

import com.yeshi.fanli.entity.bus.homemodule.FloatAD;

import com.yeshi.fanli.entity.bus.msg.MsgDeviceReadState;

@@ -31,6 +32,7 @@
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TaoBaoConstant;

import com.yeshi.fanli.util.ThreadUtil;

import com.yeshi.fanli.util.VersionUtil;

import com.yeshi.fanli.util.jd.JDUtil;

@@ -155,7 +157,8 @@
        } else {// 老人

            data.put("userTimeType", 1);

        }

        data.put("hotFuctionLink",configService.getByVersion("hot_function_url", platform, Integer.parseInt(acceptData.getVersion())));

        data.put("hotFuctionLink",

                configService.getByVersion("hot_function_url", platform, Integer.parseInt(acceptData.getVersion())));

        out.print(JsonUtil.loadTrueResult(data));

    }



@@ -408,4 +411,26 @@
        out.print(JsonUtil.loadTrueResult(data));

    }



    /**

     * 获取饿了么的推广链接

     * 
     * @param acceptData

     * @param uid

     * @param out

     */

    @RequestMapping(value = "getElemeLink")

    public void getElemeLink(AcceptData acceptData, Long uid, String callback, PrintWriter out) {

        JSONObject data = new JSONObject();

        data.put("hongBao", configService.get("eleme_hongbao_link").replace("{用户ID}", uid + ""));

        data.put("goods", configService.get("eleme_goods_link").replace("{用户ID}", uid + ""));



        ClientTBPid clientTBPid1 = new ClientTBPid(TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_ELEME_PID,

                null, TaoBaoConstant.TAOBAO_ELEME_PID.split("_")[3]);

        data.put("taoKeParams", clientTBPid1);

        if (StringUtil.isNullOrEmpty(callback))

            out.print(JsonUtil.loadTrueResult(data));

        else

            out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));

    }



}


 fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java

@@ -172,7 +172,7 @@
            doJDOrderJob();// 京东订单处理

            doPDDOrderJob();// 拼多多订单处理

            doImportantTaoBaoGoodsUpdateJob();// 淘宝重要商品的信息更新

            doHongBaoRecieveIntegralGetJob();// 返利到账，金币增加

            // doHongBaoRecieveIntegralGetJob();// 返利到账，金币增加

            // doPlaceOrderIntegralJob();// 下单赠送金币任务

            doDouYinDeviceActiveJob();// 抖音设备激活广告监测

        }


 fanli/src/main/java/com/yeshi/fanli/util/TaoBaoConstant.java

@@ -20,6 +20,10 @@
    public static final String TAOBAO_TLJ_RELATION_PID_DEFAULT = "mm_124933865_56750082_19507100253";

    // 淘礼金渠道会员

    public static final String TAOBAO_TLJ_RELATION_AS_SPECIAL_PID = "mm_124933865_56750082_19508150186";

	
    //饿了么PID

    public static final String TAOBAO_ELEME_PID = "mm_124933865_56750082_109491050276";

	
    // 淘礼金会员

    public static final String TAOBAO_TLJ_SPECIAL_PID_DEFAULT = "mm_124933865_56750082_19509300170";

    public static BigDecimal OWN_BUY_WITHOUT_FANLI_RATE = new BigDecimal(70);// 自购立减的比例


 fanli/src/main/java/com/yeshi/fanli/util/vip/VipApiUtil.java

New file
@@ -0,0 +1,33 @@
package com.yeshi.fanli.util.vip;



import java.util.HashMap;

import java.util.Map;



/**

 * TODO 未完成 唯品会接口

 * 
 * @author Administrator

 *

 */

public class VipApiUtil {



    private final static String appKey = "f9e7f22f";

    private final static String appSecret = "9B2291352497FAF42B2DF44BFCF62316";



    private static String getSign() {



        return null;

    }



    private static Map<String, String> getBaseParams(String service, String method) {

        Map<String, String> params = new HashMap<String, String>();

        params.put("service", service);

        params.put("method", method);

        params.put("version", "1.0");

        params.put("timestamp", System.currentTimeMillis() / 1000 + "");

        params.put("format", "json");

        params.put("appKey", appKey);

        params.put("sign", null);

        return params;

    }

}