From ddf5db7d31af51fcf697eac0cee7dd46ff73bcc1 Mon Sep 17 00:00:00 2001 From: admin <2780501319@qq.com> Date: 星期二, 18 二月 2020 12:50:49 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div --- fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java | 874 +++++++++++++++++++++++++++++++++++----------------------- 1 files changed, 528 insertions(+), 346 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java index 760a5aa..6fac641 100644 --- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java +++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java @@ -1,8 +1,10 @@ package com.yeshi.fanli.controller.admin; +import java.io.OutputStream; import java.io.PrintWriter; import java.math.BigDecimal; import java.net.URLDecoder; +import java.net.URLEncoder; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -13,40 +15,51 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.multipart.commons.CommonsMultipartFile; import org.yeshi.utils.DateUtil; import org.yeshi.utils.IPUtil; import org.yeshi.utils.JsonUtil; +import org.yeshi.utils.entity.wx.RedPackRecord; +import org.yeshi.utils.wx.WXRedPackUtil; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.reflect.TypeToken; import com.yeshi.fanli.controller.admin.utils.AdminUtils; +import com.yeshi.fanli.dto.ChartTDO; +import com.yeshi.fanli.entity.admin.count.CountUserInfo; import com.yeshi.fanli.entity.bus.user.Extract; import com.yeshi.fanli.entity.bus.user.ExtractAuditRecord; import com.yeshi.fanli.entity.bus.user.HongBaoV2; import com.yeshi.fanli.entity.bus.user.UserInfo; +import com.yeshi.fanli.entity.bus.user.UserInfoExtra; import com.yeshi.fanli.entity.common.AdminUser; +import com.yeshi.fanli.entity.system.ConfigKeyEnum; import com.yeshi.fanli.exception.ExtractException; import com.yeshi.fanli.exception.NotExistObjectException; import com.yeshi.fanli.exception.ObjectStateException; import com.yeshi.fanli.log.LogHelper; import com.yeshi.fanli.service.AdminUserService; import com.yeshi.fanli.service.inter.config.ConfigService; -import com.yeshi.fanli.service.inter.count.ExtractCountService; import com.yeshi.fanli.service.inter.count.HongBaoV2CountService; import com.yeshi.fanli.service.inter.count.UserInfoCountService; +import com.yeshi.fanli.service.inter.money.extract.ExtractAuditRecordService; +import com.yeshi.fanli.service.inter.money.extract.ExtractCountService; +import com.yeshi.fanli.service.inter.money.extract.ExtractService; +import com.yeshi.fanli.service.inter.order.CommonOrderCountService; +import com.yeshi.fanli.service.inter.order.tb.TaoBaoOrderService; +import com.yeshi.fanli.service.inter.order.tb.TaoBaoWeiQuanOrderService; import com.yeshi.fanli.service.inter.push.PushRecordService; -import com.yeshi.fanli.service.inter.taobao.TaoBaoOrderService; -import com.yeshi.fanli.service.inter.taobao.TaoBaoWeiQuanOrderService; -import com.yeshi.fanli.service.inter.user.AccountMessageService; -import com.yeshi.fanli.service.inter.user.ExtractAuditRecordService; -import com.yeshi.fanli.service.inter.user.ExtractService; +import com.yeshi.fanli.service.inter.user.UserInfoExtraService; import com.yeshi.fanli.tag.PageEntity; import com.yeshi.fanli.util.Constant; +import com.yeshi.fanli.util.MoneyBigDecimalUtil; import com.yeshi.fanli.util.RedisManager; import com.yeshi.fanli.util.StringUtil; import com.yeshi.fanli.util.TimeUtil; @@ -71,9 +84,6 @@ private ExtractCountService extractCountService; @Resource - private AccountMessageService accountMessageService; - - @Resource private PushRecordService pushRecordService; @Resource @@ -88,7 +98,6 @@ @Resource private AdminUserService adminUserService; - @Resource private RedisManager redisManager; @@ -97,66 +106,12 @@ @Resource private TaoBaoWeiQuanOrderService taoBaoWeiQuanOrderService; - - private final static String TODAY = "1"; - private final static String THREE = "2"; - private final static String AWEEK = "3"; + @Resource + private UserInfoExtraService userInfoExtraService; - @RequestMapping(value = "getExtractList", method = RequestMethod.POST) - public void getExtractList(int pageIndex, PrintWriter out) { - List<Extract> extractList = extractService.getExtractList(pageIndex - 1); - int count = extractService.getCount(); - int totalPage = count % Constant.PAGE_SIZE == 0 ? count / Constant.PAGE_SIZE : count / Constant.PAGE_SIZE + 1; - PageEntity pe = new PageEntity(pageIndex, Constant.PAGE_SIZE, count, totalPage); - JSONObject data = new JSONObject(); - data.put("pe", pe); - data.put("extractList", extractList); - out.print(JsonUtil.loadTrueResult(data)); - } - - /** - * - * 鏂规硶璇存槑: 閫氳繃鎻愮幇璇锋眰 - * - * @author mawurui createTime 2018骞�3鏈�14鏃� 涓嬪崍3:15:42 - * @param id - * @param out - * @param request - */ - @RequestMapping(value = "passExtract", method = RequestMethod.POST) - public void passExtract(String callback, long id, PrintWriter out, HttpServletRequest request) { - - // TODO 闇�瑕侀偖绠卞彂閫佺煭淇¢獙璇� - - AdminUser admin = (AdminUser) request.getSession().getAttribute(Constant.SESSION_ADMIN); - - Integer integer = extractService.passExtract(id, admin); - Extract extract = extractService.getExtractById(id); - long uid = extract.getUserInfo().getId(); - - if (integer == null) { - out.print(JsonUtil.loadTrueResult("閫氳繃")); - LogHelper - .userInfo("[ip:" + IPUtil.getRemotIP(request) + "]" + admin.getName() + "閫氳繃浜哰id=" + id + "]鐨勬彁鐜扮敵璇�!"); // 鍚屾剰涔嬪悗鎴愬姛 - } else if (integer == 1) { - - out.print(JsonUtil.loadFalseResult("涓嶅瓨鍦ㄨ瀵硅薄")); // 鍚屾剰涔嬪悗澶辫触 - LogHelper.userInfo( - "[ip:" + IPUtil.getRemotIP(request) + "][绠$悊鍛�:" + admin.getName() + "] 鍚屾剰鎻愮幇id=" + id + "鐨勬彁鐜扮敵璇蜂笉瀛樺湪"); - String title = "浣犵殑鎻愮幇鐢宠琚┏鍥�"; - String content = "闈炲父閬楁喚锛屼綘鐨勬彁鐜扮敵璇疯椹冲洖銆傛垜浠�氳繃鏍稿鍙戠幇浣犵殑璐︾洰鏄庣粏鏈夎锛屾垜浠細鍦ㄥ璁″畬鎴愪箣鍚庣粰浣犲彂閫氱煡娑堟伅銆傚鏈夌枒闂鑱旂郴瀹㈡湇銆�"; - // xingePushController.pushSystemZnx(uid, title, content, out); - } else { - - LogHelper.userInfo( - "[ip:" + IPUtil.getRemotIP(request) + "][绠$悊鍛�:" + admin.getName() + "] 鍚屾剰鎻愮幇id=" + id + "鐨勬彁鐜扮敵璇风姸鎬佸紓甯�"); - out.print(JsonUtil.loadFalseResult("璇ョ姸鎬佷笉绛変簬涓嶄负鍒濆鐘舵��")); - String title = "浣犵殑鎻愮幇鐢宠涓嶆垚鍔�"; - String content = "璇风‘淇濅綘鐨勬彁鐜拌处鎴风殑闅愮璁剧疆涓� 鍏佽閭銆佹墜鏈哄彿銆佷細鍛樺悕鎵惧埌鎴戙�傚惁鍒欐棤娉曟垚鍔熷畬鎴愯浆璐︺�傚鏈夌枒闂鑱旂郴瀹㈡湇銆�"; - // xingePushController.pushSystemZnx(uid, title, content, out); - } - } + @Resource + private CommonOrderCountService commonOrderCountService; /** * @@ -188,74 +143,21 @@ /* 鍏佽鎻愮幇 鎿嶄綔 */ Integer integer = extractService.passExtract(id, admin); - Extract extract = extractService.getExtractById(id); - long uid = extract.getUserInfo().getId(); - + // 鏃ュ織璁板綍 if (integer == null) { - JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("閫氳繃")); - + JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("宸查�氳繃")); LogHelper - .userInfo("[ip:" + IPUtil.getRemotIP(request) + "]" + admin.getName() + "閫氳繃浜哰id=" + id + "]鐨勬彁鐜扮敵璇�!"); // 鍚屾剰涔嬪悗鎴愬姛 + .userInfo("[ip:" + IPUtil.getRemotIP(request) + "]" + admin.getName() + "閫氳繃浜哰id=" + id + "]鐨勬彁鐜扮敵璇�!"); } else if (integer == 1) { - JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("涓嶅瓨鍦ㄨ瀵硅薄")); - + JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇ユ彁鐜拌褰曞凡涓嶅瓨鍦�,璇峰埛鏂�")); LogHelper.userInfo( "[ip:" + IPUtil.getRemotIP(request) + "][绠$悊鍛�:" + admin.getName() + "] 鍚屾剰鎻愮幇id=" + id + "鐨勬彁鐜扮敵璇蜂笉瀛樺湪"); - String title = "浣犵殑鎻愮幇鐢宠琚┏鍥�"; - String content = "闈炲父閬楁喚锛屼綘鐨勬彁鐜扮敵璇疯椹冲洖銆傛垜浠�氳繃鏍稿鍙戠幇浣犵殑璐︾洰鏄庣粏鏈夎锛屾垜浠細鍦ㄥ璁″畬鎴愪箣鍚庣粰浣犲彂閫氱煡娑堟伅銆傚鏈夌枒闂鑱旂郴瀹㈡湇銆�"; - // xingePushController.pushSystemZnx(uid, title, content, out); } else { - JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇ョ姸鎬佷笉绛変簬涓嶄负鍒濆鐘舵��")); - + JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇ョ敤鎴峰凡琚鐞�,璇峰埛鏂�")); LogHelper.userInfo( "[ip:" + IPUtil.getRemotIP(request) + "][绠$悊鍛�:" + admin.getName() + "] 鍚屾剰鎻愮幇id=" + id + "鐨勬彁鐜扮敵璇风姸鎬佸紓甯�"); - String title = "浣犵殑鎻愮幇鐢宠涓嶆垚鍔�"; - String content = "璇风‘淇濅綘鐨勬彁鐜拌处鎴风殑闅愮璁剧疆涓� 鍏佽閭銆佹墜鏈哄彿銆佷細鍛樺悕鎵惧埌鎴戙�傚惁鍒欐棤娉曟垚鍔熷畬鎴愯浆璐︺�傚鏈夌枒闂鑱旂郴瀹㈡湇銆�"; - // xingePushController.pushSystemZnx(uid, title, content, out); } - } - - /** - * - * 鏂规硶璇存槑: 鎷掔粷鎻愮幇璇锋眰 - * - * @author mawurui createTime 2018骞�3鏈�14鏃� 涓嬪崍3:15:55 - * @param id - * @param reason - * @param out - * @param request - */ - @RequestMapping(value = "rejectExtract", method = RequestMethod.POST) - public void rejectExtract(String callback, long id, String reason, PrintWriter out, HttpServletRequest request) { - AdminUser admin = (AdminUser) request.getSession().getAttribute(Constant.SESSION_ADMIN); - - Extract extract = extractService.getExtractById(id); - long uid = extract.getUserInfo().getId(); - long extractTime = extract.getExtractTime(); - - try { - extractService.rejectExtract(id, reason, extractTime, admin);// 鎻愮幇澶辫触 - - // 璋冪敤鎺ㄩ�佺珯鍐呬俊缁欑敤鎴� - out.print(JsonUtil.loadTrueResult("鎷掔粷")); - LogHelper.userInfo("[ip:" + IPUtil.getRemotIP(request) + "]" + admin.getName() + "鎷掔粷浜哰id=" + id - + "]鐨勬彁鐜扮敵璇�!鎷掔粷鍘熷洜鏄�" + reason); - - String title = "浣犵殑鎻愮幇鐢宠琚┏鍥�"; - String content = "闈炲父閬楁喚锛屼綘鐨勬彁鐜扮敵璇疯椹冲洖銆傛垜浠�氳繃鏍稿鍙戠幇浣犵殑璐︾洰鏄庣粏鏈夎锛屾垜浠細鍦ㄥ璁″畬鎴愪箣鍚庣粰浣犲彂閫氱煡娑堟伅銆傚鏈夌枒闂鑱旂郴瀹㈡湇銆�"; - // xingePushController.pushSystemZnx(uid, title, content, out); - } catch (ObjectStateException e) { - LogHelper.userInfo( - "[ip:" + IPUtil.getRemotIP(request) + "][绠$悊鍛�:" + admin.getName() + "] 鎷掔粷鎻愮幇id=" + id + "鐨勬彁鐜扮敵璇风姸鎬佸紓甯�!"); // - - out.print(JsonUtil.loadFalseResult(e.getMessage())); - } catch (NotExistObjectException e) { - LogHelper.userInfo( - "[ip:" + IPUtil.getRemotIP(request) + "][绠$悊鍛�:" + admin.getName() + "] 鎷掔粷鎻愮幇id=" + id + "鐨勬彁鐜扮敵璇蜂笉瀛樺湪!"); - - out.print(JsonUtil.loadFalseResult(e.getMessage())); - } } /** @@ -285,29 +187,22 @@ return; } - /* 鎷掔粷鎻愮幇 鎿嶄綔 */ - try { + // 缂栫爜杞崲 reason = URLDecoder.decode(reason, "UTF-8"); } catch (Exception e1) { e1.printStackTrace(); } try { - Extract extract = extractService.getExtractById(id); - long extractTime = extract.getExtractTime(); - extractService.rejectExtract(id, reason, extractTime, admin);// 鎻愮幇澶辫触 - JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎷掔粷")); + extractService.rejectExtract(id, reason, admin);// 鎻愮幇澶辫触 - // 璋冪敤鎺ㄩ�佺珯鍐呬俊缁欑敤鎴� - // out.print(JsonUtil.loadTrueResult("鎷掔粷")); + JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎷掔粷鎴愬姛")); + LogHelper.userInfo("[ip:" + IPUtil.getRemotIP(request) + "]" + admin.getName() + "鎷掔粷浜哰id=" + id + "]鐨勬彁鐜扮敵璇�!鎷掔粷鍘熷洜鏄�" + reason); - String title = "浣犵殑鎻愮幇鐢宠琚┏鍥�"; - String content = "闈炲父閬楁喚锛屼綘鐨勬彁鐜扮敵璇疯椹冲洖銆傛垜浠�氳繃鏍稿鍙戠幇浣犵殑璐︾洰鏄庣粏鏈夎锛屾垜浠細鍦ㄥ璁″畬鎴愪箣鍚庣粰浣犲彂閫氱煡娑堟伅銆傚鏈夌枒闂鑱旂郴瀹㈡湇銆�"; - // xingePushController.pushSystemZnx(uid, title, content, out); } catch (ObjectStateException e) { LogHelper.userInfo( "[ip:" + IPUtil.getRemotIP(request) + "][绠$悊鍛�:" + admin.getName() + "] 鎷掔粷鎻愮幇id=" + id + "鐨勬彁鐜扮敵璇风姸鎬佸紓甯�!"); // @@ -321,24 +216,6 @@ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMessage())); } - } - - /** - * 璧勯噾鏍¢獙鏄惁寮傚父 - * - * @param uid - * @param out - */ - @RequestMapping(value = "checkExtract", method = RequestMethod.POST) - public void checkExtract(String uid, PrintWriter out) { - JSONObject data = new JSONObject(); - try { - extractService.checkExtract(uid); - data.put("code", "1"); // 姝e父 - } catch (ExtractException e) { - data.put("code", "0");// 寮傚父 - } - out.print(data); } /** @@ -357,8 +234,8 @@ // 褰撳墠鐢ㄦ埛浣欓鎬昏锛氭墍鏈夌敤鎴锋�讳綑棰� BigDecimal amountMoney = userInfoCountService.countAllMoney(null); - // 鍙彁鐜伴噾棰濋檺鍒� - String minMoney = configService.get(Constant.EXTRACT_MIN_MONEY); + // 鍙彁鐜伴噾棰濋檺鍒� + String minMoney = configService.get(ConfigKeyEnum.extractMoneyMin.getKey()); if (minMoney == null) { minMoney = "0"; } @@ -438,8 +315,8 @@ if (extract != null) { UserInfo userInfo = extract.getUserInfo(); Long id = userInfo.getId(); - countByUid = hongBaoService.getCountByUid(id); - countCancel = hongBaoV2CountService.countNumberByUidAndState(id, HongBaoV2.STATE_SHIXIAO); + countByUid = hongBaoV2CountService.countNumberByUid(id); + countCancel = hongBaoV2CountService.countNumberByUidAndState(id, HongBaoV2.STATE_SHIXIAO); } extractAuditRecord.setCancelOrderNum((long) countCancel); extractAuditRecord.setOrderNum((long) countByUid); @@ -492,13 +369,12 @@ // } int pageSize = Constant.PAGE_SIZE; - Integer days = null; - if (TODAY.equals(timeSlot)) { + if ("1".equals(timeSlot)) { days = 0; // 浠婃棩 - } else if (THREE.equals(timeSlot)) { + } else if ("2".equals(timeSlot)) { days = 3; // 鍓�3澶� - } else if (AWEEK.equals(timeSlot)) { + } else if ("3".equals(timeSlot)) { days = 7; // 鍓�7澶� } @@ -527,23 +403,73 @@ if (adminUser == null) { record.setAdminUser(new AdminUser()); } + // 鏌ヨ鐢ㄦ埛澶囨敞淇℃伅 + UserInfoExtra extra = userInfoExtraService.getUserInfoExtra(record.getExtract().getUserInfo().getId()); + if (extra != null) { + record.getExtract().getUserInfo().setStateDesc(extra.getMark()); + } int warnLevel = 0; Extract extract = record.getExtract(); if (extract != null) { Integer extractState = extract.getState(); - if (extractState != null && extractState == 0) { + if (extractState != null && extractState == Extract.STATE_NOT_PROCESS) { UserInfo userInfo = extract.getUserInfo(); if (userInfo != null) { - double countTodayMoney = extractService.countTodayMoney(userInfo.getId()); - if (countTodayMoney >= 100) { + BigDecimal countTodayMoney = extractService.sumTodayApplyMoney(userInfo.getId(), + TimeUtil.getGernalTime(extract.getExtractTime())); + if (countTodayMoney.compareTo(new BigDecimal(100)) > 0) { warnLevel = 1; } } } - } + + if (record.getExtraInfo() != null) { + StringBuffer desc = new StringBuffer(); + if (System.currentTimeMillis() > TimeUtil.convertToTimeTemp("2019-06-21", "yyyy-MM-dd")) { + desc.append("澶х瑪璁㈠崟鏁�:" + record.getExtraInfo().getOrderCount50More() + "\n#"); + desc.append("缁存潈璁㈠崟鏁�:" + record.getExtraInfo().getWeiQuanOrderCount() + "\n#"); + desc.append("缁存潈璁㈠崟浣i噾:" + record.getExtraInfo().getWeiQuanOrderFanAmount() + "\n#"); + if (record.getExtraInfo().getOrderCount50More() > 0 + || record.getExtraInfo().getWeiQuanOrderCount() > 0 + || record.getExtraInfo().getWeiQuanOrderFanAmount().compareTo(new BigDecimal(10)) >= 0) + warnLevel = 2; + } else { + if (record.getExtraInfo().getOrderCount50More() > 0 + || record.getExtraInfo().getWeiQuanOrderCount() > 0 + || record.getExtraInfo().getWeiQuanOrderFanAmount().compareTo(new BigDecimal(0)) > 0) + warnLevel = 2; + desc.append("澶т簬50鍏冭鍗�:" + record.getExtraInfo().getOrderCount50More() + "\n#"); + desc.append("缁存潈璁㈠崟鏁�:" + record.getExtraInfo().getWeiQuanOrderCount() + "\n#"); + desc.append("缁存潈璁㈠崟閫�鍥為噾棰�:" + record.getExtraInfo().getWeiQuanOrderFanAmount() + "\n#"); + desc.append("180澶╁畨鍏ㄨ鍗曟暟:" + record.getExtraInfo().getSafeOrderCount()); + } + record.setExtraInfoStr(desc.toString()); + } + + // if (warnLevel == 0) { + // // 鏌ヨ鍚屽簵閾哄晢鍝侊紝鍚屽晢鍝佽鍗曡秴杩囦竴瀹氭暟閲忕殑 + // List<Integer> typeList = new ArrayList<>(); + // typeList.add(HongBaoV2.TYPE_ZIGOU); + // long sameGoodsOrderCount = + // commonOrderCountService.countSameGoodsOrderByUidAndHongBaoType(typeList, + // record.getExtract().getUserInfo().getId(), + // Integer.parseInt(configService.get(ConfigKeyEnum.adminMinSameGoodsOrderCount.getKey()))); + // long sameShopOrderCount = + // commonOrderCountService.countSameShopOrderByUidAndHongBaoType(typeList, + // record.getExtract().getUserInfo().getId(), + // Integer.parseInt(configService.get(ConfigKeyEnum.adminMinSameShopOrderCount.getKey()))); + // if (sameGoodsOrderCount > 0 || sameShopOrderCount > 0) { + // warnLevel = 3; + // record.setExtraInfoStr( + // String.format("鍚屽簵閾�:%s 鍚屽晢鍝�:%s", sameShopOrderCount, + // sameGoodsOrderCount)); + // } + // } + record.setWarnLevel(warnLevel); + } int count = extractAuditRecordService.getMyAuditedTimeSlotCount(key, state, null, days); @@ -552,6 +478,8 @@ GsonBuilder gsonBuilder = new GsonBuilder(); gsonBuilder.serializeNulls(); + gsonBuilder.setDateFormat("yyyy-MM-dd HH:mm:ss"); + Gson gson = gsonBuilder.create(); JSONObject data = new JSONObject(); @@ -564,6 +492,27 @@ e.printStackTrace(); out.print(JsonUtil.loadFalseResult(e.getMessage())); } + } + + @RequestMapping(value = "getMyAuditedDanger") + public void getMyAuditedDanger(String callback, Long uid, PrintWriter out) { + if (uid == null) { + JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇风櫥褰�")); + return; + } + // 鏌ヨ鍚屽簵閾哄晢鍝侊紝鍚屽晢鍝佽鍗曡秴杩囦竴瀹氭暟閲忕殑 + List<Integer> typeList = new ArrayList<>(); + typeList.add(HongBaoV2.TYPE_ZIGOU); + long sameGoodsOrderCount = commonOrderCountService.countSameGoodsOrderByUidAndHongBaoType(typeList, uid, + Integer.parseInt(configService.get(ConfigKeyEnum.adminMinSameGoodsOrderCount.getKey()))); + long sameShopOrderCount = commonOrderCountService.countSameShopOrderByUidAndHongBaoType(typeList, uid, + Integer.parseInt(configService.get(ConfigKeyEnum.adminMinSameShopOrderCount.getKey()))); + if (sameGoodsOrderCount > 0 || sameShopOrderCount > 0) { + String text = (String.format("鍚屽簵閾�:%s 鍚屽晢鍝�:%s", sameShopOrderCount, sameGoodsOrderCount)); + JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(text)); + return; + } + JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("搴楅摵/鍟嗗搧鏃犲紓甯�")); } /** @@ -666,6 +615,13 @@ surplusTime = DateUtil.dateDiff(formattodayTime, formatTime); } + String mark = ""; + UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(extract.getUserInfo().getId()); + if (userInfoExtra != null && !StringUtil.isNullOrEmpty(userInfoExtra.getMark())) { + mark = "璀︽儠锛侊紒 " + userInfoExtra.getMark(); + } + + data.put("mark", mark); data.put("extract", extract); data.put("beforeMoney", beforeMoney); data.put("surplusTime", surplusTime); @@ -729,6 +685,13 @@ surplusTime = DateUtil.dateDiff(formattodayTime, formatTime); } + String mark = ""; + UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(extract.getUserInfo().getId()); + if (userInfoExtra != null && !StringUtil.isNullOrEmpty(userInfoExtra.getMark())) { + mark = "璀︽儠锛侊紒 " + userInfoExtra.getMark(); + } + + data.put("mark", mark); data.put("extract", extract); data.put("beforeMoney", beforeMoney); data.put("surplusTime", surplusTime); @@ -774,6 +737,18 @@ if (list == null || list.size() == 0) { JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鎻愮幇璁板綍")); return; + } + + for (ExtractAuditRecord record : list) { + + if (record.getExtraInfo() != null) { + StringBuffer desc = new StringBuffer(); + desc.append("澶т簬50鍏冭鍗�:" + record.getExtraInfo().getOrderCount50More() + "\n#"); + desc.append("缁存潈璁㈠崟鏁�:" + record.getExtraInfo().getWeiQuanOrderCount() + "\n#"); + desc.append("缁存潈璁㈠崟閫�鍥為噾棰�:" + record.getExtraInfo().getWeiQuanOrderFanAmount() + "\n#"); + desc.append("180澶╁畨鍏ㄨ鍗曟暟:" + record.getExtraInfo().getSafeOrderCount()); + record.setExtraInfoStr(desc.toString()); + } } int count = extractAuditRecordService.getByUidCount(uid); @@ -855,7 +830,7 @@ } try { - extractService.checkExtract(uid); + extractService.checkExtract(Long.parseLong(uid)); JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("璧勯噾姝e父")); } catch (ExtractException e) { JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg())); @@ -883,85 +858,122 @@ @RequestMapping(value = "getAuditTotal") public void getAuditTotal(String callback, String stateArray, Integer dateType, String year, String startTime, String endTime, PrintWriter out) { - - String validateMsg = AdminUtils.validateParams(dateType, startTime, endTime); - if (validateMsg != null) { - JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(validateMsg)); - return; - } - - if (dateType == 1 && year != null) { - year = null; // 璁剧疆涓虹┖ - } else if (dateType == 2) { - if (startTime != null) - startTime = null; - - if (endTime != null) - endTime = null; - - } else if (dateType == 3) { - if (year != null) - year = null; - - if (startTime != null) - startTime = null; - - if (endTime != null) - endTime = null; - } - try { - Object objectDate = null; - List<String> dateList = AdminUtils.getDateList(dateType, startTime, endTime, year); + String validateMsg = AdminUtils.validateParams(dateType, startTime, endTime); + if (validateMsg != null) { + JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(validateMsg)); + return; + } + + if (dateType != 1 && (!StringUtil.isNullOrEmpty(startTime) || !StringUtil.isNullOrEmpty(endTime))) { + startTime = null; + endTime = null; + } + Date beginDate = null; + Date endDate = null; + + if (dateType == 1) { + beginDate = TimeUtil.parse(startTime); + endDate = TimeUtil.parse(endTime); + } else if (dateType == 2) { + Calendar calendar=Calendar.getInstance(); + int currentYear = calendar.get(Calendar.YEAR); + if (!StringUtil.isNullOrEmpty(year)) { + currentYear = Integer.parseInt(year); + } + calendar.clear(); + calendar.set(Calendar.YEAR, currentYear); + beginDate =calendar.getTime(); + + calendar.clear(); + calendar.set(Calendar.YEAR, currentYear); + calendar.roll(Calendar.DAY_OF_YEAR, -1); + endDate=calendar.getTime(); + } else if (dateType == 3) { + beginDate = TimeUtil.parse("2018-01-01"); + endDate = new Date(); + } Gson gson = new Gson(); - List<Integer> stateList = gson.fromJson(stateArray, new TypeToken<ArrayList<Integer>>() { - }.getType()); - + List<String> dateList = AdminUtils.getDateList(dateType, startTime, endTime, year); + + String substring = stateArray.substring(1, stateArray.length()-1); + List<Integer> channelList = null; + if (stateArray != null && stateArray.trim().length() > 4) { + channelList = gson.fromJson(stateArray, new TypeToken<ArrayList<Integer>>() {}.getType()); + } + JSONArray line_list = new JSONArray(); - for (Integer state : stateList) { - JSONObject innerList = new JSONObject(); - if (state == null || state == 3) { - innerList.put("name", "鎬昏"); - } else if (state == 1) { - innerList.put("name", "閫氳繃鏁�"); - } else if (state == 2) { - innerList.put("name", "椹冲洖鏁�"); - } - - List<Map<String, Object>> list = extractAuditRecordService.countAuditTotal(state, dateType, year, - startTime, endTime); - - if (dateType != 3) { - innerList.put("data", gson.toJson(AdminUtils.dayOrMonthDataFactory(dateType, dateList, list))); - } else { - // 骞磋鍥� - Map<String, Object> map = AdminUtils.yearsDataFactory(list); - - if (objectDate == null) { - objectDate = map.get("date"); + + if (channelList != null && channelList.size() > 0) { + for (Integer state : channelList) { + List<Object> list = getAuditData(dateList, dateType, beginDate, endDate, state); + String name = ""; + if (state == 1) { + name = "閫氳繃"; + } else if (state == 2) { + name = "椹冲洖"; } - innerList.put("data", gson.toJson(map.get("value"))); + JSONObject innerList = new JSONObject(); + innerList.put("name", name); + innerList.put("data", gson.toJson(list)); + line_list.add(innerList); } - + } else { + List<Object> list = getAuditData(dateList, dateType, beginDate, endDate, null); + JSONObject innerList = new JSONObject(); + innerList.put("name", "鍏ㄩ儴"); + innerList.put("data", gson.toJson(list)); line_list.add(innerList); } JSONObject data = new JSONObject(); - if (objectDate != null) { - data.put("xAxis_list", gson.toJson(objectDate)); - } else { - data.put("xAxis_list", gson.toJson(dateList)); - } - data.put("line_list", line_list); - + data.put("xAxis_list", gson.toJson(dateList)); JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data)); - } catch (Exception e) { - JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父")); + JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("绯荤粺寮傚父")); e.printStackTrace(); } + } + + private List<Object> getAuditData(List<String> dateList, Integer dateType, Date beginDate, Date endDate, + Integer state) throws Exception{ + List<Object> list = new ArrayList<>(); + List<CountUserInfo> listHistory = extractAuditRecordService.getAuditCount(beginDate, endDate, state); + for (String date: dateList) { + int value = 0; + if (listHistory != null) { + for (CountUserInfo history: listHistory) { + if (dateType == 1) { + String gernalTime = TimeUtil.getGernalTime(history.getDay().getTime()); + if (gernalTime.equalsIgnoreCase(date)) { + value += history.getNum(); + continue; + } + } else if (dateType == 2){ + String gernalTime = TimeUtil.getMonthOnlyMM(history.getDay()); + if(gernalTime.startsWith("0")) { + gernalTime = gernalTime.substring(1, 2); + } + + if (gernalTime.equalsIgnoreCase(date)) { + value += history.getNum(); + continue; + } + } else if (dateType == 3) { + String gernalTime = TimeUtil.getYearOnlyYYYY(history.getDay()); + if (gernalTime.equalsIgnoreCase(date)) { + value += history.getNum(); + continue; + } + } + } + } + list.add(value + ""); + } + + return list; } /** @@ -983,72 +995,92 @@ @RequestMapping(value = "getExtractApplyMoney") public void getExtractApplyMoney(String callback, Integer dateType, String year, String startTime, String endTime, PrintWriter out) { - - String validateMsg = AdminUtils.validateParams(dateType, startTime, endTime); - if (validateMsg != null) { - JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(validateMsg)); - return; - } - - if (dateType == 1 && year != null) { - year = null; // 璁剧疆涓虹┖ - } else if (dateType == 2) { - if (startTime != null) - startTime = null; - - if (endTime != null) - endTime = null; - - } else if (dateType == 3) { - if (year != null) - year = null; - - if (startTime != null) - startTime = null; - - if (endTime != null) - endTime = null; - } - try { - - Object objectDate = null; - List<String> dateList = AdminUtils.getDateList(dateType, startTime, endTime, year); - - Gson gson = new Gson(); - JSONArray line_list = new JSONArray(); - - JSONObject innerList = new JSONObject(); - innerList.put("name", "鎬昏"); - - List<Map<String, Object>> list = extractAuditRecordService.countExtractApplyMoney(null, dateType, year, - startTime, endTime); - - if (dateType != 3) { - innerList.put("data", gson.toJson(AdminUtils.dayOrMonthDataFactory(dateType, dateList, list))); - } else { - // 骞磋鍥� - Map<String, Object> map = AdminUtils.yearsDataFactory(list); - - if (objectDate == null) { - objectDate = map.get("date"); - } - innerList.put("data", gson.toJson(map.get("value"))); + String validateMsg = AdminUtils.validateParams(dateType, startTime, endTime); + if (validateMsg != null) { + JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(validateMsg)); + return; + } + + if (dateType != 1 && (!StringUtil.isNullOrEmpty(startTime) || !StringUtil.isNullOrEmpty(endTime))) { + startTime = null; + endTime = null; } + Date beginDate = null; + Date endDate = null; + if (dateType == 1) { + beginDate = TimeUtil.parse(startTime); + endDate = TimeUtil.parse(endTime); + } else if (dateType == 2) { + Calendar calendar=Calendar.getInstance(); + int currentYear = calendar.get(Calendar.YEAR); + if (!StringUtil.isNullOrEmpty(year)) { + currentYear = Integer.parseInt(year); + } + + calendar.clear(); + calendar.set(Calendar.YEAR, currentYear); + beginDate =calendar.getTime(); + + calendar.clear(); + calendar.set(Calendar.YEAR, currentYear); + calendar.roll(Calendar.DAY_OF_YEAR, -1); + endDate=calendar.getTime(); + } else if (dateType == 3) { + beginDate = TimeUtil.parse("2018-01-01"); + endDate = new Date(); + } + Gson gson = new Gson(); + List<String> dateList = AdminUtils.getDateList(dateType, startTime, endTime, year); + + List<String> list = new ArrayList<>(); + List<CountUserInfo> listHistory = extractAuditRecordService.getApplyMoney(beginDate, endDate); + for (String date: dateList) { + BigDecimal money = new BigDecimal("0"); + if (listHistory == null) { + list.add(money.toString()); + continue; + } + + for (CountUserInfo history: listHistory) { + if (dateType == 1) { + String gernalTime = TimeUtil.getGernalTime(history.getDay().getTime()); + if (gernalTime.equalsIgnoreCase(date)) { + money = MoneyBigDecimalUtil.add(money, history.getMoney()); + continue; + } + } else if (dateType == 2){ + String gernalTime = TimeUtil.getMonthOnlyMM(history.getDay()); + if(gernalTime.startsWith("0")) { + gernalTime = gernalTime.substring(1, 2); + } + if (gernalTime.equalsIgnoreCase(date)) { + money = MoneyBigDecimalUtil.add(money, history.getMoney()); + continue; + } + } else if (dateType == 3) { + String gernalTime = TimeUtil.getYearOnlyYYYY(history.getDay()); + if (gernalTime.equalsIgnoreCase(date)) { + money = MoneyBigDecimalUtil.add(money, history.getMoney()); + continue; + } + } + } + list.add(money.toString()); + } + + JSONObject innerList = new JSONObject(); + innerList.put("name", "閲戦"); + innerList.put("data", gson.toJson(list)); + + JSONArray line_list = new JSONArray(); line_list.add(innerList); JSONObject data = new JSONObject(); - if (objectDate != null) { - data.put("xAxis_list", gson.toJson(objectDate)); - } else { - data.put("xAxis_list", gson.toJson(dateList)); - } - + data.put("xAxis_list", gson.toJson(dateList)); data.put("line_list", line_list); - JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data)); - } catch (Exception e) { JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父")); e.printStackTrace(); @@ -1076,76 +1108,226 @@ @RequestMapping(value = "getExtractApplyNumber") public void getExtractApplyNumber(String callback, Integer state, Integer dateType, String year, String startTime, String endTime, PrintWriter out) { - - String validateMsg = AdminUtils.validateParams(dateType, startTime, endTime); - if (validateMsg != null) { - JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(validateMsg)); - return; - } - - if (dateType == 1 && year != null) { - year = null; // 璁剧疆涓虹┖ - } else if (dateType == 2) { - if (startTime != null) - startTime = null; - - if (endTime != null) - endTime = null; - - } else if (dateType == 3) { - if (year != null) - year = null; - - if (startTime != null) - startTime = null; - - if (endTime != null) - endTime = null; - } - try { - - Object objectDate = null; - List<String> dateList = AdminUtils.getDateList(dateType, startTime, endTime, year); - - Gson gson = new Gson(); - JSONArray line_list = new JSONArray(); - - JSONObject innerList = new JSONObject(); - innerList.put("name", "鎬昏"); - - List<Map<String, Object>> list = extractAuditRecordService.countExtractApplyNumber(null, dateType, year, - startTime, endTime); - - if (dateType != 3) { - innerList.put("data", gson.toJson(AdminUtils.dayOrMonthDataFactory(dateType, dateList, list))); - } else { - // 骞磋鍥� - Map<String, Object> map = AdminUtils.yearsDataFactory(list); - - if (objectDate == null) { - objectDate = map.get("date"); - } - innerList.put("data", gson.toJson(map.get("value"))); + String validateMsg = AdminUtils.validateParams(dateType, startTime, endTime); + if (validateMsg != null) { + JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(validateMsg)); + return; + } + + if (dateType != 1 && (!StringUtil.isNullOrEmpty(startTime) || !StringUtil.isNullOrEmpty(endTime))) { + startTime = null; + endTime = null; } + + Date beginDate = null; + Date endDate = null; + + if (dateType == 1) { + beginDate = TimeUtil.parse(startTime); + endDate = TimeUtil.parse(endTime); + } else if (dateType == 2) { + Calendar calendar=Calendar.getInstance(); + int currentYear = calendar.get(Calendar.YEAR); + if (!StringUtil.isNullOrEmpty(year)) { + currentYear = Integer.parseInt(year); + } + + calendar.clear(); + calendar.set(Calendar.YEAR, currentYear); + beginDate =calendar.getTime(); + + calendar.clear(); + calendar.set(Calendar.YEAR, currentYear); + calendar.roll(Calendar.DAY_OF_YEAR, -1); + endDate=calendar.getTime(); + } else if (dateType == 3) { + beginDate = TimeUtil.parse("2018-01-01"); + endDate = new Date(); + } + Gson gson = new Gson(); + List<String> dateList = AdminUtils.getDateList(dateType, startTime, endTime, year); + + List<Object> list = new ArrayList<>(); + List<CountUserInfo> listHistory = extractAuditRecordService.geApplyNumber(beginDate, endDate); + for (String date: dateList) { + int value = 0; + if (listHistory == null) { + list.add(value + ""); + continue; + } + + for (CountUserInfo history: listHistory) { + if (dateType == 1) { + String gernalTime = TimeUtil.getGernalTime(history.getDay().getTime()); + if (gernalTime.equalsIgnoreCase(date)) { + value += history.getNum(); + continue; + } + } else if (dateType == 2){ + String gernalTime = TimeUtil.getMonthOnlyMM(history.getDay()); + if(gernalTime.startsWith("0")) { + gernalTime = gernalTime.substring(1, 2); + } + if (gernalTime.equalsIgnoreCase(date)) { + value += history.getNum(); + continue; + } + } else if (dateType == 3) { + String gernalTime = TimeUtil.getYearOnlyYYYY(history.getDay()); + if (gernalTime.equalsIgnoreCase(date)) { + value += history.getNum(); + continue; + } + } + } + list.add(value + ""); + } + + JSONObject innerList = new JSONObject(); + innerList.put("name", "鏁伴噺"); + innerList.put("data", gson.toJson(list)); + + JSONArray line_list = new JSONArray(); line_list.add(innerList); JSONObject data = new JSONObject(); - if (objectDate != null) { - data.put("xAxis_list", gson.toJson(objectDate)); - } else { - data.put("xAxis_list", gson.toJson(dateList)); + data.put("xAxis_list", gson.toJson(dateList)); + data.put("line_list", line_list); + JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data)); + } catch (Exception e) { + JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("绯荤粺寮傚父")); + e.printStackTrace(); + } + } + + /** + * 涓嬭浇鎻愮幇绾㈠寘Openid + * + * @param callback + * @param response + * @param out + */ + @RequestMapping(value = "downAutoExtractTxt") + public void downAutoExtractTxt(String callback, HttpServletResponse response, PrintWriter out) { + try { + List<String> list = extractService.getAutoExtractOpenIds(); + if (list == null || list.size() <= 1) { + JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鐢ㄦ埛婊¤冻鑷姩鎻愮幇鏉′欢")); + return; } - data.put("line_list", line_list); + String filepath = "鑷姩鎻愮幇OpenId " + java.lang.System.currentTimeMillis() + ".txt"; + response.reset(); + response.setContentType("application/octet-stream"); + String fileName = URLDecoder.decode(filepath, "utf-8"); + response.addHeader("Content-Disposition", + "attachment;" + "filename=\"" + URLEncoder.encode(fileName, "utf-8") + "\""); - JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data)); + StringBuilder sb = new StringBuilder(); + for (String t : list) { + sb.append(t + "\r\n"); + } + String opid_str = sb.toString(); + if (!StringUtil.isNullOrEmpty(opid_str) && opid_str.endsWith("\r\n")) { + opid_str = opid_str.substring(0, opid_str.length() - 2); + } + + OutputStream os = response.getOutputStream(); + byte[] byt = opid_str.getBytes(); + os.write(byt); + os.flush(); + os.close(); } catch (Exception e) { JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父")); e.printStackTrace(); } } + /** + * 涓婁紶鎻愮幇绾㈠寘Excel + * + * @param file + * @param out + */ + @RequestMapping(value = "uploadExcel", method = RequestMethod.POST) + public void uploadExcel(@RequestParam("file") CommonsMultipartFile file, PrintWriter out) { + if (file == null) { + out.print(JsonUtil.loadFalseResult("涓婁紶鏂囦欢涓嶈兘涓虹┖锛�")); + return; + } + + try { + List<RedPackRecord> list = WXRedPackUtil.readCsv(file.getInputStream()); + extractService.updateManualExtractRecord(list); + out.print(JsonUtil.loadTrueResult("涓婁紶鎴愬姛")); + } catch (ExtractException e) { + out.print(JsonUtil.loadFalseResult(e.getMsg())); + } catch (Exception e) { + e.printStackTrace(); + out.print(JsonUtil.loadFalseResult("涓婁紶澶辫触")); + } + } + + + public static String getValue(String[] item,int index){ + if(item.length > index){ + String value = item[index]; + return value; + } + return ""; + } + + /** + * 棰勮绾㈠寘鍙戠敓浜� + * + * @param callback + * @param pageIndex + * @param out + */ + @RequestMapping(value = "preAutoUser") + public void preAutoUser(String callback, Integer pageIndex, PrintWriter out) { + try { + List<UserInfo> list = extractService.preAutoUser(); + if (list == null || list.isEmpty()) { + JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鐢ㄦ埛婊¤冻鑷姩鎻愮幇鏉′欢")); + return; + } + + if (pageIndex == null || pageIndex < 1) { + pageIndex = 1; + } + + Integer pageSize = 100; + if (pageSize == null || pageSize < 1) { + pageSize = Constant.PAGE_SIZE; + } + + int count = list.size(); + int totalPage = count % pageSize == 0 ? count / pageSize : count / pageSize + 1; + PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage); + + List<UserInfo> listResult = null; + if (pageIndex < totalPage) { + int start = (pageIndex - 1) * pageSize; + listResult = list.subList(start, start + pageSize); + } else if (pageIndex == totalPage) { + listResult = list.subList((pageIndex - 1) * pageSize, list.size()); + } else { + JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("娌℃湁鏇村浜�")); + return; + } + + JSONObject data = new JSONObject(); + data.put("pe", pe); + data.put("result_list", listResult); + JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data)); + } catch (Exception e) { + JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父")); + e.printStackTrace(); + } + } } + -- Gitblit v1.8.0