订单bug修复

Administrator

2019-08-17 02c407ff8ca33296a9afee4a390945bfcfa162b2

 fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinRecordServiceImpl.java

@@ -41,6 +41,7 @@
import com.yeshi.fanli.service.inter.user.UserExtraTaoBaoInfoService;

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

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.RedisManager;

import com.yeshi.fanli.util.StringUtil;

@@ -201,12 +202,12 @@
         perface = new BigDecimal(1);

      } else {

         // 计算推广红包

         String warningRate = configTaoLiJinService.getValueByKey("warning_value");

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

         perface = TaoLiJinUtil.getSpreadMoney(warningRate, goods);

      }



      UserTaoLiJinRecord record = createUserTaoLiJin(2, uid, goods.getAuctionId(), perface, totalNum, name,

            sendStartTime, sendEndTime, null, useEndTime, TaoBaoConstant.TAOBAO_RELATION_PID_DEFAULT);

            sendStartTime, sendEndTime, null, useEndTime, TaoBaoConstant.TAOBAO_TLJ_RELATION_PID_DEFAULT);

      String sendUrl = record.getSendUrl() + "&relationId=" + relationId;

      record.setSendUrl(sendUrl);

      UserTaoLiJinRecord updateRecoed=new UserTaoLiJinRecord();

@@ -228,8 +229,8 @@
         throw new UserTaoLiJinRecordException(101, "红包余额不足");

      }



      // 过期

      userTaoLiJinOriginService.overdueHongBao(uid);

      // 过期 -取消收回

      // userTaoLiJinOriginService.overdueHongBao(uid);

      

      // 总推广红包

      BigDecimal totalMoney = MoneyBigDecimalUtil.mul(perface, new BigDecimal(totalNum));

@@ -374,9 +375,8 @@
            

            // 使用成功消息

            try {

               String beizhu = "未被领取/使用的部分将会退回";



               SimpleDateFormat sd = new SimpleDateFormat("yyyy.MM.dd hh.mm");

               String beizhu = "未被领取或领取后未使用部分退回";

               SimpleDateFormat sd = new SimpleDateFormat("yyyy.MM.dd HH.mm");

               String time = sd.format(new Date());

               MsgOtherTaoLiJinContentDTO content = new MsgOtherTaoLiJinContentDTO();

               content.setState("红包扣除");

@@ -423,7 +423,7 @@
         return null;

      }



      List<CommonGoods> listGoods = commonGoodsService.getByListGoodsId(listGoodsId);

      List<CommonGoods> listGoods = commonGoodsService.getByListGoodsId(listGoodsId, Constant.SOURCE_TYPE_TAOBAO);

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

         return null;

      }