From eda623f37c3260f4b4657e34a8a39798c72432b1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期日, 28 六月 2020 15:49:14 +0800
Subject: [PATCH] 搜索接口增加小黄条返回
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCloudControllerV2.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 57 insertions(+), 1 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 73dbbbf..b524cb4 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
@@ -38,6 +38,7 @@
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.homemodule.SwiperPictureService;
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;
@@ -52,9 +53,11 @@
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.aitaoker.AitaokerApiUtil;
+import com.yeshi.fanli.util.annotation.RequestSerializableByKey;
import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;
import com.yeshi.fanli.util.suning.SuningUtil;
import com.yeshi.fanli.vo.goods.GoodsDetailVO;
+import com.yeshi.fanli.vo.homemodule.BannerVO;
import com.yeshi.fanli.vo.user.cloud.CloudOrderMenuVO;
import com.yeshi.fanli.vo.user.cloud.UserCloudInfoVO;
@@ -98,6 +101,8 @@
@Resource
private RedisManager redisManager;
+ @Resource
+ private SwiperPictureService swiperPictureService;
/**
* 鏌ヨ寮�閫氳褰�
@@ -237,7 +242,15 @@
}
}
}
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(cloudInfoVO));
+
+ // 鏁欑▼
+ List<BannerVO> listBanner = swiperPictureService.getByBannerCard("cloud_course");
+ if (listBanner != null && listBanner.size() > 0) {
+ cloudInfoVO.setCourse(listBanner.get(0));
+ }
+ GsonBuilder gsonBuilder = new GsonBuilder();
+
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(gsonBuilder.create().toJson(cloudInfoVO)));
}
/**
@@ -248,6 +261,7 @@
* @param uid
* @param out
*/
+ @RequestSerializableByKey(key = "'getQrcodeMaclogin-'+#uid")
@RequestMapping(value = "getQrcodeMaclogin")
public void getQrcodeMaclogin(String callback, AcceptData acceptData, Long uid, PrintWriter out) {
if (uid == null) {
@@ -431,6 +445,12 @@
return;
}
+ UserCloud userCloud = userCloudService.getValidByUid(uid);
+ if (userCloud == null) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "璇峰厛寮�閫氫簯鍙戝崟"));
+ return;
+ }
+
try {
// 閲嶆柊鑾峰彇缇ゅ垪琛�
userCloudService.searchGroup(uid);
@@ -468,12 +488,20 @@
return;
}
+ UserCloud userCloud = userCloudService.getValidByUid(uid);
+ if (userCloud == null) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "璇峰厛寮�閫氫簯鍙戝崟"));
+ return;
+ }
+
boolean reslut = false;
if (state == 1) {
reslut = true;
}
try {
+
+
userCloudGroupService.switchGroupState(uid, id, reslut);
// 鑾峰彇鏈�鏂扮兢
List<UserCloudGroup> list = userCloudGroupService.listGroupByUid(uid);
@@ -709,6 +737,34 @@
/**
+ * 鏀粯瀹屾垚
+ *
+ * @param id
+ * @param out
+ */
+ @RequestMapping(value = "payEnd")
+ public void payEnd(String callback, AcceptData acceptData, Long uid, Long id, PrintWriter out) {
+ if (uid == null || id == null) {
+ out.print(JsonUtil.loadFalseResult(1, "鍙傛暟淇℃伅缂哄け"));
+ return;
+ }
+
+ try {
+ // 妫�娴嬫槸鍚︽敮浠樺畬鎴�
+ userCloudAlipayManager.tradeQueryByOrderId(id);
+
+ UserCloudOrder cloudOrder = userCloudOrderService.selectByPrimaryKey(id);
+ JSONObject dataObject = new JSONObject();
+ dataObject.put("money", cloudOrder.getMoney());
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(dataObject));
+ } catch (Exception e) {
+ out.print(JsonUtil.loadFalseResult(1, "鍥炶皟淇℃伅澶辫触"));
+ LogHelper.errorDetailInfo(e);
+ }
+ }
+
+
+ /**
* 鍔ㄦ�佷竴閿彂鍗�
* @param callback
* @param acceptData
--
Gitblit v1.8.0