From e26a53e729c16a36825a399f26e7ab069890320a Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期一, 17 二月 2020 10:11:18 +0800
Subject: [PATCH] 小程序相关接口修改
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 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 bcf883a..c5fa123 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
@@ -39,6 +39,7 @@
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;
@@ -231,8 +232,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";
}
@@ -429,7 +430,7 @@
desc.append("缁存潈璁㈠崟鏁�:" + record.getExtraInfo().getWeiQuanOrderCount() + "\n#");
desc.append("缁存潈璁㈠崟浣ｉ噾:" + record.getExtraInfo().getWeiQuanOrderFanAmount() + "\n#");
if (record.getExtraInfo().getOrderCount50More() > 0
- || record.getExtraInfo().getWeiQuanOrderCount() > 1
+ || record.getExtraInfo().getWeiQuanOrderCount() > 0
|| record.getExtraInfo().getWeiQuanOrderFanAmount().compareTo(new BigDecimal(10)) >= 0)
warnLevel = 2;
} else {
@@ -452,11 +453,11 @@
// long sameGoodsOrderCount =
// commonOrderCountService.countSameGoodsOrderByUidAndHongBaoType(typeList,
// record.getExtract().getUserInfo().getId(),
- // Integer.parseInt(configService.get("admin_min_same_goods_order_count")));
+ // Integer.parseInt(configService.get(ConfigKeyEnum.adminMinSameGoodsOrderCount.getKey())));
// long sameShopOrderCount =
// commonOrderCountService.countSameShopOrderByUidAndHongBaoType(typeList,
// record.getExtract().getUserInfo().getId(),
- // Integer.parseInt(configService.get("admin_min_same_shop_order_count")));
+ // Integer.parseInt(configService.get(ConfigKeyEnum.adminMinSameShopOrderCount.getKey())));
// if (sameGoodsOrderCount > 0 || sameShopOrderCount > 0) {
// warnLevel = 3;
// record.setExtraInfoStr(
@@ -501,9 +502,9 @@
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")));
+ Integer.parseInt(configService.get(ConfigKeyEnum.adminMinSameGoodsOrderCount.getKey())));
long sameShopOrderCount = commonOrderCountService.countSameShopOrderByUidAndHongBaoType(typeList, uid,
- Integer.parseInt(configService.get("admin_min_same_shop_order_count")));
+ 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));
--
Gitblit v1.8.0