From 8c93d2e3b22ac543f8f94c2cf0eb982258fb708b Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 07 十二月 2019 15:33:00 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RedPackControllerV2.java | 89 ++++++++++++++------------------------------
1 files changed, 29 insertions(+), 60 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 8af1684..dc445ce 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
@@ -26,7 +26,6 @@
import com.google.gson.stream.JsonReader;
import com.google.gson.stream.JsonWriter;
import com.yeshi.fanli.entity.accept.AcceptData;
-import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
import com.yeshi.fanli.entity.redpack.RedPackDetail.RedPackDetailTypeEnum;
@@ -41,16 +40,17 @@
import com.yeshi.fanli.service.inter.redpack.RedPackConfigService;
import com.yeshi.fanli.service.inter.redpack.RedPackDetailService;
import com.yeshi.fanli.service.inter.redpack.RedPackExchangeService;
+import com.yeshi.fanli.service.inter.redpack.RedPackForbidService;
import com.yeshi.fanli.service.inter.redpack.RedPackGiveRecordService;
import com.yeshi.fanli.service.inter.redpack.RedPackWinInviteService;
-import com.yeshi.fanli.service.inter.redpack.RedPackWinNewUserService;
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
+import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TimeUtil;
+import com.yeshi.fanli.util.UserInviteUtil;
import com.yeshi.fanli.vo.redpack.RedPackDetailVO;
-import com.yeshi.fanli.vo.redpack.RedPackWinDetailVO;
import com.yeshi.fanli.vo.redpack.RedPackWinInviteVO;
import net.sf.json.JSONObject;
@@ -76,21 +76,24 @@
@Resource
private RedPackWinInviteService redPackWinInviteService;
-
- @Resource
- private RedPackWinNewUserService redPackWinNewUserService;
@Resource
private UserInfoService userInfoService;
@Resource
private UserInfoExtraService userInfoExtraService;
-
+
@Resource
private JumpDetailV2Service jumpDetailV2Service;
-
+
@Resource
private SwiperPictureService swiperPictureService;
+
+ @Resource
+ private UserSystemCouponService userSystemCouponService;
+
+ @Resource
+ private RedPackForbidService redPackForbidService;
/**
* 缁熻
@@ -116,6 +119,7 @@
BigDecimal thisMonthUse = zero;
BigDecimal lastMonthUse = zero;
BigDecimal balance = redPackBalanceService.getBalance(uid);
+ ;
if (balance == null) {
balance = zero;
} else {
@@ -188,12 +192,9 @@
*
* @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")
@@ -376,12 +377,16 @@
@RequestMapping(value = "getBasicInfo")
public void getBasicInfo(AcceptData acceptData, Long uid, String callback, PrintWriter out) {
if (uid == null || uid <= 0) {
- out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
return;
}
+
JSONObject data = new JSONObject();
data.put("balance", redPackBalanceService.getBalance(uid));
data.put("ruleLink", redPackConfigService.getValueByKey("invite_reward_rule_link"));
+ data.put("shareLink", UserInviteUtil.getShareUrl(uid));
+ data.put("redPackLock", redPackForbidService.verifyForbid(uid));
+
UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
if (userInfoExtra != null && !StringUtil.isNullOrEmpty(userInfoExtra.getInviteCode())) {
data.put("inviteCode", userInfoExtra.getInviteCode());
@@ -389,54 +394,18 @@
data.put("inviteCode", "");
}
+ //
+ long freeCouponCount = userSystemCouponService.countUsableFreeCouponForBuy(uid);
+ long rewardCouponCount = userSystemCouponService.countUsableRewardCoupon(uid);
+
+ data.put("freeCouponCount", freeCouponCount);
+ data.put("rewardCouponCount", rewardCouponCount);
+
if (!StringUtil.isNullOrEmpty(callback)) {
out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
- } else
+ } else {
out.print(JsonUtil.loadTrueResult(data));
- }
-
-
- /**
- * 鏂颁汉绾㈠寘璇︽儏
- * @param acceptData
- * @param uid
- * @param out
- */
- @RequestMapping(value = "getWinDetail", method = RequestMethod.POST)
- public void getWinDetail(AcceptData acceptData, Long uid, PrintWriter out) {
- if (uid == null || uid <= 0) {
- out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
- return;
}
-
- try {
- RedPackWinDetailVO winDetail = redPackWinNewUserService.receiveReward(uid);
- if (winDetail == null) {
- out.print(JsonUtil.loadFalseResult(1, "绾㈠寘宸茶鎶㈠厜"));
- return;
- }
- winDetail.setLogo(Constant.systemCommonConfig.getDefaultPortrait());
- winDetail.setLogoLight(Constant.systemCommonConfig.getDefaultPortrait());
-
- JSONObject params = new JSONObject();
- params.put("url", redPackConfigService.getValueByKey("goods_shop_link_h5"));
- winDetail.setParams(params.toString());
- winDetail.setJumpDetail(jumpDetailV2Service.getByTypeCache("web",
- Constant.getPlatformCode(acceptData.getPlatform()), Integer.parseInt(acceptData.getVersion())));
- winDetail.setTips(redPackConfigService.getValueByKey("new_user_win_tips"));
+ }
- // 2銆侀《閮ㄨ疆鎾浘
- List<SwiperPicture> oldtopPicList = swiperPictureService.getByBannerCard("redpack_win_detail_banner");
- List<SwiperPicture> topPicList = new ArrayList<>();
- if (oldtopPicList != null && oldtopPicList.size() > 0)
- topPicList.addAll(oldtopPicList);
-
- JSONObject data = new JSONObject();
- data.put("detail", JsonUtil.getApiCommonGson().toJson(winDetail));
- data.put("banner", JsonUtil.getApiCommonGson().toJson(topPicList));
- out.print(JsonUtil.loadTrueResult(data));
- } catch (Exception e) {
- out.print(JsonUtil.loadFalseResult(1, "绾㈠寘宸茶鎶㈠厜鍟�"));
- }
- }
}
--
Gitblit v1.8.0