From fd1dce3121a7773419263c495f92e160cc1e7124 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 24 三月 2020 11:36:36 +0800
Subject: [PATCH] 2.1 +后台编辑
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java | 124 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 124 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java
index ddd17ee..c1b138f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java
@@ -18,6 +18,7 @@
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.user.UserInfo;
+import com.yeshi.fanli.entity.bus.user.vip.UserLevelEnum;
import com.yeshi.fanli.entity.order.ESOrder;
import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.exception.order.CommonOrderException;
@@ -35,7 +36,10 @@
import com.yeshi.fanli.util.VersionUtil;
import com.yeshi.fanli.util.account.UserUtil;
import com.yeshi.fanli.vo.order.CommonOrderVO;
+import com.yeshi.fanli.vo.order.GoodsRebateVO;
import com.yeshi.fanli.vo.order.OrderCountVO;
+import com.yeshi.fanli.vo.order.OrderRebateVO;
+import com.yeshi.fanli.vo.order.TeamBonusVO;
import com.yeshi.fanli.vo.user.UserInfoExtraVO;
import com.yeshi.fanli.vo.user.UserSettingsVO;
@@ -230,6 +234,7 @@
data.put("count", count);
data.put("result_list", JsonUtil.getApiCommonGson().toJson(list));
data.put("helpUrl", configService.get(ConfigKeyEnum.orderListHelp.getKey()));
+ data.put("bonusLink", configService.get(ConfigKeyEnum.orderBonusLink.getKey()));
data.put("validMoney", "楼 " + validMoney);
data.put("invalidMoney", "楼 " + invalidMoney);
data.put("findOrderHelpUrl", orderFindUrl);
@@ -395,8 +400,127 @@
data.put("selfMoney", selfMoney.setScale(2,BigDecimal.ROUND_DOWN).toString());
data.put("shareMoney", shareMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());
data.put("inviteMoney", inviteMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());
+
+ // 鍥㈤槦濂栧姳 TODO
+ if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
+ data.put("teamSubsidy", "999.66");
+ data.put("teamReward", "777.66");
+ data.put("tutorSubsidy", "888.66");
+ }
out.print(JsonUtil.loadTrueResult(data));
}
+ /**
+ * 鍥㈤槦鏀剁泭缁熻
+ * @param acceptData
+ * @param uid
+ * @param type 1-鍥㈤槦琛ヨ创 2-鍥㈤槦濂栧姳 3-瀵煎笀娲ヨ创
+ */
+ @RequestMapping(value = "getTeamBonus", method = RequestMethod.POST)
+ public void getTeamBonus(AcceptData acceptData, Long uid, Integer type, PrintWriter out) {
+ if (uid == null) {
+ out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
+ return;
+ }
+
+ UserInfo user = userInfoService.selectByPKey(uid);
+ if (user == null) {
+ out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛涓嶅瓨鍦�"));
+ return;
+ }
+
+ if (type == null || type < 1 || type > 3) {
+ type = 1;
+ }
+
+ JSONObject data = new JSONObject();
+ data.put("link", "https://www.baidu.com/");
+ String total = "";
+ if (type == 1) {
+ total = "111.3";
+ } else if (type == 2) {
+ total = "222.3";
+ } else if (type == 3) {
+ total = "333.3";
+ }
+
+ if (StringUtil.isNullOrEmpty(total)) {
+ data.put("exist", false);
+ } else {
+ data.put("exist", true);
+ data.put("portrait", user.getPortrait());
+
+ TeamBonusVO today = new TeamBonusVO("1.3", "2.3" ,"3.6");
+ TeamBonusVO yesterday = new TeamBonusVO("1.3", "2.3" ,"3.6");
+ TeamBonusVO thisMonth = new TeamBonusVO("1.3", "2.3" ,"3.6");
+ TeamBonusVO lastMonth = new TeamBonusVO("1.3", "2.3" ,"3.6");
+ data.put("total", total);
+ data.put("direct", "655.36");
+ data.put("indirect", "236.58");
+ data.put("today", today);
+ data.put("yesterday", yesterday);
+ data.put("thisMonth", thisMonth);
+ data.put("lastMonth", lastMonth);
+ }
+ out.print(JsonUtil.loadTrueResult(data));
+ }
+
+
+ /**
+ * 杩斿埄璇存槑
+ * @param acceptData
+ * @param uid
+ * @param orderNo
+ * @param sourceType
+ * @param out
+ */
+ @RequestMapping(value = "getReBateInfo")
+ public void getReBateInfo(String callback, AcceptData acceptData, Long uid, String orderNo, Integer sourceType, PrintWriter out) {
+ if (uid == null) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鐢ㄦ埛鏈櫥褰�"));
+ return;
+ }
+
+ UserInfo user = userInfoService.selectByPKey(uid);
+ if (user == null) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鐢ㄦ埛涓嶅瓨鍦�"));
+ return;
+ }
+
+ GoodsRebateVO goodsVO = new GoodsRebateVO();
+ goodsVO.setTitle("鑸掑鑸掑厠鍏夋劅鐐櫧鐗欑墖缇庣櫧鐗欓娇鐗欒啘濂楄鍘婚粍鐗欐竻鏂板彛姘�");
+ goodsVO.setPicture("https://img.alicdn.com/bao/uploaded/i4/355739614/O1CN01RB6Hlg2KtGMWR4mON_!!0-item_pic.jpg");
+ goodsVO.setActualPay("楼60.00");
+ goodsVO.setFanliRate("X20%");
+ goodsVO.setFanliExpect("楼25.00");
+ goodsVO.setCommision("10.00");
+ goodsVO.setSubsidy("6.00");
+
+ GoodsRebateVO goodsVO2 = new GoodsRebateVO();
+ goodsVO2.setTitle("棣ヤ僵缇庣櫧鏌旇偆姘寸埥鑲ゆ按琛ユ按淇濇箍濂冲寲濡嗘箍鏁风簿鍗庢按鐢锋棗鑸板簵瀹樼綉姝ｅ搧");
+ goodsVO2.setPicture("https://img.alicdn.com/bao/uploaded/i4/738252756/O1CN01MgFdXy1WEI8zmkyg7_!!0-item_pic.jpg");
+ goodsVO2.setActualPay("楼62.00");
+ goodsVO2.setFanliRate("X22%");
+ goodsVO2.setFanliExpect("楼26.00");
+ goodsVO2.setCommision("12.00");
+ goodsVO2.setSubsidy("8.00");
+
+ List<GoodsRebateVO> listGoods= new ArrayList<>();
+ listGoods.add(goodsVO);
+ listGoods.add(goodsVO2);
+
+ OrderRebateVO orderRebateVO = new OrderRebateVO();
+ orderRebateVO.setTotalFanLi("楼50.00");
+ orderRebateVO.setUpperFanLi("楼60.00");
+ orderRebateVO.setUserLevel(UserLevelEnum.daRen.name());
+ orderRebateVO.setJumpLink("https://www.baidu.com/");
+ orderRebateVO.setListGoods(listGoods);
+
+ JSONObject data = new JSONObject();
+ data.put("result", orderRebateVO);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
+ }
+
+
}
--
Gitblit v1.8.0