From 665086339b528ebf2c101549bd0d9c8ef957f411 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 15 二月 2019 10:39:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxInviteGetMoneyController.java | 105 ----------------------------------------------------
1 files changed, 0 insertions(+), 105 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxInviteGetMoneyController.java b/fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxInviteGetMoneyController.java
index c5abdab..35c381b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxInviteGetMoneyController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxInviteGetMoneyController.java
@@ -1,33 +1,15 @@
package com.yeshi.fanli.controller.xcx;
-import java.io.PrintWriter;
-import java.math.BigDecimal;
-import java.util.List;
-
import javax.annotation.Resource;
-
-import net.sf.json.JSONObject;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import com.yeshi.fanli.entity.admin.EveryDayTask;
-import com.yeshi.fanli.entity.admin.InviteGetMoney;
-import com.yeshi.fanli.entity.system.System;
-import com.yeshi.fanli.entity.system.SystemClientParams;
-import com.yeshi.fanli.exception.NotExistObjectException;
-import com.yeshi.fanli.service.inter.config.EveryDayTaskService;
import com.yeshi.fanli.service.inter.config.InviteGetMoneyService;
import com.yeshi.fanli.service.inter.config.SystemClientParamsService;
import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
import com.yeshi.fanli.service.inter.user.QrCodeService;
import com.yeshi.fanli.service.inter.user.SpreadUserImgService;
-import com.yeshi.fanli.tag.PageEntity;
-import com.yeshi.fanli.util.Constant;
-import com.yeshi.fanli.util.Utils;
-import com.yeshi.fanli.util.taobao.TaoBaoUtil;
-import org.yeshi.utils.JsonUtil;
/**
*
@@ -45,9 +27,6 @@
private InviteGetMoneyService inviteGetMoneyService;
@Resource
- private EveryDayTaskService everyDayTaskService;
-
- @Resource
private SystemClientParamsService systemClientParamsService;
@Resource
@@ -58,89 +37,5 @@
@Resource
private TaoBaoGoodsBriefService taoBaoGoodsBriefService;
-
- /**
- *
- * 鏂规硶璇存槑: 杩斿洖鍒板墠绔帴鍙�
- *
- * @author mawurui createTime 2018骞�3鏈�29鏃� 涓嬪崍2:37:38
- * @throws NotExistObjectException
- */
- @RequestMapping(value = "/inviteGetMoney", method = RequestMethod.POST)
- public void everyDayTaskList(int pageIndex, PrintWriter out, String uid) throws NotExistObjectException {
- // 鏌ヨ鍟嗗搧鎬绘暟
- Integer totalCount = everyDayTaskService.getCount();
- int totalPage = totalCount % Constant.PAGE_SIZE == 0 ? totalCount / Constant.PAGE_SIZE
- : totalCount / Constant.PAGE_SIZE + 1;
- PageEntity pageEntity = new PageEntity(pageIndex, Constant.PAGE_SIZE, totalCount, totalPage);
-
- // 鍒嗛〉鏌ヨ鎵�鏈夋瘡鏃ュ晢鍝�
- List<EveryDayTask> everyDayTaskList = everyDayTaskService.everyDayTaskList(pageIndex - 1, "");
- for (EveryDayTask everyDayTask : everyDayTaskList) {
- // 璁＄畻鐢ㄦ埛寰楀埌鐨勪剑閲�
- BigDecimal money = taoBaoGoodsBriefService.getShareGoodsUserHongBao(everyDayTask.getEtGoods());
- String getMoney = money.toString();
- everyDayTask.setGetMoney("璧�" + "楼" + getMoney);
- // 璁＄畻鍒稿悗浠�
- BigDecimal quanhoujia = TaoBaoUtil.getAfterUseCouplePrice(everyDayTask.getEtGoods());
- everyDayTask.setQuanhoujia(quanhoujia);
- }
- // 鍒嗛〉鏌ヨ閭�璇锋彁鎴愭
- List<InviteGetMoney> inviteGetMoneyList = inviteGetMoneyService.inviteGetMoneyList(pageIndex - 1, "");
- // 鍚嶅瓧*澶勭悊
- for (InviteGetMoney inviteGetMoney : inviteGetMoneyList) {
- String name = inviteGetMoney.getName();
- if (name != null) {
- if (name.length() > 2) {
- name = Utils.getStarString(name, 1, name.length() - 1);
- } else {
- name = name.substring(0, 1) + "**" + name.substring(name.length() - 1);
- }
- }
- inviteGetMoney.setName(name);
- }
-
- JSONObject data = new JSONObject();
- data.put("pageEntity", JsonUtil.getSimpleGsonWithDate().toJson(pageEntity));
- data.put("everyDayTaskList", JsonUtil.getSimpleGsonWithDate().toJson(everyDayTaskList));
- data.put("inviteGetMoneyList", JsonUtil.getSimpleGsonWithDate().toJson(inviteGetMoneyList));
- if (uid.equals("0") || uid == null) {
- data.put("myTeam", "---");
- data.put("moneyToday", "---");
- data.put("moneyMonth", "---");
- } else {
- // 鎴戠殑闃熷憳
- int myFirstTeamCount = inviteGetMoneyService.myFirstTeamCount(uid);
- int mySecondTeamCount = inviteGetMoneyService.mySecondTeamCount(uid);
- int myTeamCount = myFirstTeamCount + mySecondTeamCount;
- data.put("myTeam", myTeamCount);
- // 浠婃棩 鏈湀棰勪及鏀剁泭
- BigDecimal moneyToday = inviteGetMoneyService.getMoneyToday(uid);
- if (moneyToday == null) {
- moneyToday = new BigDecimal(0);
- }
- BigDecimal moneyMonth = inviteGetMoneyService.getMoneyMonth(uid);
- if (moneyMonth == null) {
- moneyMonth = new BigDecimal(0);
- }
- data.put("moneyToday", moneyToday.setScale(2, BigDecimal.ROUND_DOWN));
- data.put("moneyMonth", moneyMonth.setScale(2, BigDecimal.ROUND_DOWN));
- }
-
- // 娲诲姩瑙勫垯
- String key = "activityRules"; // key鍊�
- com.yeshi.fanli.entity.system.System system = new System();
- system.setCreatetime(java.lang.System.currentTimeMillis());
- system.setPlatform(1);
- system.setId(4L);
- SystemClientParams values = systemClientParamsService.getSystemClientParamsBySystemAndKey(system, key);
- // 杞崲鎹㈣绗� 缁欏墠绔�
- String valueN = values.getValue();
- String valueBr = valueN.replace("\n", "<br><br>");
- data.put("activityRules", valueBr);
- data.put("inviteList", String.format("http://%s/%s/client/share/friends_new.html",
- Constant.systemCommonConfig.getProjectHost(), Constant.systemCommonConfig.getProjectName()));
- out.print(JsonUtil.loadTrue(0, JsonUtil.getSimpleGson().toJson(data), "鎴愬姛"));
- }
}
--
Gitblit v1.8.0