fanli-server.git

			@@ -773,7 +773,7 @@
			ExtractRecord extractRecord = extractRecordService.getExtractRecordByUid(uid);
			boolean canExtract = true;
			String errorMsg = "";
			if (extractRecord != null && extractRecord.getCount() + 1 >= maxDayCount) {
			if (extractRecord != null && extractRecord.getCount() + 1 > maxDayCount) {
			canExtract = false;
			errorMsg = String.format("每日最多提现%s次", maxDayCount + "");
			} else if (extractRecord != null

			@@ -8,12 +8,12 @@
			<result column="s_createtime" property="createTime" jdbcType="TIMESTAMP" />
			<result column="s_updatetime" property="updateTime" jdbcType="TIMESTAMP" />

			<association property="userInfo" column="cg_uid"
			<association property="userInfo" column="s_uid"
			javaType="com.yeshi.fanli.entity.bus.user.UserInfo">
			<id column="cg_uid" property="id" jdbcType="BIGINT" />
			<id column="s_uid" property="id" jdbcType="BIGINT" />
			</association>

			<association property="commonGoods" column="cg_common_goods_id"
			<association property="commonGoods" column="s_common_goods_id"
			select="com.yeshi.fanli.dao.mybatis.goods.CommonGoodsMapper.selectByPrimaryKey">
			</association>

			@@ -49,7 +49,6 @@
			<if test="uid != null"> s.`s_uid`=#{uid,jdbcType=BIGINT} or</if>
			<if test="device != null">s.`s_device`=#{device,jdbcType=VARCHAR} or</if>
			</trim>
			GROUP BY s.`s_common_goods_id`
			</select>

			@@ -156,6 +156,7 @@
			ThreeSale threeSale = list.get(0);
			UserInfo inviter = threeSale.getBoss();
			threeSale.setState(true);
			threeSale.setSucceedTime(System.currentTimeMillis());
			dao.update(threeSale);
			if (inviter != null)
			reComputeUserRank(inviter.getId());

	fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/mapping/goods/ScanHistoryV2Mapper.xml	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史