删除普通会员等级

admin

2020-04-21 0b57cfd62e842b309d03467b96a331c673ecad7c

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

@@ -39,6 +39,7 @@
import com.yeshi.fanli.entity.bus.user.Order;

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

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

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

import com.yeshi.fanli.entity.elme.ElmeHongBaoOrderMap;

import com.yeshi.fanli.entity.elme.ElmeOrder;

import com.yeshi.fanli.entity.jd.JDOrder;

@@ -88,7 +89,8 @@
import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TaoBaoConstant;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.cmq.PlaceOrderCMQManager;

import com.yeshi.fanli.util.cmq.order.PlaceOrderCMQManager;

import com.yeshi.fanli.util.cmq.order.TeamOrderCMQManager;

import com.yeshi.fanli.util.factory.UserMoneyDetailFactory;

import com.yeshi.fanli.util.jd.JDApiUtil;

import com.yeshi.fanli.util.pinduoduo.PinDuoDuoApiUtil;

@@ -427,6 +429,11 @@
   public void fanli(HongBaoV2 hb1) throws TaoBaoWeiQuanException {

      // 查询最新的红包数据

      hb1 = hongBaoV2Mapper.selectByPrimaryKeyForUpdate(hb1.getId());



      if (hb1 == null || hb1.getState() != HongBaoV2.STATE_KELINGQU || hb1.getPreGetTime() == null

            || hb1.getPreGetTime().getTime() > System.currentTimeMillis())

         return;



      // 正常用户才能到账

      UserInfo mainUser = userInfoMapper.selectAvailableByPrimaryKey(hb1.getUserInfo().getId());

      if (mainUser == null || mainUser.getState() != UserInfo.STATE_NORMAL) {

@@ -616,7 +623,7 @@
         Long uid = its.next();

         try {

            if (Constant.ENABLE_MQ)

               CMQManager.getInstance().addFanLiTeamIncomeMsg(new UidDateDTO(uid, maxTime));

               TeamOrderCMQManager.getInstance().addFanLiTeamIncomePreMsg(new UidDateDTO(uid, maxTime));

         } catch (Exception e) {

            e.printStackTrace();

            LogHelper.error(e);

@@ -1239,6 +1246,23 @@
   @Transactional(rollbackFor = Exception.class)

   public void invalidHongBaoV2AndGiveGodenCorn(Long hongBaoId, Long uid, String orderId, int sourceType,

         String beiZhu) throws Exception {

      HongBaoOrder hongbaoOrder = hongBaoOrderMapper.selectByHongBaoId(hongBaoId);

      if (hongbaoOrder != null) {

         CommonOrder commonOrder = commonOrderService.selectByPrimaryKey(hongbaoOrder.getCommonOrder().getId());

         if (commonOrder != null) {

            if (commonOrder.getState() == CommonOrder.STATE_FK) {

               CommonOrder updateOrder = new CommonOrder(commonOrder.getId());

               updateOrder.setState(CommonOrder.STATE_SX);

               updateOrder.setUpdateTime(new Date());

               commonOrderService.updateByPrimaryKeySelective(updateOrder);

            }

         }

      }



      HongBaoV2 hongBao = hongBaoV2Service.selectByPrimaryKey(hongBaoId);

      if (hongBao == null || hongBao.getState() == HongBaoV2.STATE_SHIXIAO)

         return;



      HongBaoV2 v2 = new HongBaoV2(hongBaoId);

      v2.setState(HongBaoV2.STATE_SHIXIAO);

      v2.setBeizhu(beiZhu);

@@ -1254,8 +1278,8 @@
            hongBaoV2Service.updateByPrimaryKeySelective(update);

         }

      // TODO 商家关店跑路需要赠送金币

      // userSystemCouponService.systemGiveRewardCoupon(uid, 1, orderId,

      // sourceType, "因商家违约未能结算返利或商家已经关店");

      // userSystemCouponService.rewardCouponWin(uid,

      // UserSystemCoupon.SOURCE_SYSTEM_PUSH, 1, true, new BigDecimal("31"));

   }



   @Transactional