fanli-server.git

			@@ -590,6 +590,15 @@
			final UserInfo uuser = user;
			ThreadUtil.run(new Runnable() {
			public void run() {

			try {
			// 获取邀请码：若无邀请码且存在有效的队员关系则自动生成邀请码
			userInfoExtraService.getUserInviteCode(uuser.getId());
			} catch (UserInfoExtraException e) {
			e.printStackTrace();
			}


			LogHelper.userInfo(GsonUtil.toJsonExpose(uuser));
			uuser.setLastLoginIp(remotIP);
			uuser.setLastLoginTime(java.lang.System.currentTimeMillis());

			@@ -323,6 +323,18 @@
			hb_id,hb_uid,hb_urank,hb_pid,hb_type,hb_state,hb_pre_get_time,hb_get_time,hb_version,
			IF(v2.`hb_state` = 4, 0, v2.hb_money)AS hb_money
			</sql>

			<sql id="Order_Column_List">
			co_id,co_uid,co_order_no,co_source_type,co_source_position,
			co_order_goods_id,co_count,co_state,co_state_whole_order,
			co_estimate,co_eIncome,co_payment,co_settlement,
			co_third_create_time,
			MAX(co_settle_time) AS co_settle_time,
			co_order_by,
			co_create_time,
			co_update_time
			</sql>


			<select id="listUserOrder" resultMap="ResultMap">
			<!-- 查询用户订单 -->
			@@ -330,8 +342,8 @@
			hb.hb_state AS hongBaoState,
			hb.`hb_type` AS hongBaoType,
			MAX(hb.`hb_get_time`) AS accountTime,
			MAX(hb.`hb_pre_get_time`)AS preAccountTime,
			co.*
			MAX(hb.`hb_pre_get_time`) AS preAccountTime,
			<include refid="Order_Column_List"/>
			FROM yeshi_ec_hongbao_order ho

			LEFT JOIN (SELECT <include refid="Hongbao_Column_List"/> FROM yeshi_ec_hongbao_v2 v2

	fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史