yuyang/XH-Power-Cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改C端用户统计、订单结算时间大于等于开始时间、结算订单大于500异常

Browse Source
This commit is contained in:
yuyang 2022-07-13 14:24:22 +08:00
parent 9aaf3696d0
commit c4d1b87049
4 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcPileOrderController.java
View File

@ -472,6 +472,14 @@ public class XhpcPileOrderController extends BaseController {
}else{
money = powerPrice.add(servicePrice);
}
if(money.compareTo(new BigDecimal(500)) > -1){
logger.info("结算金额大于500>>"+money+">>>orderNo：" + orderNo);
xhpcChargeOrder.setStatus(2);
xhpcChargeOrder.setUpdateTime(new Date());
xhpcChargeOrderService.updateXhpcChargeOrder(xhpcChargeOrder);
return R.fail(500,"无效订单号："+orderNo);
}
//剩余的电费
BigDecimal surplusPowerPrice = powerPrice;
//剩余的服务费

2
xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcRealTimeOrderServiceImpl.java
View File

@ -398,7 +398,7 @@ public class XhpcRealTimeOrderServiceImpl extends BaseService implements IXhpcRe
}
}else{
if(cacheMap.get("startTime") !=null) {
xhpcChargeOrder.setEndTime(DateUtil.parse(cacheMap.get("startTime").toString(), "yyyy-MM-dd HH:mm:ss"));
xhpcChargeOrder.setStartTime(DateUtil.parse(cacheMap.get("startTime").toString(), "yyyy-MM-dd HH:mm:ss"));
}
}
}

16
xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcStatisticsMapper.xml
View File

@ -45,7 +45,7 @@
format(ifnull(sum(activity_power_price_total),0), 2) activityPowerPriceTotal,
format(ifnull(sum(activity_service_price_total),0), 2) activityServicePriceTotal,
format(ifnull(sum(activity_total_price),0), 2) activityTotalPrice,
format(ifnull(sum(charging_degree),0), 2) chargingDegree,
format(ifnull(sum(charging_degree),0), 4) chargingDegree,
format(ifnull(sum(charging_time),0), 2) chargingTime,
ifnull(sum(charging_number),0) chargingNumber,
format(ifnull(sum(power_price),0), 2) powerPrice,
@ -127,7 +127,7 @@
<select id="getDateIntervalPage" resultType="map">
select
format(ifnull(sum(charging_degree),0), 2) chargingDegree,
format(ifnull(sum(charging_degree),0), 4) chargingDegree,
format(ifnull(sum(charging_time),0), 2) chargingTime,
ifnull(sum(charging_number),0) chargingNumber,
format(ifnull(sum(power_price),0), 2) powerPrice,
@ -191,7 +191,7 @@
<select id="getStationIntervalPage" resultType="map">
select
format(ifnull(sum(ss.charging_degree),0), 2) chargingDegree,
format(ifnull(sum(ss.charging_degree),0), 4) chargingDegree,
format(ifnull(sum(ss.charging_time),0), 2) chargingTime,
ifnull(sum(ss.charging_number),0) chargingNumber,
format(ifnull(sum(ss.power_price),0), 2) powerPrice,
@ -265,7 +265,7 @@
<select id="getOperatorIntervalPage" resultType="map">
select
format(ifnull(sum(ss.charging_degree),0), 2) chargingDegree,
format(ifnull(sum(ss.charging_degree),0), 4) chargingDegree,
format(ifnull(sum(ss.charging_time),0), 2) chargingTime,
ifnull(sum(ss.charging_number),0) chargingNumber,
format(ifnull(sum(ss.power_price),0), 2) powerPrice,
@ -330,7 +330,7 @@
<select id="getInternetUserIntervalPage" resultType="map">
select
format(ifnull(sum(ss.charging_degree),0), 2) chargingDegree,
format(ifnull(sum(ss.charging_degree),0), 4) chargingDegree,
format(ifnull(sum(ss.charging_time),0), 2) chargingTime,
ifnull(sum(ss.charging_number),0) chargingNumber,
format(ifnull(sum(ss.power_price),0), 2) powerPrice,
@ -382,7 +382,7 @@
<select id="getTerminalIntervalPage" resultType="map">
select
format(ifnull(sum(ss.charging_degree),0), 2) chargingDegree,
format(ifnull(sum(ss.charging_degree),0), 4) chargingDegree,
format(ifnull(sum(ss.charging_time),0), 2) chargingTime,
ifnull(sum(ss.charging_number),0) chargingNumber,
format(ifnull(sum(ss.power_price),0), 2) powerPrice,
@ -557,7 +557,7 @@
<select id="getMechanismPage" resultType="map">
select
format(ifnull(sum(charging_degree),0), 2) chargingDegree,
format(ifnull(sum(charging_degree),0), 4) chargingDegree,
format(ifnull(sum(charging_time),0), 2) chargingTime,
ifnull(sum(charging_number),0) chargingNumber,
format(ifnull(sum(power_price),0), 2) powerPrice,
@ -1060,7 +1060,7 @@
<select id="getSumSourceList" resultType="map">
select
format(ifnull(sum(ss.charging_degree),0), 2) chargingDegree,
format(ifnull(sum(ss.charging_degree),0), 4) chargingDegree,
format(ifnull(sum(ss.charging_time),0), 2) chargingTime,
ifnull(sum(ss.charging_number),0) chargingNumber,
format(ifnull(sum(ss.power_price),0), 2) powerPrice,

2
xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcAppUserMapper.xml
View File

@ -210,7 +210,7 @@
<select id="userSum" resultType="map">
select
count(xau.app_user_id) userSum,
count(DISTINCT(xau.phone)) userSum,
(select count(DISTINCT user_id) from xhpc_charge_order where create_time &gt;= #{time1} and tenant_id =#{tenantId}) one,
(select count(DISTINCT user_id) from xhpc_charge_order where create_time &gt;= #{time2} and tenant_id =#{tenantId}) two,
(select count(DISTINCT user_id) from xhpc_charge_order where create_time &gt;= #{time3} and tenant_id =#{tenantId}) three,