广告位修改

admin

2019-01-29 517b484a716c30261cd5ce77121627894d6f0ce9

广告位修改

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

@@ -42,7 +42,7 @@


    @RequestMapping(value = "tb")

    public void tb(String code, String state, HttpServletRequest request, HttpServletResponse response) {

        LogHelper.test("淘宝授权回调:" + request.getRequestURI());

        LogHelper.test("淘宝授权回调:" + code+"："+state);

        if (StringUtil.isNullOrEmpty(code) || StringUtil.isNullOrEmpty(state)) {

            try {

                response.sendRedirect("http://apph5.yeshitv.com/apppage/flq_bonusState.html?code=1");


 fanli/src/main/java/com/yeshi/fanli/controller/client/GoodsController.java

@@ -75,6 +75,8 @@
        boolean isNative = false;

        String pid = null;



        boolean specialConvert = false;



        String specialId = null;

        // 查询用户ID是否绑定了会员运营ID

        UserExtraTaoBaoInfo userInfo = userExtraTaoBaoInfoService.getByUid(uid);

@@ -86,6 +88,7 @@
                TaoBaoGoodsBrief goods = TaoKeApiUtil.getSimpleGoodsInfo(auctionId);

                if (goods.getMaterialLibType() != null && goods.getMaterialLibType() == 1) {

                    isNative = true;

                    specialConvert = true;

                } else

                    isNative = false;

            } catch (TaobaoGoodsDownException e) {

@@ -106,10 +109,18 @@
                pidType = PidUser.TYPE_FANLI_IOS;



            TaoBaoLink taoBaoLink = null;

            if (!StringUtil.isNullOrEmpty(specialId)) {

            if (!StringUtil.isNullOrEmpty(specialId) && specialConvert) {

                taoBaoLink = shareGoodsService.getTaoBaoLinkForBuyWithSpecial(uid, specialId, auctionId);

            } else {

                taoBaoLink = shareGoodsService.getTaoBaoLinkForBuy(uid, auctionId, pidType);

                if (!specialConvert && !isNative) {

                    if (pidType == PidUser.TYPE_FANLI_ANDROID)

                        taoBaoLink = shareGoodsService.getTaoBaoLink(uid, auctionId,

                                tbPidService.getAndroidDefault().getPid());

                    else

                        taoBaoLink = shareGoodsService.getTaoBaoLink(uid, auctionId,

                                tbPidService.getIOSDefault().getPid());

                } else

                    taoBaoLink = shareGoodsService.getTaoBaoLinkForBuy(uid, auctionId, pidType);

            }



            JSONObject link = new JSONObject();


 fanli/src/main/java/com/yeshi/fanli/controller/client/UserAuthController.java

@@ -14,7 +14,6 @@
import com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo;

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.user.UserExtraTaoBaoInfoService;

import com.yeshi.fanli.util.AESUtil;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.taobao.TaoBaoUtil;


 fanli/src/main/java/com/yeshi/fanli/job/UpdateOrderJob.java

@@ -22,6 +22,7 @@
import com.yeshi.fanli.service.inter.order.LostOrderService;

import com.yeshi.fanli.service.inter.order.OrderItemServcie;

import com.yeshi.fanli.service.inter.order.OrderProcessService;

import com.yeshi.fanli.service.inter.order.OrderService;

import com.yeshi.fanli.service.inter.order.PidOrderService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoOrderService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;

@@ -77,7 +78,7 @@


    @Resource

    private LostOrderService lostOrderService;



	
    private void updateOrder(long startTime, long endTime) {

        List<TaoBaoUnionConfig> configList = taoBaoUnionConfigService.getConfigByTypeCache(PidUser.TYPE_FANLI_ANDROID);

        List<TaoBaoOrder> orderList = new ArrayList<>();


 fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsServiceImpl.java

@@ -461,6 +461,7 @@
        return getTaoBaoLink(uid, auctionId, tbPid.getPid());

    }



    @Override

    public TaoBaoLink getTaoBaoLink(Long uid, Long auctionId, String pid) throws ShareGoodsException {



        if (uid == null || uid <= 0) {


 fanli/src/main/java/com/yeshi/fanli/service/inter/goods/ShareGoodsService.java

@@ -77,5 +77,15 @@
     */

    public TaoBaoLink getTaoBaoLinkForBuyWithSpecial(Long uid, String specialId, Long auctionId)

            throws ShareGoodsException;

	
    /**

     * 通过PID设置链接

     * @param uid

     * @param auctionId

     * @param pid

     * @return

     * @throws ShareGoodsException

     */

    public TaoBaoLink getTaoBaoLink(Long uid, Long auctionId, String pid) throws ShareGoodsException ;



}


 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java

@@ -1726,7 +1726,7 @@
            taoBaoOrder.setLatestUpdateTime(null);

            taoBaoOrder.setManagerWangWang(null);

            taoBaoOrder.setOrderBy(null);

            taoBaoOrder.setOrderId(item.optString("trade_id"));

            taoBaoOrder.setOrderId(item.optString("trade_parent_id"));

            if (item.optInt("tk_status") == 12)

                taoBaoOrder.setOrderState("订单付款");

            else if (item.optInt("tk_status") == 3)

@@ -1737,8 +1737,8 @@
                taoBaoOrder.setOrderState("订单成功");



            taoBaoOrder.setOrderType(item.optString("order_type"));

            if (!StringUtil.isNullOrEmpty(item.optString("pay_price")))

                taoBaoOrder.setPayment(new BigDecimal(item.optString("pay_price")));

            if (!StringUtil.isNullOrEmpty(item.optString("alipay_total_price")))

                taoBaoOrder.setPayment(new BigDecimal(item.optString("alipay_total_price")));

            else

                taoBaoOrder.setPayment(new BigDecimal(0));

            taoBaoOrder.setPrice(new BigDecimal(item.optString("price")));