Merge branch 'div' into div-1

yujian

2020-03-24 88c7df1d5089d8e39f356a68eaccc18f308e190c

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

@@ -2,6 +2,7 @@


import java.math.BigDecimal;

import java.util.ArrayList;

import java.util.Calendar;

import java.util.Date;

import java.util.Iterator;

import java.util.List;

@@ -16,9 +17,11 @@
import com.yeshi.fanli.dao.mybatis.order.InviteOrderSubsidyMapper;

import com.yeshi.fanli.entity.bus.user.HongBaoV2;

import com.yeshi.fanli.entity.bus.user.Order;

import com.yeshi.fanli.entity.order.CommonOrder;

import com.yeshi.fanli.entity.order.HongBaoOrder;

import com.yeshi.fanli.entity.order.InviteOrderSubsidy;

import com.yeshi.fanli.exception.order.InviteOrderSubsidyException;

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

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

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

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

@@ -28,6 +31,7 @@
import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;



@Service

public class InviteOrderSubsidyServiceImpl implements InviteOrderSubsidyService {

@@ -53,6 +57,9 @@
   @Resource

   private UserVIPInfoService userVIPInfoService;



   @Resource

   private CommonOrderService commonOrderService;



   @Override

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

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

@@ -63,7 +70,7 @@
      return inviteOrderSubsidyMapper.getByOrderNoAndTypeForUpdate(uid, orderNo, type);

   }



   @Transactional(rollbackFor=Exception.class)

   @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)

@@ -91,7 +98,7 @@
      }

   }



   @Transactional(rollbackFor=Exception.class)

   @Transactional(rollbackFor = Exception.class)

   @Override

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

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

@@ -162,6 +169,10 @@
                     orderSubsidy.setOrderNo(orderId);

                     orderSubsidy.setSourceType(sourceType);

                     orderSubsidy.setState(state);

                     if (type == HongBaoV2.TYPE_YIJI)

                        orderSubsidy.setLevel(InviteOrderSubsidy.LEVEL_ONE);

                     else

                        orderSubsidy.setLevel(InviteOrderSubsidy.LEVEL_TWO);

                     // VIP用户才能补贴

                     if (userVIPInfoService.isVIP(uid))

                        addOrderSubsidy(orderSubsidy);

@@ -219,7 +230,8 @@


   @Transactional

   @Override

   public void validByOrderIdAndSourceType(String orderId, int sourceType) {

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



      List<InviteOrderSubsidy> list = inviteOrderSubsidyMapper.listByOrderNoAndType(orderId, sourceType);

      if (list != null && list.size() > 0)

         for (InviteOrderSubsidy subsidy : list) {

@@ -233,6 +245,7 @@


   }



   @Transactional

   @Override

   public void settleById(Long id, BigDecimal money) {

      InviteOrderSubsidy orderSubsidy = new InviteOrderSubsidy(id);

@@ -240,6 +253,8 @@
      orderSubsidy.setState(InviteOrderSubsidy.STATE_SUBSIDIZED);

      orderSubsidy.setUpdateTime(new Date());

      inviteOrderSubsidyMapper.updateByPrimaryKeySelective(orderSubsidy);

      // 设置可结算



   }



}