From eed89d185cc54187353b03966296498b8495c442 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 06 十一月 2019 15:29:16 +0800
Subject: [PATCH] 商城订单相关bug修改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RedPackControllerV2.java | 87 +++++++++++++++++++++++--------------------
1 files changed, 47 insertions(+), 40 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RedPackControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RedPackControllerV2.java
index 099617e..a8c3c69 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RedPackControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RedPackControllerV2.java
@@ -62,22 +62,21 @@
@Resource
private RedPackDetailService redPackDetailService;
-
- @Resource
+
+ @Resource
private RedPackGiveRecordService redPackGiveRecordService;
-
- @Resource
+
+ @Resource
private RedPackExchangeService redPackExchangeService;
-
- @Resource
+
+ @Resource
private RedPackWinInviteService redPackWinInviteService;
-
- @Resource
+
+ @Resource
private UserInfoService userInfoService;
-
- @Resource
+
+ @Resource
private UserInfoExtraService userInfoExtraService;
-
/**
* 缁熻
@@ -137,10 +136,10 @@
tips.add("浣犱篃鍙互閫夋嫨浣跨敤绾㈠寘锛屼韩鍙楃粰鍔涙姌鎵ｃ��");
String giveMin = redPackConfigService.getValueByKey("give_money_min");
String giveMax = redPackConfigService.getValueByKey("give_money_max");
-
+
// 姝ｅ湪鎻愮幇閲戦
BigDecimal extractingMoney = redPackExchangeService.countMoneyByUidAndState(uid, RedPackExchange.STATE_INIT);
-
+
JSONObject data = new JSONObject();
data.put("balance", balance.setScale(2).toString());
data.put("helpLink", redPackConfigService.getValueByKey("desc_help_link"));
@@ -148,15 +147,15 @@
data.put("giveMax", giveMax);
data.put("giveDesc", "娉�:绾㈠寘璧犻�侀噾棰濊嚦灏�" + giveMin + "鍏冭嚦澶�" + giveMax + "鍏�");
- if (extractingMoney != null && extractingMoney.compareTo(zero) > 0)
+ if (extractingMoney != null && extractingMoney.compareTo(zero) > 0)
data.put("extractingInfo", "鎻愮幇涓細楼" + extractingMoney.setScale(2));
-
+
data.put("extractShortage", tips);
data.put("extractMin", redPackConfigService.getValueByKey("extract_money_min"));
data.put("extractMax", redPackConfigService.getValueByKey("extract_money_max"));
data.put("extractBanlenMin", redPackConfigService.getValueByKey("extract_banlen_min"));
data.put("extractDesc", "娉細3涓伐浣滄棩鍐呭畬鎴愬鏍革紝绾㈠寘鎻愮幇鎴愬姛鍚庡皢浼氳繘鍏ュ埌浣欓銆�");
-
+
data.put("useLink", redPackConfigService.getValueByKey("use_link"));
data.put("todayWin", todayWin.setScale(2).toString());
@@ -175,9 +174,12 @@
*
* @param acceptData
* @param uid
- * @param index List鏈�鏈殑涓婚敭ID
- * @param year 骞翠唤
- * @param month 鏈堜唤
+ * @param index
+ * List鏈�鏈殑涓婚敭ID
+ * @param year
+ * 骞翠唤
+ * @param month
+ * 鏈堜唤
* @param out
*/
@RequestMapping(value = "getMoneyDetails")
@@ -243,7 +245,6 @@
}
});
-
Gson gson = gsonBuilder.create();
JSONObject data = new JSONObject();
@@ -275,10 +276,9 @@
}
}
-
-
/**
* 杞崲绾㈠寘涓虹湡瀹為噾閽�
+ *
* @param acceptData
* @param uid
* @param amount
@@ -298,32 +298,33 @@
out.print(JsonUtil.loadFalseResult(1, e.getMsg()));
}
}
-
-
+
/**
* 绾㈠寘閭�璇疯繘搴�
+ *
* @param acceptData
* @param page
* @param uid
* @param out
*/
- @RequestMapping(value = "getRewardList", method = RequestMethod.POST)
- public void getRewardList(AcceptData acceptData, Integer page, Long uid, PrintWriter out) {
+ @RequestMapping(value = "getRewardList")
+ public void getRewardList(AcceptData acceptData, Integer page, Long uid, String callback, PrintWriter out) {
if (uid == null || uid <= 0) {
out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
return;
}
-
+
if (page == null || page < 1) {
out.print(JsonUtil.loadFalseResult(1, "椤电爜涓嶆纭�"));
return;
}
-
+
List<RedPackWinInviteVO> list = new ArrayList<RedPackWinInviteVO>();
-
- List<RedPackWinInvite> listRecord = redPackWinInviteService.getRewardList((page - 1) * Constant.PAGE_SIZE, Constant.PAGE_SIZE, uid);
+
+ List<RedPackWinInvite> listRecord = redPackWinInviteService.getRewardList((page - 1) * Constant.PAGE_SIZE,
+ Constant.PAGE_SIZE, uid);
if (listRecord != null && !listRecord.isEmpty()) {
- for (RedPackWinInvite record: listRecord) {
+ for (RedPackWinInvite record : listRecord) {
UserInfo user = null;
RedPackWinInviteVO winVO = new RedPackWinInviteVO();
RedPackWinInviteTypeEnum type = record.getType();
@@ -339,27 +340,29 @@
list.add(winVO);
}
}
-
+
JSONObject data = new JSONObject();
data.put("count", redPackWinInviteService.countRewardRecord(uid));
- data.put("list", JsonUtil.getApiCommonGson().toJson(list));
- out.print(JsonUtil.loadTrueResult(data));
+ data.put("list", JsonUtil.getApiCommonGson().toJson(list));
+ if (!StringUtil.isNullOrEmpty(callback)) {
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
+ } else
+ out.print(JsonUtil.loadTrueResult(data));
}
-
-
+
/**
* 鐢ㄦ埛鍩虹淇℃伅
+ *
* @param acceptData
* @param uid
* @param out
*/
- @RequestMapping(value = "getBasicInfo", method = RequestMethod.POST)
- public void getBasicInfo(AcceptData acceptData, Long uid, PrintWriter out) {
+ @RequestMapping(value = "getBasicInfo")
+ public void getBasicInfo(AcceptData acceptData, Long uid, String callback, PrintWriter out) {
if (uid == null || uid <= 0) {
out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
return;
}
-
JSONObject data = new JSONObject();
data.put("balance", redPackBalanceService.getBalance(uid));
data.put("ruleLink", redPackConfigService.getValueByKey("invite_reward_rule_link"));
@@ -369,6 +372,10 @@
} else {
data.put("inviteCode", "");
}
- out.print(JsonUtil.loadTrueResult(data));
+
+ if (!StringUtil.isNullOrEmpty(callback)) {
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
+ } else
+ out.print(JsonUtil.loadTrueResult(data));
}
}
--
Gitblit v1.8.0