Merge remote-tracking branch 'origin/div' into div

admin

2020-02-18 ddf5db7d31af51fcf697eac0cee7dd46ff73bcc1

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

@@ -25,8 +25,11 @@
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;



@Service

public class InviteOrderSubsidyServiceImpl implements InviteOrderSubsidyService {

@@ -49,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);

@@ -59,9 +65,8 @@
      return inviteOrderSubsidyMapper.getByOrderNoAndTypeForUpdate(uid, orderNo, type);

   }



   @Transactional

   @Override

   public void addOrderSubsidy(InviteOrderSubsidy orderSubsidy) throws InviteOrderSubsidyException {

   @Transactional(rollbackFor=Exception.class)

   private void addOrderSubsidy(InviteOrderSubsidy orderSubsidy) throws InviteOrderSubsidyException {

      if (orderSubsidy.getMoney() == null || StringUtil.isNullOrEmpty(orderSubsidy.getOrderNo())

            || orderSubsidy.getSourceType() == null || orderSubsidy.getUid() == null)

         throw new InviteOrderSubsidyException(1, "数据不完整");

@@ -75,6 +80,9 @@
         // 修改状态

         InviteOrderSubsidy update = new InviteOrderSubsidy(old.getId());

         update.setMoney(orderSubsidy.getMoney());

         if (old.getState() == InviteOrderSubsidy.STATE_UNKNOWN) {// 状态未确定之前才可以更改原始补贴资金

            update.setOriginalMoney(orderSubsidy.getOriginalMoney());

         }

         update.setState(orderSubsidy.getState());

         update.setUpdateTime(new Date());

         inviteOrderSubsidyMapper.updateByPrimaryKeySelective(update);

@@ -85,14 +93,14 @@
      }

   }



   @Transactional

   @Transactional(rollbackFor=Exception.class)

   @Override

   public void addOrUpdateByOrder(String orderId, int sourceType) throws InviteOrderSubsidyException {

      List<HongBaoOrder> list = hongBaoOrderService.listByOrderIdAndSourceType(orderId, sourceType);

      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)

@@ -147,15 +155,18 @@
                        rate = firstRate;

                     else

                        rate = secondRate;

                     BigDecimal money = MoneyBigDecimalUtil.mul(MoneyBigDecimalUtil.mul(totalMoney, rate),

                     BigDecimal money = MoneyBigDecimalUtil.div(MoneyBigDecimalUtil.mul(totalMoney, rate),

                           new BigDecimal(100));

                     InviteOrderSubsidy orderSubsidy = new InviteOrderSubsidy();

                     orderSubsidy.setMoney(money);

                     orderSubsidy.setOriginalMoney(money);

                     orderSubsidy.setUid(uid);

                     orderSubsidy.setOrderNo(orderId);

                     orderSubsidy.setSourceType(sourceType);

                     orderSubsidy.setState(state);

                     addOrderSubsidy(orderSubsidy);

                     // VIP用户才能补贴

                     if (userVIPInfoService.isVIP(uid))

                        addOrderSubsidy(orderSubsidy);

                  }

               }

            }