Merge remote-tracking branch 'origin/master'

admin

2019-05-14 1a8fd056235eaf09c7eb5ecc68fd95b585e079be

Merge remote-tracking branch 'origin/master'

 fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java

@@ -336,13 +336,13 @@
    public List<DynamicInfo> query(int start, int count, Long cid, Long subId) {

        List<DynamicInfo> list = dynamicInfoDao.query(start, count, cid, subId);

        

//        // 更新商品信息

//        executor.execute(new Runnable() {

//            @Override

//            public void run() {

//                updateGoodInfo(list);

//            }

//        });

        // 更新商品信息

        executor.execute(new Runnable() {

            @Override

            public void run() {

                updateGoodInfo(list);

            }

        });

        

        return list;

    }

@@ -505,6 +505,10 @@
            taoBaoGoodsBriefExtra.setCouponInfo(null);

            taoBaoGoodsBriefExtra.setUpdatetime(new Date());

            

            if (!taoBaoGoodsBriefExtra.isCoupon()) {

                taoBaoGoodsBriefExtra.setState(1);

            }

			
            String goodsId = goodsBrief.getAuctionId().toString();

            JSONObject item = new JSONObject();

            item.put("id", goodsId);


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

@@ -703,7 +703,10 @@
        tg.setUserType(tb.getUserType());

        tg.setShopTitle(tb.getShopTitle());

        tg.setState(tb.getState()); // 状态：2018-12-03

        if (tb.getCouponAmount().compareTo(BigDecimal.valueOf(0)) == 1) {

        if (tb.getCouponAmount().compareTo(BigDecimal.valueOf(0)) > 0) {

			
            tg.setCoupon(true);// 有券 
			
            TaoBaoQuanInfo quanInfo = new TaoBaoQuanInfo();

            quanInfo.setCouponAmount(tb.getCouponAmount());

            String couponEffectiveEndTime = tb.getCouponEffectiveEndTime();