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 2021-12-17 11:03:27 +08:00
parent 8c3545d3cb
commit 83783db947
5 changed files with 45 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderServiceImpl.java
View File

@ -129,6 +129,7 @@ public class XhpcHistoryOrderServiceImpl implements IXhpcHistoryOrderService {
ExcelWriter writer = ExcelUtil.getWriter(true);
writer.addHeaderAlias("historyOrderId", "历史订单ID");
writer.addHeaderAlias("serialNumber", "订单号");
writer.addHeaderAlias("internetSerialNumber", "流量方订单号");
writer.addHeaderAlias("chargingStationName", "电站名称");
writer.addHeaderAlias("pileSerialNumber", "桩编号");
writer.addHeaderAlias("terminalName", "终端名称");
@ -163,7 +164,7 @@ public class XhpcHistoryOrderServiceImpl implements IXhpcHistoryOrderService {
writer.addHeaderAlias("startTime", "开始充电时间");
writer.addHeaderAlias("endTime", "结束充电时间");
writer.addHeaderAlias("updateTime", "结算时间");
writer.addHeaderAlias("sourceName", "订单来源");
writer.addHeaderAlias("internetName", "订单来源");
// writer.addHeaderAlias("plateNum", "电站名称");
// writer.addHeaderAlias("disputeOrderStatus", "桩编号");

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

@ -369,7 +369,7 @@ public class XhpcRealTimeOrderServiceImpl implements IXhpcRealTimeOrderService {
}
//0总金额提成 1服务费提成
if(new BigDecimal(0).compareTo(commissionRate)==-1){
if("0".equals(commissionType) || "1".equals(commissionType)){
if("0".equals(commissionType) || "1".equals(commissionType)|| "2".equals(commissionType)){
//流量方的钱
if("0".equals(commissionType)){
BigDecimal decimal1 = surplusPowerPrice.multiply(commissionRate).setScale(2, BigDecimal.ROUND_DOWN);

3
xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml
View File

@ -834,8 +834,7 @@
</select>
<select id="getStatistisList" resultType="com.xhpc.order.dto.XhpcChargeHistoryOrder">
select
ho.history_order_id as historyOrderId,
select ho.history_order_id as historyOrderId,
ho.power_price_total as powerPriceTotal,
ho.service_price_total as servicePriceTotal,
ho.promotion_discount as promotionDiscount,

10
xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcStationInternetBlacklistController.java
View File

@ -62,4 +62,14 @@ public class XhpcStationInternetBlacklistController extends BaseController {
List<Map<String, Object>> list = iXhpcStationInternetBlacklistService.list(internetUserId);
return getDataTable(list);
}
@GetMapping("/list1")
public TableDataInfo list1(@RequestParam String internetUserId) {
List<Map<String, Object>> list = iXhpcStationInternetBlacklistService.list(internetUserId);
return getDataTable(list);
}
}

1
xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcAppUserServiceImpl.java
View File

@ -324,6 +324,7 @@ public class XhpcAppUserServiceImpl implements IXhpcAppUserUserService {
String userId = StringUtils.valueOf(loginUser.getUserid());
Object version = redisService.getCacheObject("global:version");
Object servicePhone = redisService.getCacheObject("global:phone");
//根据不同的用户类型查询不同的信息
Map<String,Object> result = xhpcAppUserMapper.info(Long.parseLong(userId));
result.put("version",version);
result.put("servicePhone",servicePhone);