发起提现增加统计，添加京东订单与商品，拼多多订单与商品

admin

2019-06-21 7f943e54f259c7ff69c7591dbd6803171126b01e

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

@@ -18,6 +18,7 @@


import com.yeshi.fanli.dao.dynamic.DynamicInfoDao;

import com.yeshi.fanli.dto.taobao.TaoBaoShopDTO;

import com.yeshi.fanli.entity.bus.activity.ActivityRuleUser;

import com.yeshi.fanli.entity.bus.activity.ActivityUser;

import com.yeshi.fanli.entity.bus.activity.RecommendActivity;

import com.yeshi.fanli.entity.bus.activity.RecommendActivityInviteInfo;

@@ -93,18 +94,15 @@
   @Resource

   private TaoBaoGoodsUpdateService taoBaoGoodsUpdateService;

   

	
   @Override

   public void insert(DynamicInfo record) {

       dynamicInfoDao.insert(record);

   }

   

	
   @Override

   public DynamicInfo getById(String id) {

      return dynamicInfoDao.getById(id);

   }

	
   

   @Override

   public void insertTimeInvite() {

@@ -206,7 +204,6 @@
      inviteMaterialService.updateState(1, materialId);

   }



	
   @Override

   public void insertShopInfo() {

      List<String> brandIdList = DaTaoKeApiUtil.getBrandIdList();

@@ -214,7 +211,6 @@
         LogHelper.test("大淘客品牌id获取失败（DynamicInfoService-insertShopInfo）");

         return;

      }

		
      

      Long classId = 3L;

      Long subclassId = 0L;

@@ -252,7 +248,6 @@
         return;

      }

      

		
      List<TaoBaoGoodsBrief> listGoods = dynamicShopInfo.getListGoods();

      if (listGoods == null || listGoods.size() == 0) {

         LogHelper.test("大淘客品牌商品信息爬取失败（DynamicInfoService-insertShopInfo）");

@@ -277,7 +272,8 @@
      dynamicVO.setSubclassId(subclassId);

      dynamicVO.setShowType(DynamicInfo.SHOW_TYPE_TWO);

      dynamicVO.setShop(taoBaoShop);

      dynamicVO.setUser(activityUserService.listRand(1).get(0));

      List<ActivityRuleUser> userList = activityUserService.listByRuleCode(ActivityRuleUser.RULE_HAODIAN, 1, 50);

      dynamicVO.setUser(userList.get((int) (userList.size() * Math.random())).getActivityUser());

      dynamicVO.setCreateTime(DateUtil.reduceRandomMinute(new Date(), 8));   

      dynamicVO.setUpdateTime(new Date());

      

@@ -293,7 +289,8 @@
      List<GoodsPicture> listPicture = new ArrayList<GoodsPicture>();

      for (TaoBaoGoodsBrief goodsBrief : listGoods) {

         BigDecimal proportion = hongBaoManageService.getFanLiRate();

         TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief, proportion.toString(), null);

         TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief,

               proportion.toString(), null);

         taoBaoGoodsBriefExtra.setCouponInfo(null);

         taoBaoGoodsBriefExtra.setUpdatetime(new Date());

         

@@ -320,8 +317,6 @@
      

      dynamicInfoDao.insert(dynamicVO);

   }

	
	
   

   @Override

   public void insertTimeRecommend() {

@@ -358,7 +353,8 @@
            TaoBaoGoodsBrief taoBaoGoodsBrief = TaoBaoUtil.convert(daTaoKe);

            listGoods.add(taoBaoGoodsBrief);

            

            TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null);

            TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief,

                  proportion.toString(), null);

            if (!taoBaoGoodsBriefExtra.isCoupon()) {

               taoBaoGoodsBriefExtra.setState(1);

            }

@@ -465,7 +461,8 @@
      listGoods.add(taoBaoGoodsBrief);

      

      BigDecimal proportion = hongBaoManageService.getFanLiRate();

      TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null);

      TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief,

            proportion.toString(), null);

      if (!taoBaoGoodsBriefExtra.isCoupon()) {

         taoBaoGoodsBriefExtra.setState(1);

      }

@@ -594,8 +591,6 @@
      return goodsPicture;

   }



	
	
   @Override

   public void insertInviteActivity(RecommendActivity activity) throws Exception{

      

@@ -644,7 +639,6 @@
      dynamicVO.setShareType(DynamicInfo.SHARE_TYPE_INVITE);

      dynamicVO.setUpdateTime(new Date());

      

		
      Integer shareCount = activity.getShareCount();

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

         dynamicVO.setShareCount(1000 + (int) (Math.random() * 8000));

@@ -660,7 +654,6 @@
         dynamicVO.setUser(activityUser);

      }

      

		
      // 介绍内容

      List<ClientTextStyleVO> listtitle = new ArrayList<ClientTextStyleVO>();

      if(!StringUtil.isNullOrEmpty(title)) {

@@ -669,7 +662,6 @@
         row1.setContent(title );

         listtitle.add(row1);

      }

		
      

      // 图片

      List<GoodsPicture> listImg = new ArrayList<GoodsPicture>();

@@ -712,7 +704,6 @@
      dynamicInfoDao.insert(dynamicVO);

   }

   

	
   @Override

   public void insertActivityRecommend(RecommendActivity activity) {

      if (activity == null || activity.getGoodsList() == null) {

@@ -736,7 +727,6 @@
         dynamicInfo.setActivityId(activity.getId());

         dynamicInfo.setUpdateTime(new Date());

         

			
         List<ClientTextStyleVO> listtitle = new ArrayList<ClientTextStyleVO>();

         String title = activity.getTitle();

         if (!StringUtil.isNullOrEmpty(title)) {

@@ -756,7 +746,6 @@
            listtitle.add(row1);

         }

         dynamicInfo.setTitle(listtitle);

			
         

         Integer shareCount = activity.getShareCount();

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

@@ -789,7 +778,8 @@
               try {

                  taoBaoGoodsBrief = redisManager.getTaoBaoGoodsBrief(Long.parseLong(auctionId));

               

                  taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null);

                  taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief,

                        proportion.toString(), null);

                  if (!taoBaoGoodsBriefExtra.isCoupon()) {

                     taoBaoGoodsBriefExtra.setState(1);

                  }

@@ -798,7 +788,8 @@
                  shareMoney = MoneyBigDecimalUtil.add(shareMoney, money);

               } catch (TaobaoGoodsDownException e) {

                   taoBaoGoodsBrief = activityGoods.getTaoBaoGoodsBrief();

                   taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null);

                  taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief,

                        proportion.toString(), null);

                   taoBaoGoodsBriefExtra.setState(1);

                   taoBaoGoodsBriefExtra.setCoupon(false);

               }

@@ -841,7 +832,6 @@
            dynamicInfo.setShareType(DynamicInfo.SHARE_TYPE_NINE); // 分享类型9图

         }

         

			
         if (!StringUtil.isNullOrEmpty(dynamicInfoId)) {

            dynamicInfoDao.deleteById(dynamicInfoId);

         }

@@ -857,7 +847,6 @@
      }

   }

   

	
   @Override

   public void deleteActivity(Long activityId) {

      DynamicInfo dynamicInfo = dynamicInfoDao.getByActivityId(activityId);

@@ -866,7 +855,6 @@
         dynamicInfoDao.deleteById(dynamicInfo.getId());

      }

   }

	
   

   @Override

   public void removeByDate(Date createTime) {

@@ -899,7 +887,6 @@
      

      return list;

   }

	
   

   /**

    * 更新商品信息

@@ -980,7 +967,8 @@
                  dynamicInfo.setDesc(shareMoneyDesc);

               }

               

               TaoBaoGoodsBriefExtra newExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief, proportion.toString(), null);

               TaoBaoGoodsBriefExtra newExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief,

                     proportion.toString(), null);

               

               if (!newExtra.isCoupon()) {

                  newExtra.setState(1);