exchange.git - Gitblit

			@@ -184,8 +184,9 @@
			FollowTraderInfoEntity traderInfoEntity = null;
			// 判断当前订单是否为跟单
			if (ContractOrderEntity.CONTRACTTYPE_DOCUMENTARY == holdOrderEntity.getContractType()) {
			// 若不为交易员，则计算跟随者订单返利
			if (!MemberEntity.IS_TRADER_Y.equals(memberEntity.getIsTrader())) {
			// 若不为交易员且不是测试账号，则计算跟随者订单返利
			if (!MemberEntity.IS_TRADER_Y.equals(memberEntity.getIsTrader()) &&
			!MemberEntity.ACCOUNT_TYPE_TEST.equals(memberEntity.getAccountType())) {
			traderInfoEntity = followTraderInfoDao.selectTraderInfoByOrderId(holdOrderEntity.getId());
			if (profitOrLoss.compareTo(BigDecimal.ZERO) > 0) {
			// 计算需返利给交易员的金额

			@@ -5,8 +5,7 @@
			<select id="coinInList" resultType="com.xcong.excoin.modules.coin.entity.MemberAccountMoneyChange">
			select * from member_account_money_change
			where member_id = #{record.memberId}
			and (content like '%转%' or content like '%收款%' or (content like '%提币%' and withdraw_id in
			(select id from member_coin_withdraw w where w.member_id = #{record.memberId} and is_inside = "Y")) )
			and (content like '%转%' or content like '%收款%')
			order by create_time desc
			</select>

			@@ -4,7 +4,7 @@

			<select id="findMemberCoinWithdrawInPage" resultType="com.xcong.excoin.modules.member.entity.MemberCoinWithdrawEntity">
			select * from member_coin_withdraw
			where member_id = #{record.memberId} and is_inside = 'N'
			where member_id = #{record.memberId}
			order by create_time desc
			</select>

	src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java	5 ●●●●● patch \| view \| raw \| blame \| history
	src/main/resources/mapper/member/MemberAccountMoneyChangeDao.xml	3 ●●●●● patch \| view \| raw \| blame \| history
	src/main/resources/mapper/member/MemberCoinWithdrawDao.xml	2 ●●●●● patch \| view \| raw \| blame \| history