From 554de444b87aab5f93cb1593a8095612cf9479a7 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 09 六月 2020 17:34:30 +0800
Subject: [PATCH] 订单
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCloudControllerV2.java | 106 ++++++++++++++++++++++++-----------------------------
1 files changed, 48 insertions(+), 58 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCloudControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCloudControllerV2.java
index fd96609..916f4ae 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCloudControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCloudControllerV2.java
@@ -5,9 +5,7 @@
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
-import java.util.HashSet;
import java.util.List;
-import java.util.Set;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
@@ -32,14 +30,17 @@
import com.yeshi.fanli.entity.bus.user.cloud.UserCloudGroup;
import com.yeshi.fanli.entity.bus.user.cloud.UserCloudManage;
import com.yeshi.fanli.entity.bus.user.cloud.UserCloudOrder;
+import com.yeshi.fanli.entity.dynamic.GoodsEvaluate;
import com.yeshi.fanli.entity.goods.CommonGoods;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.exception.taobao.TaoKeApiException;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.exception.user.cloud.UserCloudException;
-import com.yeshi.fanli.exception.user.cloud.UserCloudGoodsException;
import com.yeshi.fanli.exception.user.cloud.UserCloudGroupException;
import com.yeshi.fanli.log.LogHelper;
+import com.yeshi.fanli.service.inter.config.ConfigService;
+import com.yeshi.fanli.service.inter.dynamic.GoodsEvaluateService;
import com.yeshi.fanli.service.inter.order.OrderHongBaoMoneyComputeService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.cloud.UserCloudGoodsService;
@@ -53,6 +54,7 @@
import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.aitaoker.AitaokerApiUtil;
import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;
+import com.yeshi.fanli.util.suning.SuningUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import com.yeshi.fanli.vo.goods.GoodsDetailVO;
import com.yeshi.fanli.vo.user.cloud.UserCloudInfoVO;
@@ -87,6 +89,12 @@
@Resource
private UserCloudAlipayManager userCloudAlipayManager;
+
+ @Resource
+ private GoodsEvaluateService goodsEvaluateService;
+
+ @Resource
+ private ConfigService configService;
/**
* 鏌ヨ寮�閫氳褰�
@@ -290,6 +298,7 @@
JSONObject data = new JSONObject();
QrcodeLoginDTO dto = AitaokerApiUtil.getQrcodeMacloginCheck(robotId, wId);
if (dto != null) {
+ LogHelper.cloudInfo("鏂规硶macloginCheck: [uid=" + uid + "][wxID=" + dto.getWcId() + "][ NickName=" + dto.getNickName() + "]" );
try {
// 鏇存柊寰俊淇℃伅
userCloudService.updateWXInfo(uid, dto.getWcId(), dto.getNickName(), dto.getHeadUrl());
@@ -557,61 +566,15 @@
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
}
+
+
/**
- * 娣诲姞銆佸彇娑堝彂鍗曞簱
+ * 鍒犻櫎浜戝彂鍗曞閫夊簱
*
* @param callback
* @param acceptData
* @param uid
- * @param goodsId
- * @param goodsType
- * @param out
- */
- @RequestMapping(value = "accordGoods")
- public void accordGoods(String callback, AcceptData acceptData, Long uid, Long goodsId, Integer goodsType,
- PrintWriter out) {
- if (uid == null) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鐢ㄦ埛鏈櫥褰�"));
- return;
- }
-
- if (goodsType == null || goodsId == null) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "鍙傛暟涓嶅畬鏁�"));
- return;
- }
-
- try {
- boolean state = false;
- UserCloudGoods cloudGoods = userCloudGoodsService.getByUidAndGoods(uid, goodsId, goodsType);
- if (cloudGoods != null) { // 鍙栨秷鍔犲叆閫夊搧搴�
- userCloudGoodsService.deleteByPrimaryKeyAndUid(cloudGoods.getId(), uid);
- } else { // 鍔犲叆閫夊搧搴�
- Set<Long> set = new HashSet<Long>();
- set.add(goodsId);
- userCloudGoodsService.addGoods(uid, set, goodsType);
- state = true;
- }
-
- JSONObject data = new JSONObject();
- data.put("state", state);
- out.print(JsonUtil.loadTrueResult(data));
- } catch (UserCloudGoodsException e) {
- out.print(JsonUtil.loadFalseResult(e.getMsg()));
- } catch (Exception e) {
- out.print(JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
- LogHelper.errorDetailInfo(e);
- ;
- }
- }
-
- /**
- * 娣诲姞銆佸彇娑堝彂鍗曞簱
- *
- * @param callback
- * @param acceptData
- * @param uid
- * @param goodsId
- * @param goodsType
+ * @param id
* @param out
*/
@RequestMapping(value = "deleteGoods")
@@ -735,7 +698,13 @@
userCloudService.sendByDynamic(uid, id);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("涓�閿彂鍗曟垚鍔�"));
} catch (UserCloudException e) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getCode(),e.getMsg()));
+ if (e.getCode() > 1000 && e.getCode() < 1100) {
+ JSONObject data = new JSONObject();
+ data.put("link", configService.get(ConfigKeyEnum.robotCloudLink.getKey()));
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrue(e.getCode(), data, e.getMsg()).toString());
+ } else {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getCode(),e.getMsg()));
+ }
}
}
@@ -750,17 +719,38 @@
* @param out
*/
@RequestMapping(value = "sendGoods")
- public void sendCircle(String callback, AcceptData acceptData, Long uid, Long goodsId, Integer goodsType, PrintWriter out) {
+ public void sendGoods(String callback, AcceptData acceptData, Long uid, String goodsId, Integer goodsType, PrintWriter out) {
if (uid == null || goodsId == null || goodsType == null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍙傛暟涓嶈兘涓虹┖"));
return;
}
try {
- userCloudService.sendCustomGoods(uid, goodsId, goodsType);
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("涓�閿彂鍗曟垚鍔�"));
+ GoodsEvaluate evaluate = goodsEvaluateService.queryExistSingle(goodsId, goodsType);
+ if (evaluate != null) {
+ userCloudService.sendByDynamic(uid, evaluate.getId());
+ } else {
+
+ Long gid = null;
+ Long sellerId = null;
+ if (goodsType == Constant.SOURCE_TYPE_SUNING) { // 鑻忓畞
+ String[] ids = SuningUtil.getGoodsIdDetail(goodsId);
+ gid = Long.parseLong(ids[1]);
+ sellerId = Long.parseLong(ids[0]);
+ } else {
+ gid = Long.parseLong(goodsId);
+ }
+ userCloudService.sendCustomGoods(uid, gid, goodsType, sellerId);
+ }
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鍔犲叆鍙戝崟搴撴垚鍔�"));
} catch (UserCloudException e) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getCode(),e.getMsg()));
+ if (e.getCode() > 1000 && e.getCode() < 1100) {
+ JSONObject data = new JSONObject();
+ data.put("link", configService.get(ConfigKeyEnum.robotCloudLink.getKey()));
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrue(e.getCode(), data, e.getMsg()).toString());
+ } else {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getCode(),e.getMsg()));
+ }
}
}
}
--
Gitblit v1.8.0