exchange.git - Gitblit

			@@ -36,7 +36,7 @@
			private final MemberDao memberDao;


			@ApiOperation(value = "applyMarketBussiness", notes = "申请市商接口")
			@ApiOperation(value = "申请市商接口", notes = "申请市商接口")
			@PostMapping(value = "/applyMaketBussiness")
			public Result applyMarketBussiness() {
			otcMarketBussinessService.add();

			@@ -48,15 +48,14 @@
			}
			OtcSetting setting = otcSettingDao.selectById(1L);
			// 所有已完成订单
			List<OtcOrder> finishOrders = otcOrderDao.selectOrderListForUser(member.getId(), 0);
			List<OtcOrder> finishOrders = otcOrderDao.selectOrderListForUser(member.getId(), 3);
			if (CollUtil.isEmpty(finishOrders) \|\| setting.getOrderNum() > finishOrders.size()) {
			throw new GlobalException("条件未达标");
			}

			List<OtcOrder> unFinishOrders = otcOrderDao.selectOrderListForUser(member.getId(), 4);
			if (CollUtil.isNotEmpty(unFinishOrders)) {
			//完成率 = 已完成 / 总单数
			BigDecimal finishRatio = BigDecimal.valueOf(finishOrders.size()).divide(BigDecimal.valueOf(finishOrders.size() + unFinishOrders.size()), 4, BigDecimal.ROUND_DOWN).multiply(BigDecimal.valueOf(100));
			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) {
			throw new GlobalException("条件未达标");
			}

			@@ -51,7 +51,7 @@
			List<OtcOrder> otcOrders = otcOrderDao.selectOrderListWithStatusAndType(OtcEntrustOrder.ORDER_TYPE_B, OtcOrder.STATUS_SUBMIT);
			if (CollUtil.isNotEmpty(otcOrders)) {
			for (OtcOrder otcOrder : otcOrders) {
			long between = DateUtil.between(new Date(), DateUtil.offsetMinute(otcOrder.getCreateTime(), 3), DateUnit.SECOND, false);
			long between = DateUtil.between(new Date(), DateUtil.offsetMinute(otcOrder.getCreateTime(), 30), DateUnit.SECOND, false);

			if (between <= 0) {
			OtcOrder saleOrder = otcOrderDao.selectOrderByOrderNoAndType(otcOrder.getOrderNo(), OtcEntrustOrder.ORDER_TYPE_S);

			@@ -89,12 +89,9 @@
			<select id="selectOrderListForUser" resultType="com.xcong.excoin.modules.otc.entity.OtcOrder">
			select * from otc_order
			where member_id=#{memberId}
			<!-- 查询除完成以外所有订单 -->
			<if test="status != null and status == 0">
			and status = 3
			</if>
			<if test="status != null and status != 0">
			and status != 3
			<!-- 查询除完成以外所有订单 -->
			<if test="status != null">
			and status == #{status}
			</if>
			</select>

	src/main/java/com/xcong/excoin/modules/otc/controller/OtcMarketBussinessController.java	2 ●●●●● patch \| view \| raw \| blame \| history
	src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcMarketBussinessServiceImpl.java	9 ●●●●● patch \| view \| raw \| blame \| history
	src/main/java/com/xcong/excoin/quartz/job/OtcOrderJob.java	2 ●●●●● patch \| view \| raw \| blame \| history
	src/main/resources/mapper/otc/OtcOrderDao.xml	9 ●●●●● patch \| view \| raw \| blame \| history