From 2886d5a6eee762ad7b776e930fc49b01fb64dd5e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 16 六月 2020 10:58:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCloudControllerV2.java | 40 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 40 insertions(+), 0 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..330ff7d 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
@@ -35,9 +35,11 @@
import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.exception.user.cloud.UserCloudException;
import com.yeshi.fanli.exception.user.cloud.UserCloudGroupException;
+import com.yeshi.fanli.exception.user.cloud.UserCloudOrderException;
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;
@@ -55,6 +57,7 @@
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,6 +242,13 @@
}
}
}
+
+ // 鏁欑▼
+ List<BannerVO> listBanner = swiperPictureService.getByBannerCard("cloud_course");
+ if (listBanner != null && listBanner.size() > 0) {
+ cloudInfoVO.setCourse(listBanner.get(0));
+ }
+
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(cloudInfoVO));
}
@@ -709,6 +721,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