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 | 59 ++++++++++-------------------------------------------------
1 files changed, 10 insertions(+), 49 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 1d00c9e..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
@@ -22,7 +22,7 @@
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.bus.user.WeiXinUser;
import com.yeshi.fanli.entity.goods.CollectionGoodsV2;
-import com.yeshi.fanli.entity.system.System;
+import com.yeshi.fanli.entity.system.BusinessSystem;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
import com.yeshi.fanli.exception.goods.CollectionGoodsException;
@@ -31,18 +31,13 @@
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.goods.CollectionGoodsV2Service;
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoService;
import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;
import com.yeshi.fanli.service.inter.order.LostOrderService;
-import com.yeshi.fanli.service.inter.order.OrderItemServcie;
import com.yeshi.fanli.service.inter.order.OrderService;
import com.yeshi.fanli.service.inter.user.AccountMessageService;
-import com.yeshi.fanli.service.inter.user.BindingAccountService;
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,18 +59,7 @@
private OrderService orderService;
@Resource
- private HongBaoService hongBaoService;
-
-
-
- @Resource
- private BindingAccountService bindingAccountService;
-
- @Resource
private ExtractService extractService;
-
- @Resource
- private PassWordErrorRecordService passWordErrorRecordService;
@Resource
private ConfigService configService;
@@ -91,9 +75,6 @@
@Resource
private LostOrderService lostOrderService;
-
- @Resource
- private OrderItemServcie orderItemServcie;
@Resource
private AccountMessageService accountMessageService;
@@ -102,9 +83,6 @@
private CollectionGoodsV2Service collectionGoodsV2Service;
@Resource
private HongBaoManageService hongBaoManageService;
-
- @Resource
- private WxDownService wxDownService;
@Resource
private RedisManager redisManager;
@@ -134,7 +112,7 @@
}
}
// 涓嶆槸鐢↖D鐨勭櫥闄嗙殑浜嬪氨澶氫簡
- System system = xcxMiniControllerUtil.getSystem(acceptData);
+ BusinessSystem system = xcxMiniControllerUtil.getSystem(acceptData);
if (system == null) {
out.print(JsonUtil.loadFalseResult(XcxMiniControllerUtil.NOSYSTEM));
return;
@@ -311,10 +289,10 @@
}
private void outUserInfo(PrintWriter out, String remotIP, UserInfo user, String device) {
- BigDecimal totalmoney = hongBaoService.getTotalHongBaoByUid(user.getId());
+ BigDecimal totalmoney = new BigDecimal(0);
user.setTotalHongBao(totalmoney);
- BigDecimal unOpenmoney = hongBaoService.getUnOpenHongBaoByUid(user.getId());
- BigDecimal canOpenMoney = hongBaoService.getCanOpenHongBaoByUid(user.getId());
+ BigDecimal unOpenmoney = new BigDecimal(0);
+ BigDecimal canOpenMoney = new BigDecimal(0);
user.setNoOpenHongBao(unOpenmoney);
user.setCanOpenHongBao(canOpenMoney);
JSONObject data = new JSONObject();
@@ -328,7 +306,6 @@
uuser.setLastLoginIp(remotIP);
uuser.setLastLoginTime(java.lang.System.currentTimeMillis());
userInfoService.updateLoginInfo(uuser);
- wxDownService.save(device);
}
});
}
@@ -345,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(""));
@@ -366,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()));
@@ -385,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>();
@@ -444,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