返利奖励券新规则调整，订单统计，返利到账优化

admin

2019-10-28 8ba02b125d2df1a3393efdb276daae2244452d45

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

@@ -49,17 +49,17 @@
import com.yeshi.fanli.service.inter.goods.CommonGoodsService;

import com.yeshi.fanli.service.inter.goods.ShareGoodsService;

import com.yeshi.fanli.service.inter.goods.ShareGoodsTextTemplateService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;

import com.yeshi.fanli.service.inter.monitor.BusinessEmergent110Service;

import com.yeshi.fanli.service.inter.monitor.MonitorService;

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.service.inter.tlj.ConfigTaoLiJinService;

import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinRecordService;

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

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

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

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

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

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

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

import com.yeshi.fanli.util.AESUtil;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

@@ -166,10 +166,16 @@
   @RequestMapping(value = "createShareInfo")

   public void createShareInfo(AcceptData acceptData, Long uid, Long goodsId, String source, Integer totalNum,

         Integer goodsType, HttpServletRequest request, PrintWriter out) {



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

         out.print(JsonUtil.loadFalseResult(1, "用户ID不能为空"));

         return;

      }

      try {

         // 日志记录

         String info = String.format("type=share&uid=%s&goodsId=%s&source=%s&goodsType=%s", uid, goodsId, source,

               goodsType);

         LogHelper.orderInfo(info);

      } catch (Exception e) {

      }



      UserInfo user = userInfoService.getUserByIdWithMybatis(uid);

@@ -248,13 +254,14 @@
         }



         shareInfo.setClickUrl(url);

         shareInfo.setToken(taoBaoLink.getTaoToken());

         shareInfo.setToken(TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken()));

         shareInfo.setRule(configService.get("share_single_goods_rule"));

         shareInfo.setPictUrl(TbImgUtil.getTBSizeImg(taoBaoLink.getGoods().getPictUrl(), 500));



         String shareText = "";

         // 无券

         String shopType = taoBaoLink.getGoods().getUserType() == 0 ? "淘宝价" : "天猫价";

         String shopType = taoBaoLink.getGoods().getUserType() == 0 ? TaoBaoConstant.SHARE_PRICE_TAOBAO

               : TaoBaoConstant.SHARE_PRICE_TM;



         if (StringUtil.isNullOrEmpty(taoBaoLink.getGoods().getCouponInfo())) {

            String text = shareGoodsTextTemplateService.getCommonTemplate(uid);

@@ -277,7 +284,7 @@


         shareText = shareText.replace("{店铺类型}", shopType)

               .replace("{月销量}", TaoBaoUtil.getSaleCount(taoBaoLink.getGoods().getBiz30day()))

               .replace("{领券短链}", shortLink).replace("{淘口令}", taoBaoLink.getTaoToken());

               .replace("{领券短链}", shortLink).replace("{淘口令}", TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken()));



         shareInfo.setShareText(shareText);



@@ -327,7 +334,7 @@
               history.setHongbao(shareMoney);

               history.setCreateTime(new Date());

               history.setGoodsType(UserShareGoodsHistory.TYPE_TAOBAO);

               history.setTkCode(taobaoLink.getTaoToken());

               history.setTkCode(TaoBaoUtil.filterTaoToken(taobaoLink.getTaoToken()));

               history.setLink(taobaoLink.getClickUrl());

               history.setQuanLink(taobaoLink.getCouponLink());

               history.setGoodsId(taobaoLink.getGoods().getAuctionId());

@@ -370,8 +377,7 @@
      try {

         TaoBaoGoodsBrief goods = null;

         try {

            goods = TaoKeApiUtil.searchGoodsDetail(auctionId, new TaoKeAppInfo(TaoBaoConstant.TAOBAO_AUTH_APPKEY,

                  TaoBaoConstant.TAOBAO_AUTH_APPSECRET, TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT));

            goods = TaoKeApiUtil.searchGoodsDetail(auctionId);

         } catch (TaobaoGoodsDownException e2) {

            e2.printStackTrace();

         }

@@ -381,11 +387,16 @@
            return;

         }



         if (goods.getTkRate() == null || goods.getTkRate().compareTo(new BigDecimal(0)) <= 0) {

            // TaoKeApiUtil.specialConvertCoupon(auctionId, app);



         }



         // 计算推广红包

         String warningRate = configTaoLiJinService.getValueByKey("warning_value", new Date());

         LogHelper.error("推广红包比例:"+warningRate);

         LogHelper.error("推广红包比例:" + warningRate);

         BigDecimal spreadMoney = TaoLiJinUtil.getSpreadMoney(warningRate, goods);

         LogHelper.error("推广红包:"+spreadMoney);

         LogHelper.error("推广红包:" + spreadMoney);

         // 推广红包 不能小于1

         if (spreadMoney.compareTo(new BigDecimal(1.1)) < 0) {

            out.print(JsonUtil.loadFalseResult(1, "该商品淘礼金不足"));

@@ -428,12 +439,13 @@
               taoBaoLink.setTaoToken(quanToken);

            }

         }

         shareInfo.setToken(taoBaoLink.getTaoToken());

         shareInfo.setToken(TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken()));

         shareInfo.setRule(configService.get("share_single_goods_rule"));

         shareInfo.setPictUrl(TbImgUtil.getTBSizeImg(goods.getPictUrl(), 500));



         // 无券

         String shopType = goods.getUserType() == 0 ? "淘宝价" : "天猫价";

         String shopType = goods.getUserType() == 0 ? TaoBaoConstant.SHARE_PRICE_TAOBAO

               : TaoBaoConstant.SHARE_PRICE_TM;

         String shareText = "";



         if (StringUtil.isNullOrEmpty(goods.getCouponInfo())) {

@@ -457,7 +469,7 @@


         shareText = shareText.replace("{店铺类型}", shopType)

               .replace("{月销量}", TaoBaoUtil.getSaleCount(goods.getBiz30day())).replace("{领券短链}", shortLink)

               .replace("{淘口令}", taoBaoLink.getTaoToken());

               .replace("{淘口令}", TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken()));

         shareInfo.setShareText(shareText);



         String descText = shareText.replace(goods.getTitle(), "").trim();

@@ -503,7 +515,7 @@
               history.setHongbao(shareMoney);

               history.setCreateTime(new Date());

               history.setGoodsType(UserShareGoodsHistory.TYPE_TAOBAO);

               history.setTkCode(taobaoLink.getTaoToken());

               history.setTkCode(TaoBaoUtil.filterTaoToken(taobaoLink.getTaoToken()));

               history.setLink(taobaoLink.getClickUrl());

               history.setQuanLink(taobaoLink.getCouponLink());

               history.setGoodsId(finalGoods.getAuctionId());