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

修改订单结算，金额为0时，不进入活动结算

Browse Source
This commit is contained in:
yuyang 2022-06-13 14:32:26 +08:00
parent e8c75e2a5a
commit 82ebad6306
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcActivityDiscountMapper.xml
View File

@ -200,7 +200,7 @@
and us.userType=#{params.userType}
</if>
<if test="params.userAccount != null and params.userAccount !=''">
and us.userAccount=#{params.userAccount}
and us.userAccount like CONCAT('%',#{params.userAccount},'%')
</if>
</select>

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

@ -335,6 +335,7 @@ public class XhpcRealTimeOrderServiceImpl extends BaseService implements IXhpcRe
xhpcChargeOrderService.updateXhpcChargeOrder(xhpcChargeOrder);
return AjaxResult.success();
}
//总金额
BigDecimal money = powerPrice.add(servicePrice);
//总服务费 servicePrice
@ -537,7 +538,7 @@ public class XhpcRealTimeOrderServiceImpl extends BaseService implements IXhpcRe
//判断是否有活动
logger.info("<<<<<<<<<<<<<<<判断是否有活动>>>>>>>>>>>>>>>>>"+xhpcChargeOrder.getSerialNumber());
boolean judge =false;
if(source==UserTypeUtil.INTERNET_TYPE && internetSerialNumber!=null && xhpcChargeOrder.getStartTime()!=null && xhpcChargeOrder.getEndTime()!=null){
if(source==UserTypeUtil.INTERNET_TYPE && internetSerialNumber!=null && xhpcChargeOrder.getStartTime()!=null && xhpcChargeOrder.getEndTime()!=null && money.compareTo(new BigDecimal(0))>=1){
xhpcHistoryOrder.setChargingMode(xhpcChargeOrder.getUserId()+"");
xhpcHistoryOrder.setInternetSerialNumber(xhpcChargeOrder.getInternetSerialNumber());
Double totalPower = xhpcHistoryOrder.getTotalPower();
@ -806,7 +807,7 @@ public class XhpcRealTimeOrderServiceImpl extends BaseService implements IXhpcRe
}
}
//
if ( !UserTypeUtil.INTERNET_TYPE.equals(source) && xhpcChargeOrder.getStartTime()!=null && xhpcChargeOrder.getEndTime()!=null) {
if ( !UserTypeUtil.INTERNET_TYPE.equals(source) && xhpcChargeOrder.getStartTime()!=null && xhpcChargeOrder.getEndTime()!=null && money.compareTo(new BigDecimal(0))>=1) {
//查询是否有活动
List<XhpcActivityDiscountDto> activityDiscountTime = xhpcRealTimeOrderMapper.getActivityDiscountTime(userId, DateUtil.formatDateTime(startTime), source, xhpcChargeOrder.getChargingStationId(), xhpcChargeOrder.getTenantId());
if(activityDiscountTime !=null && activityDiscountTime.size()>0){