From 48a204f4c90a80c0bb4e5ba1f9f0f42939cadba8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 01 一月 2020 10:19:34 +0800
Subject: [PATCH] 用户资金记录bug修改，京东，拼多多小程序商品转链
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserCouponController.java | 78 +++++++++++++++++++-------------------
1 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserCouponController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserCouponController.java
index f6bbfca..277b351 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserCouponController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserCouponController.java
@@ -20,7 +20,6 @@
import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
import com.yeshi.fanli.entity.bus.user.UserLotteryRecord;
import com.yeshi.fanli.entity.system.SystemCoupon;
-import com.yeshi.fanli.exception.user.UserInfoExtraException;
import com.yeshi.fanli.exception.user.UserLotteryRecordException;
import com.yeshi.fanli.exception.user.UserSystemCouponException;
import com.yeshi.fanli.service.inter.config.ConfigService;
@@ -31,6 +30,7 @@
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserLotteryRecordService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
+import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.vo.user.UserSystemCouponRecordVO;
import com.yeshi.fanli.vo.user.UserSystemCouponVO;
@@ -78,7 +78,8 @@
@Resource
private UserLotteryRecordService userLotteryRecordService;
-
+ @Resource
+ private UserVIPInfoService userVIPInfoService;
/**
* 鐢ㄦ埛鍒稿垪琛ㄦ煡璇�
@@ -103,7 +104,7 @@
// 绂忓埄涓績鍥剧墖
String topPicture = null;
if (page == 1) {
- List<SwiperPicture> listswiper = swiperPictureService.getByBannerCard("welfare_top");
+ List<SwiperPicture> listswiper = swiperPictureService.getByBannerCardAndVersion("welfare_top",acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()));
if (listswiper != null && listswiper.size() > 0) {
topPicture = listswiper.get(0).getSrc();
}
@@ -119,13 +120,11 @@
changeJump = true;
}
- long count = 0;
+ long count = UserSystemCouponService.countCouponOld(uid);
List<UserSystemCouponVO> resultList = UserSystemCouponService
.getUserCouponVOList((page - 1) * Constant.PAGE_SIZE, Constant.PAGE_SIZE, uid, changeJump);
- if (resultList != null && resultList.size() > 0) {
- count = UserSystemCouponService.countUserCouponList(uid);
- } else if (resultList == null) {
+ if (resultList == null) {
resultList = new ArrayList<UserSystemCouponVO>();
}
@@ -144,14 +143,11 @@
UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
// 鏈鍒告槸鍚﹀ぇ浜�0
if (userInfoExtra != null && userInfoExtra.getCouponNews() > 0) {
- userInfoExtra.setCouponNews(0);
- try {
- userInfoExtraService.saveUserInfoExtra(userInfoExtra);
- } catch (UserInfoExtraException e) {
- e.printStackTrace();
- }
+ UserInfoExtra extra = new UserInfoExtra();
+ extra.setId(userInfoExtra.getId());
+ extra.setCouponNews(0);
+ userInfoExtraService.updateByPrimaryKeySelective(extra);
}
-
}
});
}
@@ -216,14 +212,18 @@
* @param out
*/
@RequestMapping(value = "useFreeCoupon", method = RequestMethod.POST)
- public void useFreeCoupon(AcceptData acceptData, Long uid, Long cid, Long goodId, PrintWriter out) {
+ public void useFreeCoupon(AcceptData acceptData, Long uid, Long cid, Long goodId, Integer goodsType, PrintWriter out) {
if (uid == null) {
out.print(JsonUtil.loadFalseResult("鐢ㄦ埛鏈櫥褰�"));
return;
}
+
+ if (goodsType == null || goodsType > 3 || goodsType < 1) {
+ goodsType = Constant.SOURCE_TYPE_TAOBAO;
+ }
try {
- UserSystemCouponService.useGoodsCoupon(uid, cid, goodId);
+ UserSystemCouponService.useGoodsCoupon(uid, cid, goodId, goodsType);
out.print(JsonUtil.loadTrueResult("浣跨敤鎴愬姛"));
} catch (UserSystemCouponException e) {
out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
@@ -287,17 +287,19 @@
return;
}
+ if (userVIPInfoService.isVIP(uid)) {
+ out.print(JsonUtil.loadFalseResult("瓒呯骇浼氬憳涓嶅彲浣跨敤濂栧姳鍒�"));
+ return;
+ }
+
if (goodsType == null || goodsType > 3 || goodsType < 1) {
goodsType = Constant.SOURCE_TYPE_TAOBAO;
}
try {
- UserSystemCouponService.useOrderCoupon(uid, cid, orderNo, goodsType);
-
- JSONObject data = commonOrderService.getRewardJumpInfo(orderNo);
-
+ UserSystemCouponService.useOrderCoupon(uid, cid, orderNo, goodsType, acceptData);
+ JSONObject data = commonOrderService.getRewardJumpInfo(orderNo, goodsType);
out.print(JsonUtil.loadTrueResult(data));
-
} catch (UserSystemCouponException e) {
out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
} catch (Exception e) {
@@ -314,17 +316,16 @@
* @param out
*/
@RequestMapping(value = "getRewardRecord", method = RequestMethod.POST)
- public void getRewardCounponRecord(AcceptData acceptData, String orderNo, PrintWriter out) {
-
+ public void getRewardCounponRecord(AcceptData acceptData, String orderNo, Integer goodsType, PrintWriter out) {
try {
-
- UserSystemCouponRecordVO rewardRecord = UserSystemCouponService.getRewardCouponRecord(orderNo);
-
+ if (goodsType == null || goodsType > 3 || goodsType < 1) {
+ goodsType = Constant.SOURCE_TYPE_TAOBAO;
+ }
+
+ UserSystemCouponRecordVO rewardRecord = UserSystemCouponService.getRewardCouponRecord(orderNo, goodsType);
JSONObject data = new JSONObject();
data.put("rewardRecord", rewardRecord);
-
out.print(JsonUtil.loadTrueResult(data));
-
} catch (UserSystemCouponException e) {
out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
} catch (Exception e) {
@@ -341,17 +342,16 @@
* @param out
*/
@RequestMapping(value = "getFreeCounponRecord", method = RequestMethod.POST)
- public void getFreeCounponRecord(AcceptData acceptData, String orderNo, PrintWriter out) {
-
+ public void getFreeCounponRecord(AcceptData acceptData, String orderNo, Integer goodsType, PrintWriter out) {
try {
-
- UserSystemCouponRecordVO rewardRecord = UserSystemCouponService.getFreeCouponRecord(orderNo);
-
+ if (goodsType == null || goodsType > 3 || goodsType < 1) {
+ goodsType = Constant.SOURCE_TYPE_TAOBAO;
+ }
+
+ UserSystemCouponRecordVO rewardRecord = UserSystemCouponService.getFreeCouponRecord(orderNo, goodsType);
JSONObject data = new JSONObject();
data.put("frreCouponRecord", rewardRecord);
-
out.print(JsonUtil.loadTrueResult(data));
-
} catch (UserSystemCouponException e) {
out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
} catch (Exception e) {
@@ -368,7 +368,7 @@
* @param uid
* @param out
*/
- @RequestMapping(value = "getLotteryCount")
+ // @RequestMapping(value = "getLotteryCount")
public void getLotteryCount(String callback, AcceptData acceptData, Long uid, PrintWriter out) {
try {
// 1銆佸凡鐧诲綍绯荤粺
@@ -423,7 +423,7 @@
* @param uid
* @param out
*/
- @RequestMapping(value = "getLotteryResult")
+ // @RequestMapping(value = "getLotteryResult")
public void getLotteryResult(String callback, AcceptData acceptData, Long uid, PrintWriter out) {
try {
@@ -549,7 +549,7 @@
* @param uid
* @param out
*/
- @RequestMapping(value = "getDailyCount")
+ // @RequestMapping(value = "getDailyCount")
public void getDailyCount(String callback, AcceptData acceptData, Long uid, PrintWriter out) {
try {
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(userLotteryRecordService.getLotteryCountDaily(uid)));
@@ -568,7 +568,7 @@
* @param uid
* @param out
*/
- @RequestMapping(value = "getDailyResult")
+ // @RequestMapping(value = "getDailyResult")
public void getDailyResult(String callback, AcceptData acceptData, Long uid, PrintWriter out) {
try {
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(userLotteryRecordService.executeLotteryDaily(uid)));
--
Gitblit v1.8.0