conflect

Helius

2021-05-12 6ec40dc71bdce4dd21ee8c6436a43b7fc20c422c

 src/main/java/com/xcong/excoin/modules/yunding/service/Impl/YunDingServiceImpl.java

@@ -5,6 +5,7 @@
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.SecureUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -83,6 +84,20 @@
        //MemberEntity memberEntity = LoginUserUtils.getAppLoginUser();
        Page<YdProductVo> page = new Page<>(ydProductListDto.getPageNum(), ydProductListDto.getPageSize());
        IPage<YdProductVo> list = ydProductDao.getProductList(page, ydProductListDto);
        List<YdProductVo> records = list.getRecords();
        if(CollUtil.isNotEmpty(records)){
            //预计收益
            BigDecimal prifitT = BigDecimal.ZERO;
            Wrapper<YdBasicSettingEntity> queryWrapper = new QueryWrapper<>();
            List<YdBasicSettingEntity> ydBasicSettingEntities = ydBasicSettingDao.selectList(queryWrapper);
            if(CollUtil.isNotEmpty(ydBasicSettingEntities)){
                prifitT = ydBasicSettingEntities.get(0).getPrifitT();
            }
            for(YdProductVo ydProductVo : records){
                ydProductVo.setProfitT(prifitT);
            }
        }

        return Result.ok(list);
    }

@@ -143,6 +158,18 @@
        MemberEntity memberEntity = LoginUserUtils.getAppLoginUser();
        Long memberId = memberEntity.getId();
//        Long memberId = 28L;
        String tradePassword = payProductDto.getTradePassword();
        if(StrUtil.isEmpty(tradePassword)){
            return Result.fail("请输入交易密码");
        }
        String tradePasswordOwn = memberEntity.getTradePassword();
        if(StrUtil.isEmpty(tradePasswordOwn)){
            return Result.fail("请设置交易密码");
        }
        String tradePasswords = SecureUtil.md5(tradePassword);
        if(!StrUtil.equals(tradePasswordOwn,tradePasswords)){
            return Result.fail("请输入正确的交易密码");
        }
        BigDecimal quantity = payProductDto.getQuantity();
        if(ObjectUtil.isEmpty(quantity)){
            return Result.fail("请输入购买数量");
@@ -266,6 +293,16 @@
        return Result.ok(orderAllInfoVo);
    }

    @Override
    public Result getOrderInfo(Long id) {

        log.info("获取订单详情");
        MemberEntity memberEntity = LoginUserUtils.getAppLoginUser();
        Long memberId = memberEntity.getId();
        YdOrderVo ydOrderVo = ydOrderDao.selectOrderByMemberIdAndId(memberId,id);
        return Result.ok(ydOrderVo);
    }

    /**
     * 去加减币币账户余额,减少产品的剩余数目
     * @param memberId