xiaoyong931011
2021-05-26 b99e4e26ce2750eafdb8e10c7c9e243328fc12c2
20210526  聊天
1 files added
4 files modified
84 ■■■■■ changed files
src/main/java/com/xcong/excoin/modules/otc/controller/OtcMarketBussinessController.java 10 ●●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/otc/service/OtcMarketBussinessService.java 2 ●●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcMarketBussinessServiceImpl.java 45 ●●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcMsgServiceImpl.java 2 ●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/otc/vo/ApplyConditionsVo.java 25 ●●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/otc/controller/OtcMarketBussinessController.java
@@ -11,6 +11,7 @@
import com.xcong.excoin.modules.otc.mapper.OtcMarketBussinessMapper;
import com.xcong.excoin.modules.otc.service.OtcEntrustOrderService;
import com.xcong.excoin.modules.otc.service.OtcMarketBussinessService;
import com.xcong.excoin.modules.otc.vo.ApplyConditionsVo;
import com.xcong.excoin.modules.otc.vo.MarketBussinessInfoVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -35,6 +36,15 @@
    private final MemberWalletCoinDao memberWalletCoinDao;
    private final MemberDao memberDao;
    @ApiOperation(value = "申请条件", notes = "申请条件")
    @ApiResponses({
            @ApiResponse(code = 200, message = "获取成功", response = ApplyConditionsVo.class)
    })
    @PostMapping(value = "/applyConditions")
    public Result applyConditions() {
        return otcMarketBussinessService.applyConditions();
    }
    @ApiOperation(value = "申请市商接口", notes = "申请市商接口")
    @PostMapping(value = "/applyMaketBussiness")
src/main/java/com/xcong/excoin/modules/otc/service/OtcMarketBussinessService.java
@@ -12,4 +12,6 @@
    Integer findMbStatus();
    Result findMbInfo(Long id);
    Result applyConditions();
}
src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcMarketBussinessServiceImpl.java
@@ -19,6 +19,7 @@
import com.xcong.excoin.modules.otc.mapper.OtcEntrustOrderMapper;
import com.xcong.excoin.modules.otc.mapper.OtcMarketBussinessMapper;
import com.xcong.excoin.modules.otc.service.OtcMarketBussinessService;
import com.xcong.excoin.modules.otc.vo.ApplyConditionsVo;
import com.xcong.excoin.modules.otc.vo.EntrustListInfoVo;
import com.xcong.excoin.modules.otc.vo.MarketBussinessInfoVo;
import lombok.RequiredArgsConstructor;
@@ -125,4 +126,48 @@
        mbVo.setNikename(member.getName());
        return Result.ok(mbVo);
    }
    @Override
    public Result applyConditions() {
        MemberEntity member = LoginUserUtils.getAppLoginUser();
        member = memberDao.selectById(member.getId());
//        long memberId = 444L;
//        MemberEntity member = memberDao.selectById(memberId);
        ApplyConditionsVo applyConditionsVo = new ApplyConditionsVo();
        OtcSetting setting = otcSettingDao.selectById(1L);
        // 所有已完成订单
        List<OtcOrder> finishOrders = otcOrderDao.selectOrderListForUser(member.getId(), 3);
        if (CollUtil.isEmpty(finishOrders) || setting.getOrderNum() > finishOrders.size()) {
            applyConditionsVo.setOrderNum(2);
        }else{
            applyConditionsVo.setOrderNum(1);
        }
        List<OtcOrder> allOrders = otcOrderDao.selectOrderListForUser(member.getId(), null);
        if (CollUtil.isNotEmpty(allOrders)) {
            BigDecimal finishRatio = BigDecimal.valueOf(finishOrders.size()).divide(BigDecimal.valueOf(allOrders.size()), 4, BigDecimal.ROUND_DOWN).multiply(BigDecimal.valueOf(100));
            if (setting.getCompletionRate().compareTo(finishRatio) > 0) {
                applyConditionsVo.setCompletionRate(2);
            }else{
                applyConditionsVo.setCompletionRate(1);
            }
        }
        BigDecimal totalAmount = otcOrderDao.selectOrderTotalAmount(member.getId());
        if (setting.getTotalAmount().compareTo(totalAmount) > 0) {
            applyConditionsVo.setTotalAmount(2);
        }else{
            applyConditionsVo.setTotalAmount(1);
        }
        Integer certifyStatus = member.getCertifyStatus();
        if(MemberEntity.CERTIFY_STATUS_Y == certifyStatus){
            applyConditionsVo.setMemberAuth(1);
        }else{
            applyConditionsVo.setMemberAuth(2);
        }
        return Result.ok(applyConditionsVo);
    }
}
src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcMsgServiceImpl.java
@@ -71,7 +71,7 @@
    @Transactional
    public Result getChatBox(ChatBoxDto chatBoxDto) {
        MemberEntity member = LoginUserUtils.getAppLoginUser();
//        MemberEntity member = memberDao.selectById(444L);
//        MemberEntity member = memberDao.selectById(443L);
        //对话是否存在
        long id = chatBoxDto.getId();
        if(ObjectUtil.isEmpty(id)){
src/main/java/com/xcong/excoin/modules/otc/vo/ApplyConditionsVo.java
New file
@@ -0,0 +1,25 @@
package com.xcong.excoin.modules.otc.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
@Data
@ApiModel(value = "ApplyConditionsVo", description = "接口返回类")
public class ApplyConditionsVo {
    @ApiModelProperty(value = "商家入驻总单数1:满足 2:不满足")
    private Integer orderNum;
    @ApiModelProperty(value = "商家入驻完成率1:满足 2:不满足")
    private Integer completionRate;
    @ApiModelProperty(value = "商家入驻总金额1:满足 2:不满足")
    private Integer totalAmount;
    @ApiModelProperty(value = "实名认证1:满足 2:不满足")
    private Integer memberAuth;
}