券时间限制

yujian

2019-12-12 8c04d27e5cebb7e654c208533e9567c4df2c8acc

 fanli/src/main/java/com/yeshi/fanli/service/impl/order/InviteOrderSubsidyServiceImpl.java

@@ -25,6 +25,8 @@
import com.yeshi.fanli.service.inter.order.OrderHongBaoMapService;

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

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

import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;

@@ -50,6 +52,9 @@
   @Resource

   private HongBaoManageService hongBaoManageService;



   @Resource

   private UserVIPInfoService userVIPInfoService;



   @Override

   public InviteOrderSubsidy getByOrderNoAndType(Long uid, String orderNo, Integer type) {

      return inviteOrderSubsidyMapper.getByOrderNoAndType(uid, orderNo, type);

@@ -61,10 +66,9 @@
   }



   @Transactional

   @Override

   public void addOrderSubsidy(InviteOrderSubsidy orderSubsidy) throws InviteOrderSubsidyException {

      // 机制2020年生效

      if (System.currentTimeMillis() < TimeUtil.convertToTimeTemp("2020-01-01", "yyyy-MM-dd")) {

   private void addOrderSubsidy(InviteOrderSubsidy orderSubsidy) throws InviteOrderSubsidyException {

      // TODO 确定生效日期 机制2020年生效

      if (System.currentTimeMillis() < TimeUtil.convertToTimeTemp("2020-01-01", "yyyy-MM-dd")&&!Constant.IS_TEST) {

         return;

      }



@@ -101,7 +105,7 @@
      if (list != null && list.size() > 0) {

         // 必须是自购订单才返利

         HongBaoV2 parent = hongBaoV2Service.selectByPrimaryKey(list.get(0).getHongBaoV2().getId());

         if (parent != null && parent.getType() == HongBaoV2.TYPE_ZIGOU) {

         if (parent != null && parent.getType() == HongBaoV2.TYPE_ZIGOU && parent.getUrank() != 100) {// 不是会员的自购才补贴

            Order order = orderService.findOrderByOrderIdAndType(orderId, sourceType);

            List<Long> idList = new ArrayList<>();

            for (HongBaoOrder ho : list)

@@ -165,7 +169,9 @@
                     orderSubsidy.setOrderNo(orderId);

                     orderSubsidy.setSourceType(sourceType);

                     orderSubsidy.setState(state);

                     addOrderSubsidy(orderSubsidy);

                     // VIP用户才能补贴

                     if (userVIPInfoService.isVIP(uid))

                        addOrderSubsidy(orderSubsidy);

                  }

               }

            }