20200528 代码提交

xiaoyong931011

2020-05-28 0290652dcced4d31540555abd7adf6e30cdbe29e

 src/main/java/com/xcong/excoin/modules/home/service/impl/MemberQuickBuySaleServiceImpl.java

@@ -8,6 +8,7 @@


import org.springframework.stereotype.Service;



import com.alibaba.druid.util.StringUtils;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;

import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

@@ -22,6 +23,7 @@
import com.xcong.excoin.modules.home.entity.MemberQuickBuySaleEntity;

import com.xcong.excoin.modules.home.mapper.MemberQuickBuySaleEntityMapper;

import com.xcong.excoin.modules.home.service.MemberQuickBuySaleService;

import com.xcong.excoin.modules.home.vo.MemberQuickBuySaleDetailVo;

import com.xcong.excoin.modules.home.vo.MemberQuickBuySaleVo;

import com.xcong.excoin.modules.member.dao.MemberDao;

import com.xcong.excoin.modules.member.dao.MemberWalletCoinDao;

@@ -56,6 +58,7 @@
      memberQuickBuySaleEntity.setMemberId(member.getId());

      memberQuickBuySaleEntity.setAmountUsdt(memberQuickBuySaleDto.getAmountUsdt());

      memberQuickBuySaleEntity.setAmountCny(memberQuickBuySaleDto.getAmountCny());

      memberQuickBuySaleEntity.setUnitPrice(memberQuickBuySaleDto.getUnitPrice());

      memberQuickBuySaleEntity.setCreateTime(new Date());

      memberQuickBuySaleEntity.setOrderNo(chargeNo);

      memberQuickBuySaleEntity.setOrderType("B");

@@ -63,26 +66,10 @@
      int ran = (int) (Math.random() * 10000000);

      memberQuickBuySaleEntity.setPaymentCode(ran + "");

      

      // 收款信息

      QueryWrapper<PlatformPaymentMethodEntity> queryWrapper = new QueryWrapper<>();

      queryWrapper.eq("status", "1");

      List<PlatformPaymentMethodEntity> paymentMethodList = platformPaymentMethodDao.selectList(queryWrapper);

      // 随机一个

      if (CollectionUtils.isEmpty(paymentMethodList)) {

         return Result.fail("收款方式为空");

      }

//      int total = paymentMethodList.size();

//      int index = (int) (Math.random() * total);

//      PlatformPaymentMethodEntity paymemtMethod = paymentMethodList.get(index);

//      memberQuickBuySaleEntity.setPaymentName(paymemtMethod.getName());

//      memberQuickBuySaleEntity.setPaymentAccount(paymemtMethod.getAccount());

      memberQuickBuySaleDao.insert(memberQuickBuySaleEntity);

      MemberQuickBuySaleVo memberQuickBuySaleVo = MemberQuickBuySaleEntityMapper.INSTANCE.entityToVo(memberQuickBuySaleEntity);

      MemberQuickBuySaleVo memberQuickBuySaleVo = new MemberQuickBuySaleVo();

      memberQuickBuySaleVo.setId(memberQuickBuySaleEntity.getId());

      // 返回前台付款方式

//      memberQuickBuySaleVo.setPlatforPaymentMethodList(paymentMethodList);

//      memberQuickBuySaleEntity.setReceiveMethod(payMethodList.get(index));

      // 返回前台付款方式

//            memberChargeUsdt.setReceiveMethod(payMethodList.get(index));

      return Result.ok(memberQuickBuySaleVo);

   }



@@ -105,12 +92,35 @@
   @Override

   public Result selectById(Long id) {

      MemberQuickBuySaleEntity memberQuickBuySaleEntity = memberQuickBuySaleDao.selectById(id);

      MemberQuickBuySaleVo memberQuickBuySaleVo = MemberQuickBuySaleEntityMapper.INSTANCE.entityToVo(memberQuickBuySaleEntity);

      MemberQuickBuySaleDetailVo memberQuickBuySaleDetailVo = MemberQuickBuySaleEntityMapper.INSTANCE.entityToVo(memberQuickBuySaleEntity);

      // 收款信息

      QueryWrapper<PlatformPaymentMethodEntity> queryWrapper = new QueryWrapper<>();

      queryWrapper.eq("status", "1");

      List<PlatformPaymentMethodEntity> paymentMethodList = platformPaymentMethodDao.selectList(queryWrapper);

      // 随机一个

      if (CollectionUtils.isEmpty(paymentMethodList)) {

         return Result.fail("收款方式为空");

      }

      memberQuickBuySaleDetailVo.setPlatforPaymentMethodList(paymentMethodList);

      long startTime = memberQuickBuySaleEntity.getCreateTime().getTime();

      long nowTime = new Date().getTime();

      long third = 30*60*1000;

      memberQuickBuySaleVo.setTimeLeft((third-nowTime+startTime)/1000);

      return Result.ok(memberQuickBuySaleVo);

      memberQuickBuySaleDetailVo.setTimeLeft((third-nowTime+startTime)/1000);

      return Result.ok(memberQuickBuySaleDetailVo);

   }

	
   @Override

   public Result selectAll(String type) {

      MemberEntity member = LoginUserUtils.getAppLoginUser();

      QueryWrapper<MemberQuickBuySaleEntity> queryWrapper = new QueryWrapper<>();

      queryWrapper.eq("member_id", member.getId());

      if(!StringUtils.isEmpty(type)) {

         queryWrapper.eq("order_type", type);

      }

      queryWrapper.orderByDesc("id");

      List<MemberQuickBuySaleEntity> memberQuickBuySaleEntityList = memberQuickBuySaleDao.selectList(queryWrapper);

      List<MemberQuickBuySaleDetailVo> memberQuickBuySaleDetailVoList = MemberQuickBuySaleEntityMapper.INSTANCE.entityListToVoList(memberQuickBuySaleEntityList);

      return Result.ok(memberQuickBuySaleDetailVoList);

   }



   @Override

@@ -130,7 +140,6 @@
      if (extractUsdt.compareTo(walletCoin.getAvailableBalance())==1) {

         return Result.fail("您当前可用USDT额度不够");

      }





      // 判断是否存在收款方式

      List<MemberPaymentMethodEntity> payMentMethodList = memberPaymentMethodDao.selectByMemberId(member.getId());

@@ -171,11 +180,8 @@
   public Result cancelRecharge(Long id) {

      // 获取当前登录用户

      MemberEntity member = LoginUserUtils.getAppLoginUser();

      if(member==null) {

         return Result.fail("登录用户已失效");

      }

      MemberQuickBuySaleEntity memberQuickBuySaleEntity = memberQuickBuySaleDao.selectByIdAndMemberId(id,member.getId());

      memberQuickBuySaleEntity.setOrderStatus(1);

      MemberQuickBuySaleEntity memberQuickBuySaleEntity = memberQuickBuySaleDao.selectByIdAndMemberId(member.getId(),id);

      memberQuickBuySaleEntity.setOrderStatus(MemberQuickBuySaleEntity.CHARGE_STATUS_CANCEL_USER);

      memberQuickBuySaleDao.updateById(memberQuickBuySaleEntity);

      

      // 判断是否存在足够余额