fanli-server.git

			@@ -135,7 +135,7 @@
			imgList.add(uploadResult.getUrl());
			data.put("shareImgs", imgList);
			out.print(JsonUtil.loadTrueResult(data));

			activityService.addShareCount(activityId, 1);
			} catch (UserShareGoodsRecordException e) {
			out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMessage()));
			} catch (ActivityException e) {
			@@ -155,6 +155,7 @@
			try {
			JSONObject data = activityService.shareGoodsV2(uid, activityId);
			out.print(JsonUtil.loadTrueResult(data));
			activityService.addShareCount(activityId, 1);
			} catch (UserShareGoodsRecordException e) {
			out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMessage()));
			} catch (ActivityException e) {
			@@ -205,6 +206,7 @@
			data.put("shareTitle", result.getTitle());
			data.put("shareImgs", imgList);
			out.print(JsonUtil.loadTrueResult(data));
			activityService.addShareCount(activityId, 1);
			} catch (ActivityException e) {
			out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMessage()));
			}

			@@ -237,8 +237,8 @@
			NULL,ss.money,0) + u.my_hongBao+IF( dd.`money` IS NOT NULL,dd.money,0)
			+IF( cc.`money` IS NOT NULL,cc.money,0) AS totalmoney FROM
			yeshi_ec_user u
			LEFT JOIN (SELECT h.uid,SUM(h.money) AS money FROM yeshi_ec_hongbao h
			WHERE h.state=3 AND h.uid = #{uid,jdbcType=BIGINT} GROUP BY h.uid)s ON
			LEFT JOIN (SELECT h.hb_uid as uid,SUM(h.hb_money) AS money FROM yeshi_ec_hongbao_v2 h
			WHERE h.hb_state=3 AND h.hb_uid = #{uid,jdbcType=BIGINT} GROUP BY h.hb_uid)s ON
			u.id=s.uid
			LEFT JOIN (SELECT SUM(t.`money`)AS money,t.uid FROM yeshi_ec_extract t
			WHERE (t.state=0 OR t.state=1) AND t.`uid`=#{uid,jdbcType=BIGINT}

	fanli/src/main/java/com/yeshi/fanli/controller/client/ActivityController.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/mapping/ExtractMapper.xml	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史