diff --git a/ruoyi-modules/ruoyi-job/src/main/resources/mapper/job/MapperUpdate.xml b/ruoyi-modules/ruoyi-job/src/main/resources/mapper/job/MapperUpdate.xml deleted file mode 100644 index a0b0ce88..00000000 --- a/ruoyi-modules/ruoyi-job/src/main/resources/mapper/job/MapperUpdate.xml +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - select job_id, job_name, job_group, invoke_target, cron_expression, misfire_policy, concurrent, status, create_by, create_time, remark - from sys_job - - - - - - - - - - delete from sys_job where job_id = #{jobId} - - - - delete from sys_job where job_id in - - #{jobId} - - - - - update sys_job - - job_name = #{jobName}, - job_group = #{jobGroup}, - invoke_target = #{invokeTarget}, - cron_expression = #{cronExpression}, - misfire_policy = #{misfirePolicy}, - concurrent = #{concurrent}, - status = #{status}, - remark = #{remark}, - update_by = #{updateBy}, - update_time = sysdate() - - where job_id = #{jobId} - - - - insert into sys_job( - job_id, - job_name, - job_group, - invoke_target, - cron_expression, - misfire_policy, - concurrent, - status, - remark, - create_by, - create_time - )values( - #{jobId}, - #{jobName}, - #{jobGroup}, - #{invokeTarget}, - #{cronExpression}, - #{misfirePolicy}, - #{concurrent}, - #{status}, - #{remark}, - #{createBy}, - sysdate() - ) - - - \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java index 3a706b55..d5357950 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java @@ -55,7 +55,6 @@ public class SysUserController extends BaseController { @PreAuthorize(hasPermi = "system:user:list") @GetMapping("/list") public TableDataInfo list(SysUser user) { - Long userId = SecurityUtils.getUserId(); startPage(); List list = userService.selectUserList(user); return getDataTable(list); diff --git a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcRateMapper.xml b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcRateMapper.xml deleted file mode 100644 index 51ce7eda..00000000 --- a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcRateMapper.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/xhpc-modules/xhpc-general/src/main/resources/mapper/MapperUpdate.xml b/xhpc-modules/xhpc-general/src/main/resources/mapper/MapperUpdate.xml deleted file mode 100644 index 3fc9c5a9..00000000 --- a/xhpc-modules/xhpc-general/src/main/resources/mapper/MapperUpdate.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderReconciliationStatusController.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderReconciliationStatusController.java index c609a62e..d44c9729 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderReconciliationStatusController.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderReconciliationStatusController.java @@ -2,14 +2,15 @@ package com.xhpc.order.controller; import com.ruoyi.common.core.web.controller.BaseController; import com.ruoyi.common.core.web.domain.AjaxResult; -import com.xhpc.order.domain.XhpcHistoryOrderReconciliationStatus; +import com.ruoyi.common.core.web.page.TableDataInfo; import com.xhpc.order.service.IXhpcHistoryOrderReconciliationStatusService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.validation.Valid; +import java.util.List; +import java.util.Map; @RestController @RequestMapping("/order/reconciliation") @@ -22,24 +23,45 @@ public class XhpcHistoryOrderReconciliationStatusController extends BaseControll /** * 修改对账状态 * - * @param xhpcHistoryOrderReconciliationStatus 历史订单对账状态信息 + * @param historyOrderIds + * @param status + * @param remark * @return */ - @GetMapping("/status") + @PostMapping("/status") @ApiOperation(value = "修改对账状态") - public AjaxResult status(@Valid @RequestBody XhpcHistoryOrderReconciliationStatus xhpcHistoryOrderReconciliationStatus) { - return iXhpcHistoryOrderReconciliationStatusService.status(xhpcHistoryOrderReconciliationStatus); + public AjaxResult status(@RequestParam String historyOrderIds, @RequestParam Integer status, @RequestParam String remark) { + return iXhpcHistoryOrderReconciliationStatusService.status(historyOrderIds, status, remark); } /** * 流量用户信息 * - * @param internetUserId 流量用户id + * @param userId 用户id * @return */ @GetMapping("/internetUser") @ApiOperation(value = "修改对账状态") - public AjaxResult internetUser(@RequestParam Long internetUserId) { - return iXhpcHistoryOrderReconciliationStatusService.internetUser(internetUserId); + public AjaxResult internetUser(@RequestParam Long userId) { + return iXhpcHistoryOrderReconciliationStatusService.internetUser(userId); + } + + /** + * 流量用户对账分页列表 + * + * @param userId 用户id + * @param serialNumber 订单编号 + * @param createTimeStart 创建开始时间 + * @param createTimeEnd 创建结束时间 + * @param chargingStationName 电站名称 + * @param status 状态 + * @return + */ + @GetMapping("/page") + @ApiOperation(value = "流量用户对账分页列表") + public TableDataInfo page(@RequestParam Long userId, String serialNumber, String createTimeStart, String createTimeEnd, String chargingStationName, String status) { + startPage(); + List> list = iXhpcHistoryOrderReconciliationStatusService.page(userId, serialNumber, createTimeStart, createTimeEnd, chargingStationName, status); + return getDataTable(list); } } diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderSortingStatusController.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderSortingStatusController.java index 1c4c27c0..2d475f28 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderSortingStatusController.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderSortingStatusController.java @@ -2,17 +2,15 @@ package com.xhpc.order.controller; import com.ruoyi.common.core.web.controller.BaseController; import com.ruoyi.common.core.web.domain.AjaxResult; -import com.xhpc.order.domain.XhpcHistoryOrderSortingStatus; +import com.ruoyi.common.core.web.page.TableDataInfo; import com.xhpc.order.service.IXhpcHistoryOrderSortingStatusService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; -import javax.validation.Valid; +import java.util.List; +import java.util.Map; @RestController @RequestMapping("/order/sorting") @@ -22,15 +20,49 @@ public class XhpcHistoryOrderSortingStatusController extends BaseController { @Autowired private IXhpcHistoryOrderSortingStatusService iXhpcHistoryOrderSortingStatusService; + /** * 修改清分状态 * - * @param xhpcHistoryOrderSortingStatus 历史订单清分状态信息 + * @param historyOrderIds + * @param status + * @param remark * @return */ - @GetMapping("/status") + @PostMapping("/status") @ApiOperation(value = "修改清分状态") - public AjaxResult status(@Valid @RequestBody XhpcHistoryOrderSortingStatus xhpcHistoryOrderSortingStatus) { - return iXhpcHistoryOrderSortingStatusService.status(xhpcHistoryOrderSortingStatus); + public AjaxResult status(@RequestParam String historyOrderIds, @RequestParam Integer status, @RequestParam String remark) { + return iXhpcHistoryOrderSortingStatusService.status(historyOrderIds, status, remark); + } + + /** + * 运营商用户信息 + * + * @param userId 用户id + * @return + */ + @GetMapping("/operatorUser") + @ApiOperation(value = "运营商用户信息") + public AjaxResult operatorUser(@RequestParam Long userId) { + return iXhpcHistoryOrderSortingStatusService.operatorUser(userId); + } + + /** + * 运营商清分分页列表 + * + * @param userId 用户id + * @param serialNumber 订单编号 + * @param createTimeStart 创建开始时间 + * @param createTimeEnd 创建结束时间 + * @param chargingStationName 电站名称 + * @param status 状态 + * @return + */ + @GetMapping("/page") + @ApiOperation(value = "运营商清分分页列表") + public TableDataInfo page(@RequestParam Long userId, String serialNumber, String createTimeStart, String createTimeEnd, String chargingStationName, String status) { + startPage(); + List> list = iXhpcHistoryOrderSortingStatusService.page(userId, serialNumber, createTimeStart, createTimeEnd, chargingStationName, status); + return getDataTable(list); } } diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcHistoryOrderMapper.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcHistoryOrderMapper.java index 30795dc7..84c00ef7 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcHistoryOrderMapper.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcHistoryOrderMapper.java @@ -33,4 +33,20 @@ public interface XhpcHistoryOrderMapper { * @return 结果 */ public XhpcHistoryOrder info(@Param("historyOrderId") Long historyOrderId); + + /** + * 更新对账状态 历史订单信息 + * + * @param xhpcHistoryOrderIds 历史订单信息 + * @return 结果 + */ + public int updateReconciliation(String[] xhpcHistoryOrderIds); + + /** + * 更新清分状态 历史订单信息 + * + * @param xhpcHistoryOrderIds 历史订单信息 + * @return 结果 + */ + public int updateSorting(String[] xhpcHistoryOrderIds); } diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcHistoryOrderReconciliationStatusMapper.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcHistoryOrderReconciliationStatusMapper.java index 983044d3..4ef911c6 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcHistoryOrderReconciliationStatusMapper.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcHistoryOrderReconciliationStatusMapper.java @@ -21,33 +21,28 @@ public interface XhpcHistoryOrderReconciliationStatusMapper { */ public int insert(XhpcHistoryOrderReconciliationStatus xhpcHistoryOrderReconciliationStatus); - /** - * 更新 历史订单对账状态信息 - * - * @param xhpcHistoryOrderReconciliationStatus 历史订单对账状态信息 - * @return 结果 - */ - public int update(XhpcHistoryOrderReconciliationStatus xhpcHistoryOrderReconciliationStatus); - /** * 流量用户信息 - * - * @param internetUserId 流量用户id - * @return 结果 + * @param userId + * @param operatorId + * @param chargingStation + * @return */ - public Map internetUser(@Param("internetUserId") Long internetUserId); + public Map internetUser(@Param("userId") Long userId, @Param("operatorId") String operatorId, @Param("chargingStation") String chargingStation); /** * 流量用户对账分页列表 * - * @param internetUserId 流量用户id + * @param userId 流量用户id * @param serialNumber 订单编号 * @param createTimeStart 创建开始时间 * @param createTimeEnd 创建结束时间 * @param chargingStationName 电站名称 * @param status 状态 - * @return + * @param operatorId 运营商id + * @param status 状态 + * @return chargingStation 电站 */ - public List> page(@Param("internetUserId") Long internetUserId, @Param("serialNumber") String serialNumber, @Param("createTimeStart") String createTimeStart, @Param("createTimeEnd") String createTimeEnd, @Param("chargingStationName") String chargingStationName, @Param("status") String status); + public List> page(@Param("userId") Long userId, @Param("serialNumber") String serialNumber, @Param("createTimeStart") String createTimeStart, @Param("createTimeEnd") String createTimeEnd, @Param("chargingStationName") String chargingStationName, @Param("status") String status, @Param("operatorId") String operatorId, @Param("chargingStation") String chargingStation); } diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcHistoryOrderSortingStatusMapper.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcHistoryOrderSortingStatusMapper.java index d9382ac5..18d74f99 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcHistoryOrderSortingStatusMapper.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcHistoryOrderSortingStatusMapper.java @@ -1,6 +1,10 @@ package com.xhpc.order.mapper; import com.xhpc.order.domain.XhpcHistoryOrderSortingStatus; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; /** * 历史订单对账状态信息 数据层 @@ -24,4 +28,30 @@ public interface XhpcHistoryOrderSortingStatusMapper { * @return 结果 */ public int update(XhpcHistoryOrderSortingStatus xhpcHistoryOrderSortingStatus); + + /** + * 运营商用户信息 + * + * @param userId + * @param operatorId + * @param chargingStation + * @return 结果 + */ + public Map operatorUser(@Param("userId") Long userId, @Param("operatorId") String operatorId, @Param("chargingStation") String chargingStation); + + /** + * 运营商清分分页列表 + * + * @param userId 用户id + * @param serialNumber 订单编号 + * @param createTimeStart 创建开始时间 + * @param createTimeEnd 创建结束时间 + * @param chargingStationName 电站名称 + * @param status 状态 + * @param operatorId 运营商id + * @param status 状态 + * @param chargingStation 电站 + * @return 结果 + */ + public List> page(@Param("userId") Long userId, @Param("serialNumber") String serialNumber, @Param("createTimeStart") String createTimeStart, @Param("createTimeEnd") String createTimeEnd, @Param("chargingStationName") String chargingStationName, @Param("status") String status, @Param("operatorId") String operatorId, @Param("chargingStation") String chargingStation); } diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcHistoryOrderReconciliationStatusService.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcHistoryOrderReconciliationStatusService.java index 2b9627b9..f108538b 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcHistoryOrderReconciliationStatusService.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcHistoryOrderReconciliationStatusService.java @@ -3,6 +3,9 @@ package com.xhpc.order.service; import com.ruoyi.common.core.web.domain.AjaxResult; import com.xhpc.order.domain.XhpcHistoryOrderReconciliationStatus; +import java.util.List; +import java.util.Map; + /** * 历史订单对账状态信息 服务层 * @@ -19,16 +22,31 @@ public interface IXhpcHistoryOrderReconciliationStatusService { /** * 修改对账状态 历史订单对账状态 - * - * @param xhpcHistoryOrderReconciliationStatus 历史订单对账状态信息 + * @param historyOrderIds 历史订单id集合 + * @param status 状态 + * @param remark 备注 + * @return */ - public AjaxResult status(XhpcHistoryOrderReconciliationStatus xhpcHistoryOrderReconciliationStatus); + public AjaxResult status(String historyOrderIds, Integer status, String remark); /** * 流量用户信息 * - * @param internetUserId 流量用户id + * @param userId 用户id * @return */ - public AjaxResult internetUser(Long internetUserId); + public AjaxResult internetUser(Long userId); + + /** + * 流量用户对账分页列表 + * + * @param userId 用户id + * @param serialNumber 订单编号 + * @param createTimeStart 创建开始时间 + * @param createTimeEnd 创建结束时间 + * @param chargingStationName 电站名称 + * @param status 状态 + * @return + */ + public List> page(Long userId, String serialNumber, String createTimeStart, String createTimeEnd, String chargingStationName, String status); } \ No newline at end of file diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcHistoryOrderSortingStatusService.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcHistoryOrderSortingStatusService.java index e00de1eb..fea18089 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcHistoryOrderSortingStatusService.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcHistoryOrderSortingStatusService.java @@ -3,6 +3,9 @@ package com.xhpc.order.service; import com.ruoyi.common.core.web.domain.AjaxResult; import com.xhpc.order.domain.XhpcHistoryOrderSortingStatus; +import java.util.List; +import java.util.Map; + /** * 历史订单对账状态信息 服务层 * @@ -18,9 +21,33 @@ public interface IXhpcHistoryOrderSortingStatusService { public int insert(XhpcHistoryOrderSortingStatus xhpcHistoryOrderSortingStatus); /** - * 修改对账状态 历史订单对账状态 + * 修改清分状态 * - * @param xhpcHistoryOrderSortingStatus 历史订单清分状态信息 + * @param historyOrderIds + * @param status + * @param remark + * @return */ - public AjaxResult status(XhpcHistoryOrderSortingStatus xhpcHistoryOrderSortingStatus); + public AjaxResult status(String historyOrderIds, Integer status, String remark); + + /** + * 运营商用户信息 + * @param userId + * @return 结果 + */ + public AjaxResult operatorUser(Long userId); + + /** + * 运营商清分分页列表 + * + * @param userId 用户id + * @param serialNumber 订单编号 + * @param createTimeStart 创建开始时间 + * @param createTimeEnd 创建结束时间 + * @param chargingStationName 电站名称 + * @param status 状态 + * @param status 状态 + * @return 结果 + */ + public List> page(Long userId, String serialNumber, String createTimeStart, String createTimeEnd, String chargingStationName, String status); } \ No newline at end of file diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderReconciliationStatusServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderReconciliationStatusServiceImpl.java index 67c8e25e..ffd4766a 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderReconciliationStatusServiceImpl.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderReconciliationStatusServiceImpl.java @@ -1,6 +1,8 @@ package com.xhpc.order.service.impl; +import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.common.redis.service.RedisService; import com.xhpc.order.domain.XhpcHistoryOrder; import com.xhpc.order.domain.XhpcHistoryOrderReconciliationStatus; import com.xhpc.order.mapper.XhpcHistoryOrderMapper; @@ -9,6 +11,9 @@ import com.xhpc.order.service.IXhpcHistoryOrderReconciliationStatusService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Map; + /** * 历史订单对账状态信息 服务层 * @@ -23,6 +28,9 @@ public class XhpcHistoryOrderReconciliationStatusServiceImpl implements IXhpcHis @Autowired private XhpcHistoryOrderMapper xhpcHistoryOrderMapper; + @Autowired + private RedisService redisService; + /** * 新增 历史订单对账状态 * @@ -34,42 +42,89 @@ public class XhpcHistoryOrderReconciliationStatusServiceImpl implements IXhpcHis } /** - * 修改对账状态 历史订单对账状态 + * 修改对账状态 历史订单对账状态 * - * @param xhpcHistoryOrderReconciliationStatus 历史订单对账状态信息 + * @param historyOrderIds 历史订单id集合 + * @param status 状态 + * @param remark 备注 + * @return */ @Override - public AjaxResult status(XhpcHistoryOrderReconciliationStatus xhpcHistoryOrderReconciliationStatus) { - XhpcHistoryOrder xhpcHistoryOrder = xhpcHistoryOrderMapper.info(xhpcHistoryOrderReconciliationStatus.getHistoryOrderId()); - if (0 == xhpcHistoryOrderReconciliationStatus.getStatus()) { - if (3 != xhpcHistoryOrder.getReconciliationStatus()) { - return AjaxResult.error("状态异常"); - } - } else if (1 == xhpcHistoryOrderReconciliationStatus.getStatus()) { - if (0 != xhpcHistoryOrder.getReconciliationStatus()) { - return AjaxResult.error("状态异常"); - } - } else if (2 == xhpcHistoryOrderReconciliationStatus.getStatus()) { - if (0 != xhpcHistoryOrder.getReconciliationStatus()) { - return AjaxResult.error("状态异常"); - } - } else if (3 == xhpcHistoryOrderReconciliationStatus.getStatus()) { - if (2 != xhpcHistoryOrder.getReconciliationStatus()) { - return AjaxResult.error("状态异常"); + public AjaxResult status(String historyOrderIds, Integer status, String remark) { + for (String historyOrderId : historyOrderIds.split(",")) { + XhpcHistoryOrder xhpcHistoryOrder = xhpcHistoryOrderMapper.info(Long.parseLong(historyOrderId)); + if ("0".equals(status)) { + if (3 != xhpcHistoryOrder.getReconciliationStatus()) { + return AjaxResult.error("状态异常"); + } + } else if ("1".equals(status)) { + if (0 != xhpcHistoryOrder.getReconciliationStatus()) { + return AjaxResult.error("状态异常"); + } + } else if ("2".equals(status)) { + if (0 != xhpcHistoryOrder.getReconciliationStatus()) { + return AjaxResult.error("状态异常"); + } + } else if ("3".equals(status)) { + if (2 != xhpcHistoryOrder.getReconciliationStatus()) { + return AjaxResult.error("状态异常"); + } } + XhpcHistoryOrderReconciliationStatus xhpcHistoryOrderReconciliationStatus = new XhpcHistoryOrderReconciliationStatus(); + xhpcHistoryOrderReconciliationStatus.setHistoryOrderId(Long.parseLong(historyOrderId)); + xhpcHistoryOrderReconciliationStatus.setStatus(status); + xhpcHistoryOrderReconciliationStatus.setRemark(remark); + xhpcHistoryOrderReconciliationStatusMapper.insert(xhpcHistoryOrderReconciliationStatus); } - xhpcHistoryOrderReconciliationStatusMapper.update(xhpcHistoryOrderReconciliationStatus); + xhpcHistoryOrderMapper.updateReconciliation(historyOrderIds.split(",")); return AjaxResult.success(); } /** * 流量用户信息 * - * @param internetUserId 流量用户id + * @param userId 用户id * @return */ @Override - public AjaxResult internetUser(Long internetUserId) { - return AjaxResult.success(xhpcHistoryOrderReconciliationStatusMapper.internetUser(internetUserId)); + public AjaxResult internetUser(Long userId) { + Map map = redisService.getCacheMap(userId + ":privilege"); + if (null != map) { + String privilege = StringUtils.valueOf(map.get("privilege")); + if ("1".equals(privilege)) { + String operatorId = StringUtils.valueOf(map.get("operatorId")); + return AjaxResult.success(xhpcHistoryOrderReconciliationStatusMapper.internetUser(userId, operatorId, null)); + } else if ("2".equals(privilege)) { + return AjaxResult.success(xhpcHistoryOrderReconciliationStatusMapper.internetUser(userId, null, "privilege")); + } + } + return AjaxResult.success(xhpcHistoryOrderReconciliationStatusMapper.internetUser(userId, null, null)); + } + + + /** + * 流量用户对账分页列表 + * + * @param userId 流量用户id + * @param serialNumber 订单编号 + * @param createTimeStart 创建开始时间 + * @param createTimeEnd 创建结束时间 + * @param chargingStationName 电站名称 + * @param status 状态 + * @return + */ + @Override + public List> page(Long userId, String serialNumber, String createTimeStart, String createTimeEnd, String chargingStationName, String status) { + Map map = redisService.getCacheMap(userId + ":privilege"); + if (null != map) { + String privilege = StringUtils.valueOf(map.get("privilege")); + if ("1".equals(privilege)) { + String operatorId = StringUtils.valueOf(map.get("operatorId")); + return xhpcHistoryOrderReconciliationStatusMapper.page(userId, serialNumber, createTimeStart, createTimeEnd, chargingStationName, status, operatorId, null); + } else if ("2".equals(privilege)) { + return xhpcHistoryOrderReconciliationStatusMapper.page(userId, serialNumber, createTimeStart, createTimeEnd, chargingStationName, status, null, "privilege"); + } + } + return xhpcHistoryOrderReconciliationStatusMapper.page(userId, serialNumber, createTimeStart, createTimeEnd, chargingStationName, status, null, null); } } \ No newline at end of file diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderSortingStatusServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderSortingStatusServiceImpl.java index b09bae89..2ab3afc6 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderSortingStatusServiceImpl.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderSortingStatusServiceImpl.java @@ -1,6 +1,8 @@ package com.xhpc.order.service.impl; +import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.common.redis.service.RedisService; import com.xhpc.order.domain.XhpcHistoryOrder; import com.xhpc.order.domain.XhpcHistoryOrderSortingStatus; import com.xhpc.order.mapper.XhpcHistoryOrderMapper; @@ -9,6 +11,9 @@ import com.xhpc.order.service.IXhpcHistoryOrderSortingStatusService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Map; + /** * 历史订单清分状态信息 服务层 * @@ -23,6 +28,9 @@ public class XhpcHistoryOrderSortingStatusServiceImpl implements IXhpcHistoryOrd @Autowired private XhpcHistoryOrderMapper xhpcHistoryOrderMapper; + @Autowired + private RedisService redisService; + /** * 新增 历史订单清分状态 * @@ -34,31 +42,90 @@ public class XhpcHistoryOrderSortingStatusServiceImpl implements IXhpcHistoryOrd } /** - * 修改对账状态 历史订单清分状态 + * 修改清分状态 * - * @param xhpcHistoryOrderSortingStatus 历史订单清分状态信息 + * @param historyOrderIds + * @param status + * @param remark + * @return */ @Override - public AjaxResult status(XhpcHistoryOrderSortingStatus xhpcHistoryOrderSortingStatus) { - XhpcHistoryOrder xhpcHistoryOrder = xhpcHistoryOrderMapper.info(xhpcHistoryOrderSortingStatus.getHistoryOrderId()); - if (1 == xhpcHistoryOrderSortingStatus.getStatus()) { - if (4 != xhpcHistoryOrder.getReconciliationStatus()) { - return AjaxResult.error("状态异常"); - } - } else if (2 == xhpcHistoryOrderSortingStatus.getStatus()) { - if (1 != xhpcHistoryOrder.getReconciliationStatus()) { - return AjaxResult.error("状态异常"); - } - } else if (3 == xhpcHistoryOrderSortingStatus.getStatus()) { - if (1 != xhpcHistoryOrder.getReconciliationStatus()) { - return AjaxResult.error("状态异常"); - } - } else if (4 == xhpcHistoryOrderSortingStatus.getStatus()) { - if (3 != xhpcHistoryOrder.getReconciliationStatus()) { - return AjaxResult.error("状态异常"); + public AjaxResult status(String historyOrderIds, Integer status, String remark) { + for (String historyOrderId : historyOrderIds.split(",")) { + XhpcHistoryOrder xhpcHistoryOrder = xhpcHistoryOrderMapper.info(Long.parseLong(historyOrderId)); + if ("1".equals(status)) { + if (4 != xhpcHistoryOrder.getReconciliationStatus()) { + return AjaxResult.error("状态异常"); + } + } else if ("2".equals(status)) { + if (1 != xhpcHistoryOrder.getReconciliationStatus()) { + return AjaxResult.error("状态异常"); + } + } else if ("3".equals(status)) { + if (1 != xhpcHistoryOrder.getReconciliationStatus()) { + return AjaxResult.error("状态异常"); + } + } else if ("4".equals(status)) { + if (3 != xhpcHistoryOrder.getReconciliationStatus()) { + return AjaxResult.error("状态异常"); + } } + XhpcHistoryOrderSortingStatus xhpcHistoryOrderSortingStatus = new XhpcHistoryOrderSortingStatus(); + xhpcHistoryOrderSortingStatus.setHistoryOrderId(Long.parseLong(historyOrderId)); + xhpcHistoryOrderSortingStatus.setStatus(status); + xhpcHistoryOrderSortingStatus.setRemark(remark); + xhpcHistoryOrderSortingStatusMapper.insert(xhpcHistoryOrderSortingStatus); } - xhpcHistoryOrderSortingStatusMapper.update(xhpcHistoryOrderSortingStatus); + xhpcHistoryOrderMapper.updateSorting(historyOrderIds.split(",")); return AjaxResult.success(); } + + /** + * 运营商用户信息 + * + * @param userId + * @return 结果 + */ + @Override + public AjaxResult operatorUser(Long userId) { + Map map = redisService.getCacheMap(userId + ":privilege"); + if (null != map) { + String privilege = StringUtils.valueOf(map.get("privilege")); + if ("1".equals(privilege)) { + String operatorId = StringUtils.valueOf(map.get("operatorId")); + return AjaxResult.success(xhpcHistoryOrderSortingStatusMapper.operatorUser(userId, operatorId, null)); + } else if ("2".equals(privilege)) { + return AjaxResult.success(xhpcHistoryOrderSortingStatusMapper.operatorUser(userId, null, "privilege")); + } + } + return AjaxResult.success(xhpcHistoryOrderSortingStatusMapper.operatorUser(userId, null, null)); + } + + + /** + * 运营商清分分页列表 + * + * @param userId 用户id + * @param serialNumber 订单编号 + * @param createTimeStart 创建开始时间 + * @param createTimeEnd 创建结束时间 + * @param chargingStationName 电站名称 + * @param status 状态 + * @param status 状态 + * @return 结果 + */ + @Override + public List> page(Long userId, String serialNumber, String createTimeStart, String createTimeEnd, String chargingStationName, String status) { + Map map = redisService.getCacheMap(userId + ":privilege"); + if (null != map) { + String privilege = StringUtils.valueOf(map.get("privilege")); + if ("1".equals(privilege)) { + String operatorId = StringUtils.valueOf(map.get("operatorId")); + return xhpcHistoryOrderSortingStatusMapper.page(userId, serialNumber, createTimeStart, createTimeEnd, chargingStationName, status, operatorId, null); + } else if ("2".equals(privilege)) { + return xhpcHistoryOrderSortingStatusMapper.page(userId, serialNumber, createTimeStart, createTimeEnd, chargingStationName, status, null, "privilege"); + } + } + return xhpcHistoryOrderSortingStatusMapper.page(userId, serialNumber, createTimeStart, createTimeEnd, chargingStationName, status, null, null); + } } \ No newline at end of file diff --git a/xhpc-modules/xhpc-order/src/main/resources/bootstrap.yml b/xhpc-modules/xhpc-order/src/main/resources/bootstrap.yml index 75f094b9..f9c2eaf4 100644 --- a/xhpc-modules/xhpc-order/src/main/resources/bootstrap.yml +++ b/xhpc-modules/xhpc-order/src/main/resources/bootstrap.yml @@ -18,10 +18,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 118.24.137.203:8848 + server-addr: 127.0.0.1:8848 config: # 配置中心地址 - server-addr: 118.24.137.203:8848 + server-addr: 127.0.0.1:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/xhpc-modules/xhpc-order/src/main/resources/logback.xml b/xhpc-modules/xhpc-order/src/main/resources/logback.xml index 83ed4f2d..4e0f1747 100644 --- a/xhpc-modules/xhpc-order/src/main/resources/logback.xml +++ b/xhpc-modules/xhpc-order/src/main/resources/logback.xml @@ -67,7 +67,7 @@ - + diff --git a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml index 0bfdf49f..5e0c4385 100644 --- a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml +++ b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml @@ -280,4 +280,18 @@ from xhpc_history_order xho where xho.del_flag = 0 and xho.history_order_id = #{historyOrderId} + + + update xhpc_history_order set reconciliation_status = #{status} where history_order_id in + + #{xhpcHistoryOrderId} + + + + + update xhpc_history_order set sorting_status = #{status} where history_order_id in + + #{xhpcHistoryOrderId} + + \ No newline at end of file diff --git a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderReconciliationStatusMapper.xml b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderReconciliationStatusMapper.xml index c5cc7a54..76afff39 100644 --- a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderReconciliationStatusMapper.xml +++ b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderReconciliationStatusMapper.xml @@ -74,48 +74,67 @@ - - UPDATE xhpc_history_order_reconciliation_status - - history_order_id = #{historyOrderId}, - status = #{status}, - del_flag = #{delFlag}, - create_time = #{createTime}, - create_by = #{createBy}, - update_time = #{updateTime}, - update_by = #{updateBy}, - remark = #{remark} - - WHERE history_order_reconciliation_status_id = #{historyOrderReconciliationStatusId} - - - - + + \ No newline at end of file diff --git a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderSortingStatusMapper.xml b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderSortingStatusMapper.xml index 7e0f63af..f159da78 100644 --- a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderSortingStatusMapper.xml +++ b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderSortingStatusMapper.xml @@ -88,4 +88,106 @@ WHERE history_order_sorting_status_id = #{historyOrderSortingStatusId} + + + \ No newline at end of file diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcInternetUserController.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcInternetUserController.java index 706ad326..0d754cf9 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcInternetUserController.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcInternetUserController.java @@ -10,6 +10,7 @@ import com.ruoyi.system.api.domain.SysUser; import com.xhpc.user.domain.XhpcInternetUser; import com.xhpc.user.openfeign.RemoteSystemService; import com.xhpc.user.service.IXhpcInternetUserService; +import com.xhpc.user.service.IXhpcUserService; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -33,6 +34,8 @@ public class XhpcInternetUserController extends BaseController { @Autowired private RemoteSystemService remoteSystemService; + @Autowired + private IXhpcUserService iXhpcUserService; /** * 新增流量用户 @@ -55,7 +58,14 @@ public class XhpcInternetUserController extends BaseController { if (null != ajaxResult && !"200".equals(StringUtils.valueOf(ajaxResult.get("code")))) { return ajaxResult; } - return toAjax(iXhpcInternetUserService.insert(xhpcInternetUser)); + SysUser sysUser1 = iXhpcUserService.selectUserByUserName(sysUser.getUserName()); + iXhpcInternetUserService.insert(xhpcInternetUser); + sysUser1.setInternetUserId(xhpcInternetUser.getInternetUserId()); + ajaxResult = remoteSystemService.editUser(sysUser1); + if (null != ajaxResult && !"200".equals(StringUtils.valueOf(ajaxResult.get("code")))) { + return ajaxResult; + } + return AjaxResult.success(); } /** @@ -111,9 +121,9 @@ public class XhpcInternetUserController extends BaseController { */ //@PreAuthorize(hasPermi = "system:internet:page") @GetMapping("/page") - public TableDataInfo page(String name, String contactName, String contactPhone) { + public TableDataInfo page(String name, String contactName, String contactPhone, String createTimeStart, String createTimeEnd) { startPage(); - List> list = iXhpcInternetUserService.selectInternetList(name, contactName, contactPhone); + List> list = iXhpcInternetUserService.selectInternetList(name, contactName, contactPhone, createTimeStart, createTimeEnd); return getDataTable(list); } diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcOperatorController.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcOperatorController.java index 178d9f18..a4855745 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcOperatorController.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcOperatorController.java @@ -11,6 +11,7 @@ import com.ruoyi.system.api.domain.SysUser; import com.xhpc.user.domain.XhpcOperator; import com.xhpc.user.openfeign.RemoteSystemService; import com.xhpc.user.service.IXhpcOperatorService; +import com.xhpc.user.service.IXhpcUserService; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -34,6 +35,9 @@ public class XhpcOperatorController extends BaseController { @Autowired private RemoteSystemService remoteSystemService; + @Autowired + private IXhpcUserService iXhpcUserService; + /** * 新增运营商 */ @@ -62,7 +66,14 @@ public class XhpcOperatorController extends BaseController { if (UserConstants.NOT_UNIQUE.equals(iXhpcOperatorService.checkAccountUnique(xhpcOperator))) { return AjaxResult.error("用户'" + xhpcOperator.getPhone() + "'失败，登录账号已存在"); } - return toAjax(iXhpcOperatorService.insert(xhpcOperator)); + iXhpcOperatorService.insert(xhpcOperator); + SysUser sysUser1 = iXhpcUserService.selectUserByUserName(sysUser.getUserName()); + sysUser1.setOperatorId(xhpcOperator.getOperatorId()); + ajaxResult = remoteSystemService.editUser(sysUser1); + if (null != ajaxResult && !"200".equals(StringUtils.valueOf(ajaxResult.get("code")))) { + return ajaxResult; + } + return AjaxResult.success(); } /** @@ -122,9 +133,9 @@ public class XhpcOperatorController extends BaseController { */ //@PreAuthorize(hasPermi = "system:operator:page") @GetMapping("/page") - public TableDataInfo page(String name, String contactName, String contactPhone) { + public TableDataInfo page(String name, String contactName, String contactPhone, String createTimeStart, String createTimeEnd) { startPage(); - List> list = iXhpcOperatorService.selectOperatorList(name, contactName, contactPhone); + List> list = iXhpcOperatorService.selectOperatorList(name, contactName, contactPhone, createTimeStart, createTimeEnd); return getDataTable(list); } diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/XhpcOperator.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/XhpcOperator.java index e7f3219e..83109f16 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/XhpcOperator.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/XhpcOperator.java @@ -51,6 +51,18 @@ public class XhpcOperator extends BaseEntity { @NotNull(message = "运营商属性不能为空") private Integer attribute; + /** + * 开户行 + */ + @NotBlank(message = "开户行不能为空") + private String openBank; + + /** + * 卡号 + */ + @NotNull(message = "卡号不能为空") + private Long cardNumber; + /** * 地址code */ @@ -279,4 +291,20 @@ public class XhpcOperator extends BaseEntity { public void setDelFlag(Integer delFlag) { this.delFlag = delFlag; } + + public String getOpenBank() { + return openBank; + } + + public void setOpenBank(String openBank) { + this.openBank = openBank; + } + + public Long getCardNumber() { + return cardNumber; + } + + public void setCardNumber(Long cardNumber) { + this.cardNumber = cardNumber; + } } \ No newline at end of file diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcInternetUserMapper.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcInternetUserMapper.java index c7f2103f..9c099e84 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcInternetUserMapper.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcInternetUserMapper.java @@ -55,7 +55,7 @@ public interface XhpcInternetUserMapper { * @param contactPhone 联系人电话 * @return 结果 */ - public List> selectInternetList(@Param("name") String name, @Param("contactName") String contactName, @Param("contactPhone") String contactPhone); + public List> selectInternetList(@Param("name") String name, @Param("contactName") String contactName, @Param("contactPhone") String contactPhone, @Param("createTimeStart") String createTimeStart, @Param("createTimeEnd") String createTimeEnd); /** * 通过流量用户ID查询用户 diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcOperatorMapper.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcOperatorMapper.java index 6898ab54..aa7af4f8 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcOperatorMapper.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcOperatorMapper.java @@ -62,7 +62,7 @@ public interface XhpcOperatorMapper { * @param contactPhone 联系人电话 * @return 结果 */ - public List> selectOperatorList(@Param("name") String name, @Param("contactName") String contactName, @Param("contactPhone") String contactPhone); + public List> selectOperatorList(@Param("name") String name, @Param("contactName") String contactName, @Param("contactPhone") String contactPhone, @Param("createTimeStart") String createTimeStart, @Param("createTimeEnd") String createTimeEnd); /** * 通过用户ID删除用户和角色关联 diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcUserMapper.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcUserMapper.java index f6bdd331..7e64d604 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcUserMapper.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcUserMapper.java @@ -70,4 +70,12 @@ public interface XhpcUserMapper { * @return 结果 */ public Map operatorInfo(@Param("userId") Long userId); + + /** + * 通过用户账号查询用户详情 + * + * @param userName 用户账号 + * @return 结果 + */ + public SysUser selectUserByUserName(@Param("userName") String userName); } diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/IXhpcInternetUserService.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/IXhpcInternetUserService.java index 27b67bb2..4306b1a0 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/IXhpcInternetUserService.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/IXhpcInternetUserService.java @@ -53,7 +53,7 @@ public interface IXhpcInternetUserService { * @param contactPhone 联系人电话 * @return 结果 */ - public List> selectInternetList(String name, String contactName, String contactPhone); + public List> selectInternetList(String name, String contactName, String contactPhone, String createTimeStart, String createTimeEnd); /** * 禁用/启用流量用户 diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/IXhpcOperatorService.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/IXhpcOperatorService.java index 00ca7d8d..087a6781 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/IXhpcOperatorService.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/IXhpcOperatorService.java @@ -61,7 +61,7 @@ public interface IXhpcOperatorService { * @param contactPhone 联系人电话 * @return 结果 */ - public List> selectOperatorList(String name, String contactName, String contactPhone); + public List> selectOperatorList(String name, String contactName, String contactPhone, String createTimeStart, String createTimeEnd); /** * 删除用户 diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/IXhpcUserService.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/IXhpcUserService.java index 0cc64952..3e804726 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/IXhpcUserService.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/IXhpcUserService.java @@ -1,5 +1,7 @@ package com.xhpc.user.service; +import com.ruoyi.system.api.domain.SysUser; + import java.util.List; import java.util.Map; @@ -62,4 +64,12 @@ public interface IXhpcUserService { * @return 结果 */ public void status(Long userId); + + /** + * 通过用户账号查询用户详情 + * + * @param userName 用户张号 + * @return 结果 + */ + public SysUser selectUserByUserName(String userName); } \ No newline at end of file diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcInternetUserServiceImpl.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcInternetUserServiceImpl.java index 6cf74a14..4cffdf48 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcInternetUserServiceImpl.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcInternetUserServiceImpl.java @@ -1,6 +1,5 @@ package com.xhpc.user.service.impl; -import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.system.api.domain.SysUser; import com.xhpc.user.domain.XhpcInternetUser; import com.xhpc.user.mapper.XhpcInternetUserMapper; @@ -89,8 +88,8 @@ public class XhpcInternetUserServiceImpl implements IXhpcInternetUserService { * @return 结果 */ @Override - public List> selectInternetList(String name, String contactName, String contactPhone) { - return xhpcInternetUserMapper.selectInternetList(name, contactName, contactPhone); + public List> selectInternetList(String name, String contactName, String contactPhone, String createTimeStart, String createTimeEnd) { + return xhpcInternetUserMapper.selectInternetList(name, contactName, contactPhone, createTimeStart, createTimeEnd); } /** @@ -104,8 +103,6 @@ public class XhpcInternetUserServiceImpl implements IXhpcInternetUserService { SysUser sysUser = xhpcInternetUserMapper.getUserByInternetUserId(internetUserId); sysUser.setStatus("1".equals(sysUser.getStatus()) ? "0" : "1"); xhpcUserMapper.update(sysUser); - Map map = xhpcInternetUserMapper.info(internetUserId); - String status = StringUtils.valueOf(map.get("status")); XhpcInternetUser xhpcInternetUser = new XhpcInternetUser(); xhpcInternetUser.setInternetUserId(internetUserId); xhpcInternetUser.setStatus("0".equals(sysUser.getStatus()) ? 1 : 0); diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcOperatorServiceImpl.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcOperatorServiceImpl.java index a2570519..0e59ecc7 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcOperatorServiceImpl.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcOperatorServiceImpl.java @@ -98,8 +98,8 @@ public class XhpcOperatorServiceImpl implements IXhpcOperatorService { * @return 结果 */ @Override - public List> selectOperatorList(String name, String contactName, String contactPhone) { - return xhpcOperatorMapper.selectOperatorList(name, contactName, contactPhone); + public List> selectOperatorList(String name, String contactName, String contactPhone, String createTimeStart, String createTimeEnd) { + return xhpcOperatorMapper.selectOperatorList(name, contactName, contactPhone, createTimeStart, createTimeEnd); } /** diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcUserServiceImpl.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcUserServiceImpl.java index bf0c33af..c882c5d0 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcUserServiceImpl.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcUserServiceImpl.java @@ -96,4 +96,15 @@ public class XhpcUserServiceImpl implements IXhpcUserService { sysUser.setStatus("1".equals(sysUser.getStatus()) ? "0" : "1"); xhpcUserMapper.update(sysUser); } + + /** + * 通过用户账号查询用户详情 + * + * @param userName 用户张号 + * @return 结果 + */ + @Override + public SysUser selectUserByUserName(String userName) { + return xhpcUserMapper.selectUserByUserName(userName); + } } \ No newline at end of file diff --git a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcInternetUserMapper.xml b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcInternetUserMapper.xml index d15c7662..bb44f361 100644 --- a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcInternetUserMapper.xml +++ b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcInternetUserMapper.xml @@ -242,7 +242,7 @@ diff --git a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcOperatorMapper.xml b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcOperatorMapper.xml index 9f66c0e1..ab03dea8 100644 --- a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcOperatorMapper.xml +++ b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcOperatorMapper.xml @@ -11,6 +11,8 @@ + + @@ -33,7 +35,7 @@ xo.operator_id operatorId, xo.name, xo.contact_name contactName, xo.contact_phone contactPhone, - xo.phone, xo.attribute, xo.area_code areaCode, xo.address, + xo.phone, xo.attribute,xo.open_bank openBank,xo.card_number cardNumber, xo.area_code areaCode, xo.address, xo.longitude, xo.latitude, xo.email, xo.commission_type commissionType, xo.platform_commission_rate platformCommissionRate, xo.maintenance_commission_rate maintenanceCommissionRate, @@ -61,6 +63,12 @@ attribute, + + open_bank, + + + card_number, + area_code, @@ -132,6 +140,12 @@ #{attribute}, + + #{openBank}, + + + #{cardNumber}, + #{areaCode}, @@ -198,6 +212,8 @@ contact_phone = #{contactPhone}, phone = #{phone}, attribute = #{attribute}, + open_bank = #{openBank}, + card_number = #{cardNumber}, area_code = #{areaCode}, address = #{address}, longitude = #{longitude}, @@ -251,7 +267,7 @@ diff --git a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcUserMapper.xml b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcUserMapper.xml index 554d50fb..7f09142f 100644 --- a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcUserMapper.xml +++ b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcUserMapper.xml @@ -132,4 +132,10 @@ LEFT JOIN sys_dict_data sdd on sdd.`dict_type` = "sys_user_sex" and sdd.dict_code = su.sex WHERE su.del_flag = 0 and user_id = #{userId} + + \ No newline at end of file