From 39c683421f75449c7a85280fa499bae3a2f5241b Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 26 八月 2019 09:27:49 +0800
Subject: [PATCH] 金币领取
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java | 232 ++++++++++++++++++++++++++++-----------------------------
1 files changed, 114 insertions(+), 118 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java
index 47215bd..d228ffa 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java
@@ -40,7 +40,6 @@
import com.yeshi.fanli.dto.HongBaoDTO;
import com.yeshi.fanli.dto.money.AccountDetails;
import com.yeshi.fanli.dto.order.OrderItem;
-import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;
import com.yeshi.fanli.entity.AppVersionInfo;
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.user.AccountMessage;
@@ -55,11 +54,11 @@
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
import com.yeshi.fanli.entity.bus.user.WeiXinUser;
+import com.yeshi.fanli.entity.bus.user.UserInfoModifyRecord.ModifyTypeEnum;
import com.yeshi.fanli.entity.common.AdminUser;
import com.yeshi.fanli.entity.common.Config;
import com.yeshi.fanli.entity.goods.CollectionGoodsV2;
import com.yeshi.fanli.entity.goods.CommonGoods;
-import com.yeshi.fanli.entity.jd.JDGoods;
import com.yeshi.fanli.entity.money.UserMoneyDetail;
import com.yeshi.fanli.entity.order.HongBaoOrder;
import com.yeshi.fanli.entity.system.BusinessSystem;
@@ -98,6 +97,7 @@
import com.yeshi.fanli.service.inter.user.UserActiveLogService;
import com.yeshi.fanli.service.inter.user.UserCustomSettingsService;
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
+import com.yeshi.fanli.service.inter.user.UserInfoModifyRecordService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.UserMoneyDetailService;
import com.yeshi.fanli.service.inter.user.UserShareGoodsRecordService;
@@ -110,14 +110,13 @@
import com.yeshi.fanli.util.ThreadUtil;
import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.Utils;
+import com.yeshi.fanli.util.VersionUtil;
import com.yeshi.fanli.util.account.UserUtil;
import com.yeshi.fanli.util.annotation.RequestSerializableByKey;
import com.yeshi.fanli.util.email.MailSenderUtil;
import com.yeshi.fanli.util.factory.AccountDetailsFactory;
import com.yeshi.fanli.util.factory.HongBaoFactory;
import com.yeshi.fanli.util.factory.OrderItemFactory;
-import com.yeshi.fanli.util.jd.JDApiUtil;
-import com.yeshi.fanli.util.pinduoduo.PinDuoDuoApiUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import com.yeshi.fanli.util.wx.WXLoginUtil;
@@ -217,6 +216,10 @@
@Resource
private UserTaoLiJinDetailService userTaoLiJinDetailService;
+
+ @Resource
+ private UserInfoModifyRecordService userInfoModifyRecordService;
+
private static final String PASSWORD_MAX_ERROR = "password_max_error";
private static final String EXTRACT_MIN_MONEY = "extract_min_money";
@@ -1081,7 +1084,7 @@
* @param type
* @param out
*/
- @RequestSerializableByKey(key = "uid")
+ @RequestSerializableByKey(key = "#uid")
@RequestMapping(value = "extractmoneynew", method = RequestMethod.POST)
public void extractMoneyNew(AcceptData acceptData, long uid, BigDecimal money, String vcode,
HttpServletRequest request, int type, PrintWriter out) {
@@ -1361,74 +1364,37 @@
}
@RequestMapping("collectionGoods")
- public void collectionGoods(AcceptData acceptData, long uid, long auctionId, int type, Integer goodsType,
- PrintWriter out) {
- if (goodsType == null) {
- goodsType = Constant.SOURCE_TYPE_TAOBAO;
- }
- CollectionGoodsV2 find = collectionGoodsV2Service.findByUidAndAuctionId(uid, auctionId, goodsType);
- if (type == 1) {
- if (find != null) {
- out.print(JsonUtil.loadFalseResult(""));
- return;
- }
-
- if (goodsType == Constant.SOURCE_TYPE_JD) {
- JDGoods jdGoods = JDApiUtil.queryGoodsDetail(auctionId);
- if (jdGoods == null) {
- jdGoods = JDApiUtil.getGoodsDetail(auctionId);
- }
-
- if (jdGoods == null) {
- out.print(JsonUtil.loadFalseResult(1, "鍟嗗搧宸蹭笅鏋�"));
- } else {
- try {
- collectionGoodsV2Service.addJDCollection(uid, jdGoods);
- out.print(JsonUtil.loadTrueResult("鏀惰棌鎴愬姛"));
- } catch (CollectionGoodsException e) {
- out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
- }
- }
- } else if (goodsType == Constant.SOURCE_TYPE_PDD) {
- PDDGoodsDetail pddGoods = PinDuoDuoApiUtil.getGoodsDetail(auctionId);
- if (pddGoods == null) {
- out.print(JsonUtil.loadFalseResult(1, "鍟嗗搧宸蹭笅鏋�"));
+ public void collectionGoods(AcceptData acceptData, long uid, long auctionId, int type, PrintWriter out) {
+ try {
+ CollectionGoodsV2 find = collectionGoodsV2Service.findByUidAndAuctionId(uid, auctionId,
+ Constant.SOURCE_TYPE_TAOBAO);
+ if (type == 1) {
+ if (find != null) {
+ out.print(JsonUtil.loadFalseResult(""));
return;
}
- try {
- collectionGoodsV2Service.addPDDCollection(uid, pddGoods);
- out.print(JsonUtil.loadTrueResult("鏀惰棌鎴愬姛"));
- } catch (CollectionGoodsException e) {
- out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
- }
-
- } else {
try {
TaoBaoGoodsBrief taoBaoGoodsBrief = redisManager.getTaoBaoGoodsBrief(auctionId);
collectionGoodsV2Service.addCollection(uid, taoBaoGoodsBrief);
out.print(JsonUtil.loadTrueResult("鏀惰棌鎴愬姛"));
} catch (TaobaoGoodsDownException e) {
out.print(JsonUtil.loadFalseResult(1, "鍟嗗搧宸蹭笅鏋�"));
- } catch (CollectionGoodsException e1) {
- out.print(JsonUtil.loadFalseResult(e1.getCode(), e1.getMsg()));
}
- }
- } else {
- if (find == null) {
- out.print(JsonUtil.loadTrueResult("鍙栨秷鏀惰棌鎴愬姛"));
- return;
} else {
- try {
- collectionGoodsV2Service.cancelCollectionByAuctionId(uid, auctionId, goodsType);
+ if (find == null) {
out.print(JsonUtil.loadTrueResult("鍙栨秷鏀惰棌鎴愬姛"));
- } catch (CollectionGoodsException e) {
- out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
+ return;
+ } else {
+ collectionGoodsV2Service.cancelCollectionByAuctionId(uid, auctionId, Constant.SOURCE_TYPE_TAOBAO);
+ out.print(JsonUtil.loadTrueResult("鍙栨秷鏀惰棌鎴愬姛"));
}
}
+ } catch (CollectionGoodsException e1) {
+ out.print(JsonUtil.loadFalseResult(e1.getCode(), e1.getMsg()));
}
-
}
+
/**
* h5鏀惰棌
*
@@ -1735,6 +1701,7 @@
}
+
/**
* 鐢ㄦ埛闃熷憳鍒楄〃鏌ヨ 1.5.3鏌ヨ鏈夋晥闃熷憳
*
@@ -1868,8 +1835,8 @@
out.print(JsonUtil.loadFalseResult("缁熻澶辫触"));
e.printStackTrace();
}
-
}
+
/**
* 鐢ㄦ埛闃熷憳淇℃伅淇濆瓨 1.4.1
@@ -1883,48 +1850,35 @@
*/
@RequestMapping(value = "setextrainfo", method = RequestMethod.POST)
public void setExtraInfo(AcceptData acceptData, long uid, long inviteId, String memoName, PrintWriter out) {
-
- try {
- List<ThreeSale> listThreeSale = threeSaleSerivce.listbyIdAndBossId(inviteId, uid, null);
- if (listThreeSale == null || listThreeSale.size() == 0) {
- out.print(JsonUtil.loadFalseResult("璇ヨ褰曚笉瀛樺湪"));
- return;
- }
-
- UserInfo worker = listThreeSale.get(0).getWorker();
- if (worker == null) {
- out.print(JsonUtil.loadFalseResult("璇ヨ褰曚笉瀛樺湪"));
- return;
- }
-
- List<ThreeSaleExtraInfo> list = threeSaleExtraInfoSerivce.listbyBossIdAndWorkerId(uid, worker.getId());
- if (list == null || list.size() == 0) {
-
- ThreeSaleExtraInfo extraInfo = new ThreeSaleExtraInfo();
- extraInfo.setWorker(worker);
- extraInfo.setNickname(memoName);
- extraInfo.setCreateTime(new Date());
- extraInfo.setUpdateTime(new Date());
-
- UserInfo boss = new UserInfo(uid);
- extraInfo.setBoss(boss);
-
- threeSaleExtraInfoSerivce.insert(extraInfo);
-
- } else {
- ThreeSaleExtraInfo extraInfo = list.get(0);
- extraInfo.setNickname(memoName);
- extraInfo.setUpdateTime(new Date());
- threeSaleExtraInfoSerivce.updateByPrimaryKey(extraInfo);
- }
-
- out.print(JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
-
- } catch (Exception e) {
- out.print(JsonUtil.loadFalseResult("淇濆瓨澶辫触"));
- e.printStackTrace();
+ List<ThreeSale> listThreeSale = threeSaleSerivce.listbyIdAndBossId(inviteId, uid, null);
+ if (listThreeSale == null || listThreeSale.size() == 0) {
+ out.print(JsonUtil.loadFalseResult("璇ヨ褰曚笉瀛樺湪"));
+ return;
}
+ UserInfo worker = listThreeSale.get(0).getWorker();
+ if (worker == null) {
+ out.print(JsonUtil.loadFalseResult("璇ヨ褰曚笉瀛樺湪"));
+ return;
+ }
+
+ ThreeSaleExtraInfo extraInfo = threeSaleExtraInfoSerivce.getbyBossIdAndWorkerId(uid, worker.getId());
+ if (extraInfo == null) {
+ extraInfo = new ThreeSaleExtraInfo();
+ extraInfo.setWorker(worker);
+ extraInfo.setNickname(memoName);
+ extraInfo.setCreateTime(new Date());
+ extraInfo.setUpdateTime(new Date());
+ extraInfo.setBoss(new UserInfo(uid));
+ threeSaleExtraInfoSerivce.insertSelective(extraInfo);
+ } else {
+ ThreeSaleExtraInfo updateInfo = new ThreeSaleExtraInfo();
+ updateInfo.setId(extraInfo.getId());
+ updateInfo.setNickname(memoName);
+ updateInfo.setUpdateTime(new Date());
+ threeSaleExtraInfoSerivce.updateByPrimaryKeySelective(updateInfo);
+ }
+ out.print(JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
}
/**
@@ -2119,8 +2073,6 @@
GsonBuilder gsonBuilder = new GsonBuilder().excludeFieldsWithoutExposeAnnotation();
JSONObject data = new JSONObject();
- data.put("user", JsonUtil.getConvertBigDecimalToStringBuilder(gsonBuilder).create().toJson(userInfo));
-
// 鐣岄潰鐘舵��
UserSettingsVO mySettings = null;
try {
@@ -2176,8 +2128,21 @@
userInfo.setRankNamePicture(null);
userInfo.setRankIcon(null);
}
+
+ // 1.6.5 涔嬪悗杩斿洖鎬у埆銆佸井淇″彿
+ if(VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion())) {
+ if(userInfoExtra.getSex() != null)
+ userInfo.setSex(userInfoExtra.getSex());
+
+ if(!StringUtil.isNullOrEmpty(userInfoExtra.getWeiXin()))
+ userInfo.setWeiXin(userInfoExtra.getWeiXin());
+ }
}
-
+ // 1.6.5 涔嬪悗杩斿洖 寰俊鍙锋彁绀�
+ if(VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion()))
+ userInfo.setWeiXinTip("娣诲姞寰俊鍙峰悗锛屼綘鐨勯個璇蜂汉鍜屼竴绾ч槦鍛樺彲浠ラ�氳繃寰俊涓庝綘寤虹珛鑱旂郴銆�");
+
+ data.put("user", JsonUtil.getConvertBigDecimalToStringBuilder(gsonBuilder).create().toJson(userInfo));
data.put("invitCode", invitCode); // 閭�璇风爜
data.put("welfareCenterNews", welfareCenterNews);// 绂忓埄涓績娑堟伅
out.print(JsonUtil.loadTrueResult(data));
@@ -2261,7 +2226,7 @@
userInfoService.uploadPortrait(file, uid);
out.print(JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
-
+
} catch (UserInfoException e) {
out.print(JsonUtil.loadFalseResult(e.getMsg()));
try {
@@ -2287,7 +2252,7 @@
}
/**
- * 鏇存崲鏄电О
+ * 鏇存崲鍩虹淇℃伅
*
* @param acceptData
* @param nickName
@@ -2295,28 +2260,59 @@
* @param out
*/
@RequestMapping(value = "saveInfo")
- public void saveInfo(AcceptData acceptData, String nickName, Long uid, PrintWriter out) {
+ public void saveInfo(AcceptData acceptData, String nickName, String weiXin, Integer sex, Long uid, PrintWriter out) {
try {
if (uid == null) {
out.print(JsonUtil.loadFalseResult("鐢ㄦ埛鏈櫥褰�"));
return;
}
- if (StringUtil.isNullOrEmpty(nickName)) {
- out.print(JsonUtil.loadFalseResult("鏄电О涓嶈兘涓虹┖"));
- return;
- }
- if (nickName.length() > 200) {
- out.print(JsonUtil.loadFalseResult("鏄电О杩囬暱"));
- return;
- }
- if (maskKeyService.examineContent(nickName)) {
- out.print(JsonUtil.loadFalseResult("涓嶈兘鍖呭惈鏁忔劅璇嶆眹"));
- return;
+ // 淇敼鏄电О
+ if (!StringUtil.isNullOrEmpty(nickName)) {
+ if (nickName.length() > 200) {
+ out.print(JsonUtil.loadFalseResult("鏄电О杩囬暱"));
+ return;
+ }
+
+ if (maskKeyService.examineContent(nickName)) {
+ out.print(JsonUtil.loadFalseResult("涓嶈兘鍖呭惈鏁忔劅璇嶆眹"));
+ return;
+ }
+ userInfoService.saveUserInfo(nickName, uid);
+
+ userInfoModifyRecordService.addModifyRecord(uid, ModifyTypeEnum.nickName, nickName);
}
-
- userInfoService.saveUserInfo(nickName, uid);
-
+
+ // 淇敼寰俊鍙�
+ if (!StringUtil.isNullOrEmpty(weiXin)) {
+ if (weiXin.length() > 32) {
+ out.print(JsonUtil.loadFalseResult("寰俊鍙疯繃闀�"));
+ return;
+ }
+
+ UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
+ if (userInfoExtra != null) {
+ UserInfoExtra extra = new UserInfoExtra();
+ extra.setId(userInfoExtra.getId());
+ extra.setWeiXin(weiXin);
+ userInfoExtraService.saveUserInfoExtra(extra);
+
+ userInfoModifyRecordService.addModifyRecord(uid, ModifyTypeEnum.setWeiXinNum, weiXin);
+ }
+ }
+
+ // 淇敼鎬у埆
+ if (sex != null && sex > 0 && sex < 3) {
+ UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
+ if (userInfoExtra != null) {
+ UserInfoExtra extra = new UserInfoExtra();
+ extra.setId(userInfoExtra.getId());
+ extra.setSex(sex);
+ userInfoExtraService.saveUserInfoExtra(extra);
+
+ userInfoModifyRecordService.addModifyRecord(uid, ModifyTypeEnum.gender, sex + "");
+ }
+ }
out.print(JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
} catch (UserInfoException e) {
out.print(JsonUtil.loadFalseResult(e.getMsg()));
--
Gitblit v1.8.0