From c8f11c229b87d1652b6da0b15576c166cd51eb8b Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 01 一月 2020 14:25:22 +0800
Subject: [PATCH] 首页悬浮图mapperbug修改，增加商品详情中的比例展示
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java | 78 ++++++++++++++++++++++++++++-----------
1 files changed, 56 insertions(+), 22 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 76ff2b4..bcf883a 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
@@ -22,11 +22,11 @@
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.CsvUtil;
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;
@@ -445,22 +445,25 @@
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("admin_min_same_goods_order_count")));
- long sameShopOrderCount = commonOrderCountService.countSameShopOrderByUidAndHongBaoType(typeList,
- record.getExtract().getUserInfo().getId(),
- Integer.parseInt(configService.get("admin_min_same_shop_order_count")));
- if (sameGoodsOrderCount > 0 || sameShopOrderCount > 0) {
- warnLevel = 3;
- record.setExtraInfoStr(
- String.format("鍚屽簵閾�:%s 鍚屽晢鍝�:%s", sameShopOrderCount, sameGoodsOrderCount));
- }
- }
+ // 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("admin_min_same_goods_order_count")));
+ // long sameShopOrderCount =
+ // commonOrderCountService.countSameShopOrderByUidAndHongBaoType(typeList,
+ // record.getExtract().getUserInfo().getId(),
+ // Integer.parseInt(configService.get("admin_min_same_shop_order_count")));
+ // if (sameGoodsOrderCount > 0 || sameShopOrderCount > 0) {
+ // warnLevel = 3;
+ // record.setExtraInfoStr(
+ // String.format("鍚屽簵閾�:%s 鍚屽晢鍝�:%s", sameShopOrderCount,
+ // sameGoodsOrderCount));
+ // }
+ // }
record.setWarnLevel(warnLevel);
@@ -486,6 +489,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("admin_min_same_goods_order_count")));
+ long sameShopOrderCount = commonOrderCountService.countSameShopOrderByUidAndHongBaoType(typeList, uid,
+ Integer.parseInt(configService.get("admin_min_same_shop_order_count")));
+ 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("搴楅摵/鍟嗗搧鏃犲紓甯�"));
}
/**
@@ -1082,9 +1106,10 @@
e.printStackTrace();
}
}
-
+
/**
* 涓嬭浇鎻愮幇绾㈠寘Openid
+ *
* @param callback
* @param response
* @param out
@@ -1125,10 +1150,10 @@
e.printStackTrace();
}
}
-
-
+
/**
* 涓婁紶鎻愮幇绾㈠寘Excel
+ *
* @param file
* @param out
*/
@@ -1140,7 +1165,7 @@
}
try {
- List<RedPackRecord> list = CsvUtil.getCsvData(file, RedPackRecord.class);
+ List<RedPackRecord> list = WXRedPackUtil.readCsv(file.getInputStream());
extractService.updateManualExtractRecord(list);
out.print(JsonUtil.loadTrueResult("涓婁紶鎴愬姛"));
} catch (ExtractException e) {
@@ -1150,10 +1175,19 @@
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
@@ -1200,5 +1234,5 @@
e.printStackTrace();
}
}
-
}
+
--
Gitblit v1.8.0