|
|
@@ -1,6 +1,7 @@
|
|
|
package com.uas.platform.b2b.service.impl;
|
|
|
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
+import com.uas.platform.b2b.constant.StringConstant;
|
|
|
import com.uas.platform.b2b.core.util.ContextUtils;
|
|
|
import com.uas.platform.b2b.core.util.DateFormatUtils;
|
|
|
import com.uas.platform.b2b.core.util.DateUtils;
|
|
|
@@ -29,6 +30,7 @@ import com.uas.platform.b2b.search.SearchService;
|
|
|
import com.uas.platform.b2b.service.OrderRedDotService;
|
|
|
import com.uas.platform.b2b.service.PurchaseApCheckService;
|
|
|
import com.uas.platform.b2b.service.UserService;
|
|
|
+import com.uas.platform.b2b.support.DecimalUtils;
|
|
|
import com.uas.platform.b2b.support.SPageUtils;
|
|
|
import com.uas.platform.b2b.support.SystemSession;
|
|
|
import com.uas.platform.core.exception.IllegalOperatorException;
|
|
|
@@ -562,7 +564,7 @@ public class PurchaseApCheckServiceImpl implements PurchaseApCheckService {
|
|
|
*/
|
|
|
pageInfo.filter("vendEnUU", SystemSession.getUser().getEnterprise().getUu());
|
|
|
pageInfo.filter("apcheck", Constant.YES);
|
|
|
- pageInfo.expression(PredicateUtils.ne("totalCountString", "", true));
|
|
|
+ pageInfo.expression(PredicateUtils.ne("totalCountString", StringConstant.BLANK, true));
|
|
|
pageInfo.expression(PredicateUtils.isNotNull("totalCountString"));
|
|
|
if (filter != null) {
|
|
|
pageInfo.expression(PredicateUtils.in("myEnUU", filter.getDistribute(), true));
|
|
|
@@ -650,13 +652,13 @@ public class PurchaseApCheckServiceImpl implements PurchaseApCheckService {
|
|
|
.mapToDouble(trade -> trade.getAmount().doubleValue()).sum();
|
|
|
List<TradeCount> resultCounts = new ArrayList<>();
|
|
|
if (rmbCount > 0) {
|
|
|
- resultCounts.add(new TradeCount(RMB, rmbCount));
|
|
|
+ resultCounts.add(new TradeCount(RMB, DecimalUtils.decimalPoint(rmbCount, 2)));
|
|
|
}
|
|
|
if (usdCount > 0) {
|
|
|
- resultCounts.add(new TradeCount(USD, usdCount));
|
|
|
+ resultCounts.add(new TradeCount(USD, DecimalUtils.decimalPoint(usdCount, 2)));
|
|
|
}
|
|
|
if (hkdCount > 0) {
|
|
|
- resultCounts.add(new TradeCount(HKD, hkdCount));
|
|
|
+ resultCounts.add(new TradeCount(HKD, DecimalUtils.decimalPoint(hkdCount, 2)));
|
|
|
}
|
|
|
return resultCounts;
|
|
|
}
|
|
|
@@ -706,13 +708,13 @@ public class PurchaseApCheckServiceImpl implements PurchaseApCheckService {
|
|
|
.mapToDouble(trade -> trade.getAmount().doubleValue()).sum();
|
|
|
List<TradeCount> resultCounts = new ArrayList<>();
|
|
|
if (rmbCount > 0) {
|
|
|
- resultCounts.add(new TradeCount(RMB, rmbCount));
|
|
|
+ resultCounts.add(new TradeCount(RMB, DecimalUtils.decimalPoint(rmbCount, 2)));
|
|
|
}
|
|
|
if (usdCount > 0) {
|
|
|
- resultCounts.add(new TradeCount(USD, usdCount));
|
|
|
+ resultCounts.add(new TradeCount(USD, DecimalUtils.decimalPoint(usdCount, 2)));
|
|
|
}
|
|
|
if (hkdCount > 0) {
|
|
|
- resultCounts.add(new TradeCount(HKD, hkdCount));
|
|
|
+ resultCounts.add(new TradeCount(HKD, DecimalUtils.decimalPoint(hkdCount, 2)));
|
|
|
}
|
|
|
return resultCounts;
|
|
|
}
|