fanli-server.git

			@@ -63,7 +63,7 @@

			<select id="countMoneyByDate" resultType="java.math.BigDecimal">
			SELECT IFNULL(SUM(t.`uto_money`),0) FROM `yeshi_ec_user_taolijin_origin` t
			WHERE t.`uto_uid` = #{uid} AND t.`uto_origin` <![CDATA[<>]]>'refund'
			WHERE t.`uto_uid` = #{uid} AND t.`uto_origin` <![CDATA[<>]]>'refund' AND t.`uto_origin` <![CDATA[<>]]>'giveSendBack'
			<if test="dateType == 1"> <!-- 今日 -->
			AND TO_DAYS(t.`uto_create_time`) = TO_DAYS(NOW());
			</if>

			@@ -626,9 +626,8 @@
			// 添加红包余额
			userMoneyExtraService.addTaoLiJin(uid, money, false);
			// 添加新增记录
			UserTaoLiJinOrigin origin = saveOrigin(uid, 1, money, TaoLiJinOriginEnum.giveSendBack);
			saveOrigin(uid, 1, money, TaoLiJinOriginEnum.giveSendBack);
			// 红包明细
			userTaoLiJinDetailService.createAddDetail(origin);
			UserTaoLiJinDetail detail = new UserTaoLiJinDetail();
			detail.setUid(uid);
			detail.setMoney(money);
			@@ -647,7 +646,7 @@
			MsgOtherGiveContentDTO msgOther = new MsgOtherGiveContentDTO();
			msgOther.setType(MsgOtherGiveContentDTO.TYEP_TLJ);
			msgOther.setTitle("推广红包退回");
			msgOther.setGiveType("你赠送的"+ money + "推广红包未被成功领取");
			msgOther.setGiveType("你赠送的"+ money.setScale(0) + "元推广红包未被成功领取");
			msgOther.setGiveTime(sd.format(record.getGiveTime()));
			msgOther.setReturnTime(sd.format(new Date()));
			userOtherMsgNotificationService.tokenGiveMsg(record.getGiveUid(), beiZhu, msgOther);

			@@ -464,11 +464,10 @@
			}
			}

			// 计算剩余未领取数量= 总数量 - 领取数量
			// 计算剩余未领取数量
			int winNum = userTaoLiJinRecordVO.getWinNum();
			int totalNum = userTaoLiJinRecordVO.getTotalNum();
			int refundNum = userTaoLiJinRecordVO.getRefundNum();
			userTaoLiJinRecordVO.setSurplusNum(totalNum - winNum - refundNum);
			userTaoLiJinRecordVO.setSurplusNum(totalNum - winNum);

			// 计算分享奖金
			BigDecimal shareMoney = new BigDecimal(0);

	fanli/src/main/java/com/yeshi/fanli/mapping/tlj/UserTaoLiJinOriginMapper.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinOriginServiceImpl.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinRecordServiceImpl.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史