From fe879975a3e8a0a1aa280fb839e02d159bfbcff8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 27 八月 2019 18:04:38 +0800
Subject: [PATCH] 金币任务多次获取bug修改
---
fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxUserInfoController.java | 35 +++++------------------------------
1 files changed, 5 insertions(+), 30 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxUserInfoController.java b/fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxUserInfoController.java
index 7c13b73..6c687a0 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxUserInfoController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxUserInfoController.java
@@ -36,10 +36,8 @@
import com.yeshi.fanli.service.inter.order.OrderService;
import com.yeshi.fanli.service.inter.user.AccountMessageService;
import com.yeshi.fanli.service.inter.user.ExtractService;
-import com.yeshi.fanli.service.inter.user.PassWordErrorRecordService;
import com.yeshi.fanli.service.inter.user.ShamUserService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
-import com.yeshi.fanli.service.inter.user.WxDownService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.GsonUtil;
import com.yeshi.fanli.util.RedisManager;
@@ -64,9 +62,6 @@
private ExtractService extractService;
@Resource
- private PassWordErrorRecordService passWordErrorRecordService;
-
- @Resource
private ConfigService configService;
@Resource
@@ -88,9 +83,6 @@
private CollectionGoodsV2Service collectionGoodsV2Service;
@Resource
private HongBaoManageService hongBaoManageService;
-
- @Resource
- private WxDownService wxDownService;
@Resource
private RedisManager redisManager;
@@ -314,7 +306,6 @@
uuser.setLastLoginIp(remotIP);
uuser.setLastLoginTime(java.lang.System.currentTimeMillis());
userInfoService.updateLoginInfo(uuser);
- wxDownService.save(device);
}
});
}
@@ -331,7 +322,7 @@
*/
@RequestMapping("collectionGoods")
public void collectionGoods(long uid, long auctionId, int type, PrintWriter out) {
- CollectionGoodsV2 find = collectionGoodsV2Service.findByUidAndAuctionId(uid, auctionId);
+ CollectionGoodsV2 find = collectionGoodsV2Service.findByUidAndAuctionId(uid, auctionId,Constant.SOURCE_TYPE_TAOBAO);
if (type == 1) {
if (find != null) {
out.print(JsonUtil.loadFalseResult(""));
@@ -352,7 +343,7 @@
return;
} else {
try {
- collectionGoodsV2Service.cancelCollectionByAuctionId(uid, auctionId);
+ collectionGoodsV2Service.cancelCollectionByAuctionId(uid, auctionId, Constant.SOURCE_TYPE_TAOBAO);
out.print(JsonUtil.loadTrueResult("鍙栨秷鏀惰棌鎴愬姛"));
} catch (CollectionGoodsException e) {
out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
@@ -371,9 +362,9 @@
* @param out
*/
@RequestMapping("collectionGoodsList")
- public void collectionGoodsList(long uid, int page, int pageSize, PrintWriter out) {
- List<CollectionGoodsV2> coList = collectionGoodsV2Service.getCollectionGoodsList(uid, page, pageSize);
- long count = collectionGoodsV2Service.getCollectionGoodsCount(uid);
+ public void collectionGoodsList(long uid, int page, int pageSize, Integer source,PrintWriter out) {
+ List<CollectionGoodsV2> coList = collectionGoodsV2Service.getCollectionGoodsList(uid, page, pageSize, source);
+ long count = collectionGoodsV2Service.getCollectionGoodsCount(uid, source);
JSONObject data = new JSONObject();
BigDecimal proportion = hongBaoManageService.getFanLiRate();
List<TaoBaoGoodsBriefExtra> list = new ArrayList<TaoBaoGoodsBriefExtra>();
@@ -430,22 +421,6 @@
e.printStackTrace();
}
out.print(JsonUtil.loadTrueResult("鍒犻櫎鎴愬姛"));
- }
-
- /**
- *
- * 鏂规硶璇存槑: 寰俊鐧婚檰
- *
- * @author mawurui createTime 2018骞�4鏈�25鏃� 涓嬪崍5:02:02
- * @param acceptData
- * @param out
- */
- @RequestMapping(value = "isWxDown")
- public void isWxDown(AcceptData acceptData, PrintWriter out) {
- boolean b = wxDownService.isWxDownFirstLogin(acceptData.getDevice());
- JSONObject data = new JSONObject();
- data.put("isFirst", b);
- out.print(JsonUtil.loadTrueResult(data));
}
/**
--
Gitblit v1.8.0