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

修改订单活动抽成

Browse Source
This commit is contained in:
yuyang 2022-04-22 11:21:59 +08:00
parent 03d97ca4c2
commit 5f5a4c377e
3 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderController.java
View File

@ -135,11 +135,7 @@ public class XhpcHistoryOrderController extends BaseController {
* 日期统计\场站统计\终端统计
*/
@GetMapping("/test1")
<<<<<<< HEAD
//@Scheduled(cron = "0 0/2 * * * ?")
=======
// @Scheduled(cron = "0 0/2 * * * ?")
>>>>>>> mergeDev
public void test1(){
add(3000,1);
}
@ -429,11 +425,7 @@ public class XhpcHistoryOrderController extends BaseController {
* 小时统计
*/
@GetMapping("/test")
<<<<<<< HEAD
//@Scheduled(cron = "0 0/2 * * * ?")
=======
// @Scheduled(cron = "0 0/2 * * * ?")
>>>>>>> mergeDev
public void test(){
logger.info(">>>>>>>>>>>>>>>>>>>>>>>小时统计定时任务>>>>>>>>>>>>>>>>>>>>>");
//小时统计
@ -883,11 +875,7 @@ public class XhpcHistoryOrderController extends BaseController {
* 24小时异常订单自动结算
*/
@GetMapping("/test4")
<<<<<<< HEAD
//@Scheduled(cron = "0 0/5 * * * ?")
=======
// @Scheduled(cron = "0 0/5 * * * ?")
>>>>>>> mergeDev
public void test4(){
//获取异常的订单 24小时之外的异常订单
List<XhpcChargeOrder> xhpcChargeOrderList= chargeOrderService.getXhpcChargeOrderStatus(2, 0);
@ -942,11 +930,7 @@ public class XhpcHistoryOrderController extends BaseController {
* @param
*/
@GetMapping("/test5")
<<<<<<< HEAD
//@Scheduled(cron = "0 0/5 * * * ?")
=======
// @Scheduled(cron = "0 0/5 * * * ?")
>>>>>>> mergeDev
public void test5(){
logger.info(">>>>>>>>>>>>>>>>>>>>>>>标记异常大于创建4小时，标记为异常>>>>>>>>>>>>>>>>>>>>>");
chargeOrderService.updateStatus();

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

@ -1564,28 +1564,39 @@ public class XhpcRealTimeOrderServiceImpl extends BaseService implements IXhpcRe
private BigDecimal getRealOrderTime(Long chargingOrderId,String startTime,String endTime){
//结束时间差时间
int differenceEndTime = xhpcRealTimeOrderMapper.getDifferenceTime(chargingOrderId, endTime);
int differenceEndTime =0;
try {
differenceEndTime = xhpcRealTimeOrderMapper.getDifferenceTime(chargingOrderId, endTime);
}catch (Exception e){
//无实时数据
}
double endTimeChargingDegree =0.0;
if(differenceEndTime>0){
//时间差度数
double chargingDegreeTime = xhpcRealTimeOrderMapper.getChargingDegreeTime(chargingOrderId, endTime);
endTimeChargingDegree = differenceEndTime*chargingDegreeTime/15;
}
int differenceStartTime=0;
try {
differenceStartTime = xhpcRealTimeOrderMapper.getDifferenceTime(chargingOrderId, startTime);
}catch (Exception e){
//无实时数据
}
//开始时间差度数
int differenceStartTime = xhpcRealTimeOrderMapper.getDifferenceTime(chargingOrderId, startTime);
double startTimeChargingDegree =0.0;
if(differenceStartTime>0){
//时间差度数
double chargingDegreeTime = xhpcRealTimeOrderMapper.getChargingDegreeTime(chargingOrderId, startTime);
startTimeChargingDegree = differenceStartTime*chargingDegreeTime/15;
}
double realTimeOrderTime = xhpcRealTimeOrderMapper.getRealTimeOrderTime(chargingOrderId, startTime, endTime);
BigDecimal chargingDegree = new BigDecimal(realTimeOrderTime+endTimeChargingDegree-startTimeChargingDegree).setScale(2,BigDecimal.ROUND_HALF_UP);
return chargingDegree;
double realTimeOrderTime = 0.0;
try {
realTimeOrderTime = xhpcRealTimeOrderMapper.getRealTimeOrderTime(chargingOrderId, startTime, endTime);
}catch (Exception e){
//无实时数据
}
return new BigDecimal(realTimeOrderTime+endTimeChargingDegree-startTimeChargingDegree).setScale(2,BigDecimal.ROUND_HALF_UP);
}

2
xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcRealTimeOrderMapper.xml
View File

@ -777,7 +777,7 @@
and status =3 and del_flag=0
and activity_id in (
SELECT activity_id FROM xhpc_activity_internet WHERE start_time &lt;= #{startTime} AND end_time &gt;= #{startTime} and status =3 and del_flag=0)
or activity_id in (
and activity_id in (
SELECT activity_id FROM xhpc_activity_internet WHERE start_time &lt;= #{endTime} AND end_time &gt;= #{endTime} and status =3 and del_flag=0)
order by end_time
</select>