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

更新清分模块对运营商ID的判断

Browse Source
This commit is contained in:
panshuling321 2022-04-29 09:26:39 +08:00
parent bc96585170
commit 4ddf07ce51
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcClearingBankController.java
View File

@ -4,6 +4,7 @@ package com.xhpc.activity.controller;
import com.xhpc.activity.domain.XhpcClearingBankDomain; import com.xhpc.activity.domain.XhpcClearingBankDomain;
import com.xhpc.activity.service.XhpcClearingBankService; import com.xhpc.activity.service.XhpcClearingBankService;
import com.xhpc.common.core.domain.R; import com.xhpc.common.core.domain.R;
import com.xhpc.common.core.exception.CustomException;
import com.xhpc.common.core.web.controller.BaseController; import com.xhpc.common.core.web.controller.BaseController;
import com.xhpc.common.core.web.page.TableDataInfo; import com.xhpc.common.core.web.page.TableDataInfo;
import com.xhpc.common.log.annotation.Log; import com.xhpc.common.log.annotation.Log;
@ -33,8 +34,11 @@ public class XhpcClearingBankController extends BaseController {
String status) { String status) {
LoginUser loginUser = logUserUtils.getLogUser(request); LoginUser loginUser = logUserUtils.getLogUser(request);
startPage(); if (loginUser.getSysUser().getOperatorId() == null){
throw new CustomException("请登陆运营商账户再试");
}
startPage();
Map<String, Object> params = new HashMap<>(); Map<String, Object> params = new HashMap<>();
params.put("tenantId", loginUser.getTenantId()); params.put("tenantId", loginUser.getTenantId());
params.put("status", status); params.put("status", status);
@ -70,7 +74,6 @@ public class XhpcClearingBankController extends BaseController {
public R insertDomain(HttpServletRequest request, @RequestBody XhpcClearingBankDomain domain) { public R insertDomain(HttpServletRequest request, @RequestBody XhpcClearingBankDomain domain) {
LoginUser loginUser = logUserUtils.getLogUser(request); LoginUser loginUser = logUserUtils.getLogUser(request);
if(domain.getOperatorId() == null){ if(domain.getOperatorId() == null){
domain.setOperatorId(loginUser.getSysUser().getOperatorId()); domain.setOperatorId(loginUser.getSysUser().getOperatorId());
} }

5
xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcClearingHistoryOrderController.java
View File

@ -42,10 +42,11 @@ public class XhpcClearingHistoryOrderController extends BaseController {
String operatorId, String operatorId,
String stationId) { String stationId) {
LoginUser loginUser = logUserUtils.getLogUser(request); LoginUser loginUser = logUserUtils.getLogUser(request);
startPage(); if(StringUtils.isEmpty(operatorId) && loginUser.getSysUser().getOperatorId() !=null){
if(StringUtils.isEmpty(operatorId)){
operatorId = loginUser.getSysUser().getOperatorId().toString(); operatorId = loginUser.getSysUser().getOperatorId().toString();
} }
startPage();
Map<String, Object> params = new HashMap<>(); Map<String, Object> params = new HashMap<>();
params.put("tenantId", loginUser.getTenantId()); params.put("tenantId", loginUser.getTenantId());
params.put("startTime", startTime); params.put("startTime", startTime);

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

@ -95,7 +95,7 @@
<select id="selectCashAmount" resultType="map"> <select id="selectCashAmount" resultType="map">
select select
ifnull(sum(ho.total_price), 0) as amount, ifnull(sum(ho.act_power_price + ho.act_service_price), 0) as amount,
group_concat(clearing_order_id) as clearingOrderIds group_concat(clearing_order_id) as clearingOrderIds
from xhpc_clearing_history_order as ho from xhpc_clearing_history_order as ho
where ho.check_status=2 and ho.del_flag=0 and ho.clearing_checkout_id is null and ho.operator_id=#{operatorId} where ho.check_status=2 and ho.del_flag=0 and ho.clearing_checkout_id is null and ho.operator_id=#{operatorId}