diff --git a/sql/v2.1.sql b/sql/v2.1.sql index 945fb368..c42c64bb 100644 --- a/sql/v2.1.sql +++ b/sql/v2.1.sql @@ -278,3 +278,6 @@ ALTER TABLE `xhpc_user_privilege` ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id'; ALTER TABLE `xhpc_vin_blacklist` ADD COLUMN `tenant_id` VARCHAR(12) NULL DEFAULT '000000' COMMENT '租户id'; + +ALTER TABLE `xhpc_user_account_statement` + ADD COLUMN `source` INT(4) NULL DEFAULT '0' COMMENT '订单来源（0 C端用户 1 流量方用户 2社区用户 3B端用户）' AFTER `tenant_id`; diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingPileServiceImpl.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingPileServiceImpl.java index 71868ba8..727372a3 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingPileServiceImpl.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingPileServiceImpl.java @@ -190,8 +190,16 @@ public class XhpcChargingPileServiceImpl implements IXhpcChargingPileService { if (xhpcChargingPile.getSerialNumber() == null) { return AjaxResult.error("桩编号不能为空"); } - if (xhpc.getSerialNumber() != xhpc.getSerialNumber()) { - return AjaxResult.error("桩编号不能编辑"); + if (!xhpc.getSerialNumber().equals(xhpc.getSerialNumber())) { + //删除桩 + HashSet set = new HashSet<>(); + set.add(xhpc.getSerialNumber()); + R r = powerPileService.deletePileWhitelist(xhpc.getChargingStationId(), set); + if(r.getCode() !=200){ + //数据回滚-手动回滚 + TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); + return AjaxResult.error("删除之前桩号缓存失败，请稍后在试"); + } } if (xhpcChargingPile.getGunNumber() == null || xhpcChargingPile.getGunNumber() > 26) { return AjaxResult.error("终端数量不能大于26"); @@ -221,6 +229,7 @@ public class XhpcChargingPileServiceImpl implements IXhpcChargingPileService { } } xhpcChargingPileMapper.updaeXhpcChargingPile(xhpcChargingPile); + return AjaxResult.success(); } diff --git a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcSmsController.java b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcSmsController.java index e8f6140d..51c7a5dc 100644 --- a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcSmsController.java +++ b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcSmsController.java @@ -1,8 +1,11 @@ package com.xhpc.general.controller; +import com.xhpc.common.api.UserTypeService; +import com.xhpc.common.core.domain.R; import com.xhpc.common.core.web.controller.BaseController; import com.xhpc.common.core.web.domain.AjaxResult; import com.xhpc.common.core.web.page.TableDataInfo; +import com.xhpc.common.util.UserTypeUtil; import com.xhpc.general.constant.AliyunTemplate; import com.xhpc.general.constant.AliyunTemplateKeyWord; import com.xhpc.general.service.IXhpcSmsService; @@ -22,20 +25,33 @@ public class XhpcSmsController extends BaseController { @Autowired private IXhpcSmsService xhpcSmsService; + @Autowired + private UserTypeService userTypeService; /** * 注册获取手机号验证码 */ @GetMapping(value = "/getLogonPhoneCode") - public AjaxResult getLogonPhoneCode(@RequestParam("phone") String phone) { + public AjaxResult getLogonPhoneCode(@RequestParam("phone") String phone,String tenantId) { String signatureName = null; String templateId = null; signatureName = "小华充电"; templateId = "SMS_226786362"; - - return xhpcSmsService.getLogonPhoneCode(phone, signatureName, templateId, null); + if(phone !=null || "".equals(phone)){ + if(!UserTypeUtil.COMMUNIT.equals(phone.substring(0,2)) && !UserTypeUtil.CUSTOMERS.equals(phone.substring(0,2))){ + //C端用户 + return xhpcSmsService.getLogonPhoneCode(phone, signatureName, templateId,null); + }else if (UserTypeUtil.COMMUNIT.equals(phone.substring(0,2)) || UserTypeUtil.CUSTOMERS.equals(phone.substring(0,2))){ + R user = userTypeService.getUser(phone, null, null, null,tenantId); + if(user !=null && user.getData() !=null){ + Map map = (Map)user.getData(); + return xhpcSmsService.getLogonPhoneCode(map.get("phone").toString(), signatureName, templateId,map.get("account").toString()); + } + } + } + return AjaxResult.error("1003", "请输入正确的手机号或账号"); } @GetMapping(value = "/getList") diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcChargeOrderController.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcChargeOrderController.java index a9863c83..d317c639 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcChargeOrderController.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcChargeOrderController.java @@ -105,10 +105,10 @@ public class XhpcChargeOrderController extends BaseController { * 用户历史订单列表接口 */ @GetMapping("/list") - public TableDataInfo list(@RequestParam Long userId) + public TableDataInfo list(HttpServletRequest request) { startPage(); - List> list = xhpcHistoryOrderService.list(userId); + List> list = xhpcHistoryOrderService.list(request); return getDataTable(list); } diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcPileOrderController.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcPileOrderController.java index 5f69842c..8339dc94 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcPileOrderController.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcPileOrderController.java @@ -457,8 +457,17 @@ public class XhpcPileOrderController extends BaseController { map.put("code", 500); map.put("userId", xhpcChargeOrder.getUserId()); JSONObject json = new JSONObject(map); - //消息对了内容 - webSocketService.getMessage(userId+"",json.toString()); + if(!UserTypeUtil.INTERNET_TYPE.equals(source)){ + String message =""; + if(UserTypeUtil.USER_TYPE.equals(source)){ + message=tenantId+UserTypeUtil.USER+userId; + }else if(UserTypeUtil.COMMUNIT_TYPE.equals(source)){ + message=tenantId+UserTypeUtil.COMMUNIT+userId; + }else{ + message=tenantId+UserTypeUtil.CUSTOMERS+userId; + } + webSocketService.getMessage(message,json.toString()); + } logger.info("异常桩实时数据发送WebSocket成功>>>>>orderNo：" + orderNo); return R.ok(); } 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 95b82bd2..6c7f51af 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 @@ -60,7 +60,7 @@ public interface XhpcHistoryOrderMapper { * @param userId * @return */ - List> list(@Param("userId") Long userId); + List> list(@Param("userId") Long userId,@Param("source") Integer source,@Param("tenantId") String tenantId); /** * 订单详情 diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcHistoryOrderService.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcHistoryOrderService.java index 2eaf4b39..57e1867e 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcHistoryOrderService.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcHistoryOrderService.java @@ -22,7 +22,7 @@ public interface IXhpcHistoryOrderService { * @param userId * @return */ - List> list(Long userId); + List> list(HttpServletRequest request); /** * 更新 历史订单信息 diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderServiceImpl.java index 4ca60d42..9919f83b 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderServiceImpl.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderServiceImpl.java @@ -77,9 +77,20 @@ public class XhpcHistoryOrderServiceImpl implements IXhpcHistoryOrderService { private UserTypeService userTypeService; @Override - public List> list(Long userId) { - - return xhpcHistoryOrderMapper.list(userId); + public List> list(HttpServletRequest request) { + List> list =new ArrayList<>(); + LoginUser loginUser = tokenService.getLoginUser(request); + Long userid = loginUser.getUserid(); + String tenantId = loginUser.getTenantId(); + Integer userType = loginUser.getUserType(); + R user = userTypeService.getUser(null, userid, userType, null, tenantId); + if(user !=null && user.getData() !=null){ + Map userMessage = (Map)user.getData(); + if (userMessage == null) { + return xhpcHistoryOrderMapper.list(userid,userType,tenantId); + } + } + return list; } @Override 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 d89e1cfb..1a12bae2 100644 --- a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml +++ b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml @@ -554,6 +554,12 @@ LEFT JOIN xhpc_terminal as te on te.terminal_id = ho.terminal_id left join xhpc_charge_order as co on co.charge_order_id =ho.charge_order_id where ho.status=0 and ho.del_flag=0 and ho.user_id =#{userId} + + and ho.tenant_id =#{tenantId} + + + and ho.source =#{source} + order by ho.create_time desc diff --git a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcUserAccountStatementController.java b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcUserAccountStatementController.java index 3470b310..9391edf6 100644 --- a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcUserAccountStatementController.java +++ b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcUserAccountStatementController.java @@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletRequest; import java.util.List; import java.util.Map; @@ -26,27 +27,25 @@ public class XhpcUserAccountStatementController extends BaseController { /** * 用户流水分页列表 * - * @param appUserId C端用户id * @return */ @ApiOperation(value = "用户流水分页列表") @GetMapping("/page") - public TableDataInfo page(@RequestParam Long appUserId) { + public TableDataInfo page(HttpServletRequest request) { startPage(); - List> list = iXhpcUserAccountStatementService.page(appUserId); + List> list = iXhpcUserAccountStatementService.page(request); return getDataTable(list); } /** * 用户流水列表 * - * @param appUserId C端用户id * @return */ @ApiOperation(value = "用户流水列表") @GetMapping("/list") - public AjaxResult list(@RequestParam Long appUserId) { - List> list = iXhpcUserAccountStatementService.list(appUserId); + public AjaxResult list(HttpServletRequest request) { + List> list = iXhpcUserAccountStatementService.list(request); return AjaxResult.success(list); } } diff --git a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/mapper/XhpcUserAccountStatementMapper.java b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/mapper/XhpcUserAccountStatementMapper.java index 0c0bdfe4..77b4c458 100644 --- a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/mapper/XhpcUserAccountStatementMapper.java +++ b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/mapper/XhpcUserAccountStatementMapper.java @@ -28,7 +28,7 @@ public interface XhpcUserAccountStatementMapper { * @param appUserId C端用户id * @return */ - public List> page(@Param("appUserId") Long appUserId); + public List> page(@Param("appUserId") Long appUserId,@Param("source") Integer source,@Param("tenantId")String tenantId); /** @@ -62,7 +62,7 @@ public interface XhpcUserAccountStatementMapper { * @param appUserId C端用户id * @return */ - public List> list(@Param("appUserId") Long appUserId); + public List> list(@Param("appUserId") Long appUserId,@Param("source") Integer source,@Param("tenantId")String tenantId); /** diff --git a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/IXhpcUserAccountStatementService.java b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/IXhpcUserAccountStatementService.java index aadd2a7c..d7bf57e2 100644 --- a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/IXhpcUserAccountStatementService.java +++ b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/IXhpcUserAccountStatementService.java @@ -2,6 +2,7 @@ package com.xhpc.payment.service; import com.xhpc.payment.domain.XhpcUserAccountStatement; +import javax.servlet.http.HttpServletRequest; import java.util.List; import java.util.Map; @@ -25,13 +26,12 @@ public interface IXhpcUserAccountStatementService { * @param appUserId C端用户id * @return */ - public List> page(Long appUserId); + public List> page(HttpServletRequest request); /** * 用户流水列表 * - * @param appUserId C端用户id * @return */ - public List> list(Long appUserId); + public List> list(HttpServletRequest request); } \ No newline at end of file diff --git a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/impl/XhpcUserAccountStatementServiceImpl.java b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/impl/XhpcUserAccountStatementServiceImpl.java index 1beee897..25dd0c21 100644 --- a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/impl/XhpcUserAccountStatementServiceImpl.java +++ b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/impl/XhpcUserAccountStatementServiceImpl.java @@ -1,15 +1,21 @@ package com.xhpc.payment.service.impl; +import com.xhpc.common.api.UserTypeService; import com.xhpc.common.core.constant.StatusConstants; +import com.xhpc.common.core.domain.R; import com.xhpc.common.core.utils.StringUtils; +import com.xhpc.common.security.service.TokenService; import com.xhpc.payment.domain.XhpcUserAccountStatement; import com.xhpc.payment.mapper.XhpcUserAccountStatementMapper; import com.xhpc.payment.service.IXhpcUserAccountStatementService; +import com.xhpc.system.api.model.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.servlet.http.HttpServletRequest; import java.math.BigDecimal; +import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; @@ -24,6 +30,11 @@ public class XhpcUserAccountStatementServiceImpl implements IXhpcUserAccountStat @Autowired private XhpcUserAccountStatementMapper xhpcUserAccountStatementMapper; + @Autowired + private UserTypeService userTypeService; + @Autowired + private TokenService tokenService; + /** * 新增 用户流水 @@ -43,8 +54,21 @@ public class XhpcUserAccountStatementServiceImpl implements IXhpcUserAccountStat * @return */ @Override - public List> page(Long appUserId) { - return xhpcUserAccountStatementMapper.page(appUserId); + public List> page(HttpServletRequest request) { + List> list =new ArrayList<>(); + LoginUser loginUser = tokenService.getLoginUser(request); + Long userid = loginUser.getUserid(); + String tenantId = loginUser.getTenantId(); + Integer userType = loginUser.getUserType(); + R user = userTypeService.getUser(null, userid, userType, null, tenantId); + if(user !=null && user.getData() !=null){ + Map userMessage = (Map)user.getData(); + if (userMessage == null) { + return xhpcUserAccountStatementMapper.page(userid,userType,tenantId); + } + } + return list; + //return xhpcUserAccountStatementMapper.page(appUserId); } /** @@ -91,7 +115,20 @@ public class XhpcUserAccountStatementServiceImpl implements IXhpcUserAccountStat * @return */ @Override - public List> list(Long appUserId) { - return xhpcUserAccountStatementMapper.list(appUserId); + public List> list(HttpServletRequest request) { + + List> list =new ArrayList<>(); + LoginUser loginUser = tokenService.getLoginUser(request); + Long userid = loginUser.getUserid(); + String tenantId = loginUser.getTenantId(); + Integer userType = loginUser.getUserType(); + R user = userTypeService.getUser(null, userid, userType, null, tenantId); + if(user !=null && user.getData() !=null){ + Map userMessage = (Map)user.getData(); + if (userMessage == null) { + return xhpcUserAccountStatementMapper.list(userid,userType,tenantId); + } + } + return list; } } diff --git a/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcUserAccountStatementMapper.xml b/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcUserAccountStatementMapper.xml index 49b98e5c..8e5f12d2 100644 --- a/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcUserAccountStatementMapper.xml +++ b/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcUserAccountStatementMapper.xml @@ -132,6 +132,12 @@ and xau.app_user_id = #{appUserId} + + and xau.tenant_id = #{tenantId} + + + and xau.source = #{source} + ORDER BY xuas.create_time DESC @@ -175,6 +181,12 @@ and xau.app_user_id = #{appUserId} + + and xau.tenant_id = #{tenantId} + + + and xau.source = #{source} + ORDER BY xuas.create_time DESC