From 2366d2ada9e67f915a06b51b3c5be08a00847f0c Mon Sep 17 00:00:00 2001 From: yujian <yujian> Date: 星期二, 22 一月 2019 10:47:06 +0800 Subject: [PATCH] 用户邀请码激活 --- fanli/src/main/java/com/yeshi/fanli/controller/admin/InviteGetMoneyAdminController.java | 107 ++--------------------------------------------------- 1 files changed, 4 insertions(+), 103 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/InviteGetMoneyAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/InviteGetMoneyAdminController.java index ea4c08c..e55b12d 100644 --- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/InviteGetMoneyAdminController.java +++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/InviteGetMoneyAdminController.java @@ -2,7 +2,6 @@ import java.io.InputStream; import java.io.PrintWriter; -import java.math.BigDecimal; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -10,8 +9,6 @@ import java.util.UUID; import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import net.sf.json.JSONObject; @@ -26,20 +23,15 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.reflect.TypeToken; -import com.yeshi.fanli.entity.admin.EveryDayTask; import com.yeshi.fanli.entity.admin.InviteGetMoney; import com.yeshi.fanli.entity.bus.invite.SpreadImg; -import com.yeshi.fanli.entity.common.AdminUser; import com.yeshi.fanli.service.AdminUserService; -import com.yeshi.fanli.service.inter.config.EveryDayTaskService; import com.yeshi.fanli.service.inter.config.InviteGetMoneyService; import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService; import com.yeshi.fanli.tag.PageEntity; import com.yeshi.fanli.util.Constant; import com.yeshi.fanli.util.GsonUtil; import com.yeshi.fanli.util.StringUtil; -import com.yeshi.fanli.util.annotation.RequestNoLogin; -import com.yeshi.fanli.util.taobao.TaoBaoUtil; @Controller @RequestMapping("admin/new/api/v1/inviteGetMoney") @@ -48,8 +40,7 @@ @Resource private InviteGetMoneyService inviteGetMoneyService; - @Resource - private EveryDayTaskService everyDayTaskService; + @Resource private TaoBaoGoodsBriefService taoBaoGoodsBriefService; @@ -57,88 +48,9 @@ @Resource private AdminUserService adminUserService; - /** - * - * 鏂规硶璇存槑: 姣忔棩浠诲姟鍟嗗搧搴撳垪琛ㄦ煡璇� - * @author mawurui - */ - @RequestMapping(value="/everyDayTaskList",method=RequestMethod.POST) - public void everyDayTaskList(int pageIndex, String key,PrintWriter out){ - //鏌ヨ鍟嗗搧鎬绘暟 - 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); - Map<String, String> map = new HashMap<String, String>(); - map.put("key", key); - pageEntity.setParams(map); - //鍒嗛〉鏌ヨ鎵�鏈夊晢鍝� - List<EveryDayTask> everyDayTaskList = everyDayTaskService.everyDayTaskList(pageIndex-1, key); - for(EveryDayTask everyDayTask: everyDayTaskList) { - //璁$畻鐢ㄦ埛寰楀埌鐨勪剑閲� - String getMoney = taoBaoGoodsBriefService.getGoodsUserHongBao(everyDayTask.getEtGoods()); - everyDayTask.setGetMoney(getMoney); - - //璁$畻鍒稿悗浠� - BigDecimal quanhoujia = TaoBaoUtil.getAfterUseCouplePrice(everyDayTask.getEtGoods()); - everyDayTask.setQuanhoujia(quanhoujia); - - } - - JSONObject data=new JSONObject(); - data.put("pageEntity", JsonUtil.getSimpleGsonWithDate().toJson(pageEntity)); - data.put("everyDayTaskList", JsonUtil.getSimpleGsonWithDateAndSerialization().toJson(everyDayTaskList)); - out.print(JsonUtil.loadTrue(0, JsonUtil.getSimpleGson().toJson(data), "鎴愬姛")); - } + - /** - * - * 鏂规硶璇存槑: 鍒犻櫎姣忔棩浠诲姟鍟嗗搧搴擄紙鐪熷垹闄わ級 - * @author mawurui - * createTime 2018骞�3鏈�29鏃� 涓嬪崍6:22:21 - * @param ids - * @param out - */ - @RequestMapping(value="/deleteEveryDayTask", method=RequestMethod.POST) - public void deletEeveryDayTask(long[] ids, PrintWriter out){ - for (long id : ids) { - everyDayTaskService.deletEeveryDayTask(id); - } - out.print(JsonUtil.loadTrueResult("鍒犻櫎鎴愬姛")); - } - - /*** - * - * 鏂规硶璇存槑: 淇敼姣忔棩浠诲姟鍟嗗搧搴撴帓搴忓�� - * @author mawurui - * createTime 2018骞�3鏈�30鏃� 涓婂崍9:29:46 - * @param id - * @param out - */ - @RequestMapping(value="/updateEveryDayTask", method=RequestMethod.POST) - public void updateEveryDayTask(EveryDayTask everyDayTask , PrintWriter out) { - everyDayTaskService.updateEveryDayTask(everyDayTask); - out.print(JsonUtil.loadTrueResult("淇敼鎴愬姛")); - } - - /** - * - * 鏂规硶璇存槑: 鏌ヨ姣忔棩浠诲姟璇︽儏(椤甸潰鍙嶆樉) - * @author mawurui - * createTime 2018骞�3鏈�30鏃� 涓婂崍9:32:52 - * @param id - * @return - */ - @RequestMapping(value="/getEveryDayTask", method=RequestMethod.POST) - public void getEveryDayTask(long id, PrintWriter out) { - EveryDayTask everyDayTask = everyDayTaskService.getEveryDayTask(id); - JSONObject data = new JSONObject(); - data.put("everyDayTask", GsonUtil.toDFJson(everyDayTask)); - out.print(JsonUtil.loadTrueResult(0, data)); - } - - /** + /** * * 鏂规硶璇存槑: 鏌ヨ閭�璇锋鍗曞垪琛� * @author mawurui @@ -340,19 +252,8 @@ * @param response * @param out */ - @RequestNoLogin() @RequestMapping(value = "saveAdd") - public void saveAdd(@RequestParam("file") CommonsMultipartFile file, Long uid, - Long id, HttpServletRequest request, HttpServletResponse response, PrintWriter out) { - - response.setHeader("Access-Control-Allow-Origin", "*"); - response.setHeader("Access-Control-Allow-Methods", "*"); - - AdminUser admin = adminUserService.selectByPrimaryKey(uid); - if (admin == null) { - out.print(JsonUtil.loadFalseResult("褰撳墠璐︽埛楠岃瘉澶辫触")); - return; - } + public void saveAdd(@RequestParam("file") CommonsMultipartFile file, Long id, PrintWriter out) { if (file == null) { out.print(JsonUtil.loadFalseResult("涓婁紶鏂囦欢涓虹┖")); -- Gitblit v1.8.0