From d9bead72cf20cdf2f87620d6fe08a55eb530a7da Mon Sep 17 00:00:00 2001 From: yuyang Date: Wed, 12 Oct 2022 15:18:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8D=90=E8=B5=A0=E5=8F=91?= =?UTF-8?q?=E7=A5=A8=E8=AE=BE=E7=BD=AE=EF=BC=8C=E6=B4=BB=E5=8A=A8=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/XhpcChargingStationApiController.java | 4 +- .../XhpcChargingStationServiceImpl.java | 1 + .../impl/XhpcChargeOrderServiceImpl.java | 71 ++++-- .../XhpcPileRegularInspectServiceImpl.java | 6 - .../mapper/XhpcChargeOrderMapper.xml | 2 +- .../XhpcDonationInvoiceController.java | 57 +++++ .../xhpc/user/domain/XhpcDonationInvoice.java | 84 +++++++ .../com/xhpc/user/mapper/MechanismMapper.java | 2 +- .../mapper/XhpcDonationInvoiceMapper.java | 28 +++ .../service/IXhpcDonationInvoiceService.java | 29 +++ .../service/impl/IMechanismServiceImpl.java | 8 +- .../service/impl/XhpcDonationInvoiceImpl.java | 107 ++++++++ .../main/resources/mapper/MechanismMapper.xml | 3 + .../mapper/XhpcDonationInvoiceMapper.xml | 236 ++++++++++++++++++ 14 files changed, 603 insertions(+), 35 deletions(-) create mode 100644 xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcDonationInvoiceController.java create mode 100644 xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/XhpcDonationInvoice.java create mode 100644 xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcDonationInvoiceMapper.java create mode 100644 xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/IXhpcDonationInvoiceService.java create mode 100644 xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcDonationInvoiceImpl.java create mode 100644 xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcDonationInvoiceMapper.xml diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/api/XhpcChargingStationApiController.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/api/XhpcChargingStationApiController.java index f873b1a1..2def30fa 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/api/XhpcChargingStationApiController.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/api/XhpcChargingStationApiController.java @@ -36,7 +36,9 @@ public class XhpcChargingStationApiController extends BaseController { //@PreAuthorize(hasPermi = "system:station:list") @GetMapping("/getWXList") public TableDataInfo getWXList(String name, String serviceFacilities, Integer code, String longitude, String latitude,String tenantId) { - + System.out.println("========tenantId======="+tenantId); + System.out.println("========tenantId======="+tenantId); + System.out.println("========tenantId======="+tenantId); startPage(); List> list = xhpcChargingStationService.getWXList(name, serviceFacilities, code, longitude, latitude,tenantId); return getDataTable(list); diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java index 03654410..c917d5f0 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java @@ -792,6 +792,7 @@ public class XhpcChargingStationServiceImpl extends BaseService implements IXhpc stringList = Arrays.asList(split); } String date = DateUtil.formatTime(new Date()); + List> list = xhpcChargingStationMapper.getWXList(name, stringList, code, longitude, latitude, 2,date,tenantId); if (list != null && list.size() > 0) { for (int i = 0; i < list.size(); i++) { diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java index 32108beb..ebb48201 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java @@ -160,14 +160,21 @@ public class XhpcChargeOrderServiceImpl extends BaseService implements IXhpcChar if (terminalSerialNumber.length() != 16 || !m.matches()) { return AjaxResult.error(1104, "无效的终端编号"); } + System.out.println("============tenantId================="+tenantId); + System.out.println("============tenantId================="+tenantId); + System.out.println("============tenantId================="+tenantId); //终端信息 XhpcTerminal xhpcTerminal = xhpcChargeOrderMapper.getXhpcTerminalSerialNumber(terminalSerialNumber,tenantId); if (xhpcTerminal == null || xhpcTerminal.getTerminalId() == null || xhpcTerminal.getChargingPileId() == null || xhpcTerminal.getPileSerialNumber() == null) { - String pilePrompt = redisService.getCacheObject("pilePrompt:"+tenantId); - if(!"".equals(pilePrompt) && pilePrompt !=null){ - return AjaxResult.error(1104, pilePrompt); - } return AjaxResult.error(1104, "因限电该桩已停用,请选择其他桩进行充电"); + }else { + if(xhpcTerminal.getStatus()==1){ + if(xhpcTerminal.getPrompt() !=null){ + return AjaxResult.error(1104, xhpcTerminal.getPrompt()); + }else{ + return AjaxResult.error(1104, "桩已停用,请选择其他桩进行充电"); + } + } } //查看充电用户金额是否大于5元 //Map userMessage = xhpcChargeOrderMapper.getUserMessage(userId); @@ -344,11 +351,15 @@ public class XhpcChargeOrderServiceImpl extends BaseService implements IXhpcChar //终端信息 XhpcTerminal xhpcTerminal = xhpcChargeOrderMapper.getXhpcTerminalSerialNumber(serialNumber,tenantId); if (xhpcTerminal == null || xhpcTerminal.getTerminalId() == null || xhpcTerminal.getChargingPileId() == null || xhpcTerminal.getPileSerialNumber() == null) { - String pilePrompt = redisService.getCacheObject("pilePrompt:"+tenantId); - if(!"".equals(pilePrompt) && pilePrompt !=null){ - return AjaxResult.error(1104, pilePrompt); - } return AjaxResult.error(1104, "因限电该桩已停用,请选择其他桩进行充电"); + }else { + if(xhpcTerminal.getStatus()==1){ + if(xhpcTerminal.getPrompt() !=null){ + return AjaxResult.error(1104, xhpcTerminal.getPrompt()); + }else{ + return AjaxResult.error(1104, "桩已停用,请选择其他桩进行充电"); + } + } } //获取桩信息 @@ -361,11 +372,7 @@ public class XhpcChargeOrderServiceImpl extends BaseService implements IXhpcChar //获取充电订单号 XhpcChargeOrder order = xhpcChargeOrderMapper.getChargingOrderId(chargingOrderId); if(order ==null){ - String pilePrompt = redisService.getCacheObject("pilePrompt:"+tenantId); - if(!"".equals(pilePrompt) && pilePrompt !=null){ - return AjaxResult.error(1104, pilePrompt); - } - return AjaxResult.error(1104, "因限电该桩已停用,请选择其他桩进行充电"); + return AjaxResult.error(1104, "未获取到充电订单,拨打客服电话或按急停按钮停止充电"); }else{ if(order.getSource()==1){ return AjaxResult.error(1104, "请在启动方停止充电"); @@ -518,6 +525,15 @@ public class XhpcChargeOrderServiceImpl extends BaseService implements IXhpcChar // } r.setMsg("因限电该桩已停用请选择其他桩进行充电"); return r; + }else { + if(xhpcTerminal.getStatus()==1){ + if(xhpcTerminal.getPrompt() !=null){ + r.setMsg(xhpcTerminal.getPrompt()); + }else{ + r.setMsg("桩已停用,请选择其他桩进行充电"); + } + return r; + } } //终端状态是否空闲 //是否插枪 @@ -738,6 +754,13 @@ public class XhpcChargeOrderServiceImpl extends BaseService implements IXhpcChar XhpcTerminal xhpcTerminal = xhpcChargeOrderMapper.getXhpcTerminalSerialNumber(serialNumber, tenantId); if (xhpcTerminal == null || xhpcTerminal.getTerminalId() == null || xhpcTerminal.getChargingPileId() == null || xhpcTerminal.getPileSerialNumber() == null) { return R.fail(1104, "无效的终端编号"); + }else{ + if(xhpcTerminal.getStatus()==1){ + if(xhpcTerminal.getPrompt() !=null){ + return R.fail(1104, xhpcTerminal.getPrompt()); + } + return R.fail(1104, "无效的终端编号"); + } } Map xhpcChargingPileById = xhpcChargeOrderMapper.getXhpcChargingPileById(xhpcTerminal.getChargingPileId(), tenantId); @@ -863,7 +886,6 @@ public class XhpcChargeOrderServiceImpl extends BaseService implements IXhpcChar @Override public R pileVin(String serialNumber, String vinNumber) { - try{ if("".equals(vinNumber) || vinNumber ==null ){ return R.fail(1888, "VIN码为空"); @@ -874,7 +896,19 @@ public class XhpcChargeOrderServiceImpl extends BaseService implements IXhpcChar //Vin码表获取 用户id,用户类型 Long userId = 1L; Integer userType = 0; + //终端信息 XhpcTerminal xhpcTerminal = xhpcChargeOrderMapper.getXhpcTerminalSerialNumber(serialNumber,null); + if (xhpcTerminal == null || xhpcTerminal.getTerminalId() == null || xhpcTerminal.getChargingPileId() == null || xhpcTerminal.getPileSerialNumber() == null) { + return R.fail(1104, "因限电该桩已停用,请选择其他桩进行充电"); + }else { + if(xhpcTerminal.getStatus()==1){ + if(xhpcTerminal.getPrompt() !=null){ + return R.fail(1104, xhpcTerminal.getPrompt()); + }else{ + return R.fail(1104, "桩已停用,请选择其他桩进行充电"); + } + } + } String tenantId = xhpcTerminal.getTenantId(); long l1 = System.currentTimeMillis(); R user = userTypeService.getUser(null, userId, userType, vinNumber,tenantId); @@ -892,14 +926,7 @@ public class XhpcChargeOrderServiceImpl extends BaseService implements IXhpcChar if (serialNumber.length() != 16 || !m.matches()) { return R.fail(1104, "无效的终端编号"); } - //终端信息 - if (xhpcTerminal == null || xhpcTerminal.getTerminalId() == null || xhpcTerminal.getChargingPileId() == null || xhpcTerminal.getPileSerialNumber() == null) { - String pilePrompt = redisService.getCacheObject("pilePrompt:"+tenantId); - if(!"".equals(pilePrompt) && pilePrompt !=null){ - return R.fail(1104, pilePrompt); - } - return R.fail(1104, "因限电该桩已停用,请选择其他桩进行充电"); - } + //查看充电用户金额是否大于5元 //Map userMessage = xhpcChargeOrderMapper.getUserMessage(userId); BigDecimal a = new BigDecimal(5); diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcPileRegularInspectServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcPileRegularInspectServiceImpl.java index 95fdc83c..11a0087e 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcPileRegularInspectServiceImpl.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcPileRegularInspectServiceImpl.java @@ -161,21 +161,17 @@ public class XhpcPileRegularInspectServiceImpl extends BaseService implements IX String chargingStationId = map1.get("chargingStationId").toString(); if(cachePile==null || cachePile.get("firmwareVersion")==null){ R r = workOrderService.addNewOrder("12","版本号不一致","该桩版本号和系统设置的版本号不一致","",chargingStationId,"PILE",serialNumber); - System.out.println("============r===================="+r.getCode()); }else{ String firmwareVersion = cachePile.get("firmwareVersion").toString(); - System.out.println("============firmwareVersion===================="+firmwareVersion); if(type==1){ if(!directNumber.equals(firmwareVersion)){ //添加一条工单 R r = workOrderService.addNewOrder("12","版本号不一致","该桩版本号和系统设置的版本号不一致","",chargingStationId,"PILE",serialNumber); - System.out.println("============r===================="+r.getCode()); } }else{ if(!communicationNumber.equals(firmwareVersion)){ //添加一条工单 R r = workOrderService.addNewOrder("12","版本号不一致","该桩版本号和系统设置的版本号不一致","",chargingStationId,"PILE",serialNumber); - System.out.println("============r===================="+r.getCode()); } } } @@ -230,13 +226,11 @@ public class XhpcPileRegularInspectServiceImpl extends BaseService implements IX Map cachePile = redisService.getCacheMap("pile:" + serialNumber); if(cachePile==null || cachePile.get("rateModelId") ==null){ R r = workOrderService.addNewOrder("14","费率不一致","该桩费率和场站设置的费率不一致","",chargingStationId,"PILE",serialNumber); - System.out.println("============r===================="+r.getCode()); }else{ String rateModelId = cachePile.get("rateModelId").toString(); System.out.println("============rateModelId===================="+rateModelId); if(!modelId.equals(rateModelId)){ R r = workOrderService.addNewOrder("14","费率不一致","该桩费率和场站设置的费率不一致","",chargingStationId,"PILE",serialNumber); - System.out.println("============r===================="+r.getCode()); } } } diff --git a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcChargeOrderMapper.xml b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcChargeOrderMapper.xml index 3eaaa3ad..6d94acd7 100644 --- a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcChargeOrderMapper.xml +++ b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcChargeOrderMapper.xml @@ -167,7 +167,7 @@ and tenant_id=#{tenantId} - and del_flag=0 and status=0 limit 1 + and del_flag=0 limit 1 params = new HashMap<>(); + params.put("tenantId", loginUser.getTenantId()); + params.put("titleContent", titleContent); + params.put("dutyNumber", dutyNumber); + params.put("name", name); + return getDataTable(xhpcDonationInvoiceService.getPage(params)); + } + + @GetMapping("/deleteById") + public AjaxResult deleteById(String donationInvoiceId) { + return xhpcDonationInvoiceService.deleteById(donationInvoiceId); + } + +} diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/XhpcDonationInvoice.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/XhpcDonationInvoice.java new file mode 100644 index 00000000..c4d9323d --- /dev/null +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/domain/XhpcDonationInvoice.java @@ -0,0 +1,84 @@ +package com.xhpc.user.domain; + +import com.xhpc.common.core.web.domain.BaseEntity; +import lombok.Data; + +/** + * 捐赠发票 + * @author yuyang + * @date 2022/6/22 11:21 + */ +@Data +public class XhpcDonationInvoice extends BaseEntity { + + + private Long donationInvoiceId; + + /** + * 捐赠单位名称 + */ + private String name; + + /** + * 发票类型(默认0普票，1为专票) + */ + private Integer invoiceType; + + /** + * 接收邮箱 + */ + private String receiveEmail; + + /** + * 0为企业抬头 1为非企业抬头 + */ + private Integer titleType; + + /** + * 发票抬头 + */ + private String titleContent; + + /** + * 税号 + */ + private String dutyNumber; + + /** + * 发票内容 + */ + private String invoiceContent; + + /** + * 所开发票是否展示交易记录（0为不展示，1为展示） + */ + private Integer isShowDate; + + /** + * 公司地址 + */ + private String firmAddress; + + /** + * 公司电话 + */ + private String firmPhone; + + /** + * 公司开户行 + */ + private String firmBank; + + /** + * 公司开户行账号 + */ + private String firmBankAccount; + + private Integer status; + /** + * 删除标志（0代表存在 2代表删除） + */ + private Integer delFlag; + + private String tenantId; +} diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/MechanismMapper.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/MechanismMapper.java index 5d1d78a2..1b00a3ee 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/MechanismMapper.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/MechanismMapper.java @@ -53,7 +53,7 @@ public interface MechanismMapper { * 通过登录用户分组查询场站 * @return 结果 */ - public List> dataChargingStationId(@Param("userId") Long userId, @Param("type") Integer type,@Param("operatorId") String operatorId,@Param("code") String cityCode); + public List> dataChargingStationId(@Param("userId") Long userId, @Param("type") Integer type,@Param("operatorId") String operatorId,@Param("code") String cityCode,@Param("tenantId") String tenantId); /** diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcDonationInvoiceMapper.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcDonationInvoiceMapper.java new file mode 100644 index 00000000..6f358d42 --- /dev/null +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcDonationInvoiceMapper.java @@ -0,0 +1,28 @@ +package com.xhpc.user.mapper; + +import com.xhpc.user.domain.XhpcDonationInvoice; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +/** + * @author yuyang + * @date 2022/6/22 11:48 + */ +public interface XhpcDonationInvoiceMapper { + + + int insertDonationInvoice(XhpcDonationInvoice xhpcDonationInvoice); + + int updateDonationInvoice(XhpcDonationInvoice xhpcDonationInvoice); + + //查询重复信息 + List getDonationInvoiceMessage(@Param("params") Map params); + + int getDonationInvoiceRepeat(@Param("donationInvoiceId") Long donationInvoiceId,@Param("name") String name,@Param("titleContent") String titleContent,@Param("dutyNumber") String dutyNumber,@Param("tenantId") String tenantId); + + XhpcDonationInvoice getDonationInvoiceById(@Param("donationInvoiceId") Long donationInvoiceId,@Param("tenantId") String tenantId); + + int updateDonationInvoiceById(@Param("donationInvoiceId") Long donationInvoiceId,@Param("tenantId") String tenantId); +} diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/IXhpcDonationInvoiceService.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/IXhpcDonationInvoiceService.java new file mode 100644 index 00000000..1c3c5847 --- /dev/null +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/IXhpcDonationInvoiceService.java @@ -0,0 +1,29 @@ +package com.xhpc.user.service; + +import com.xhpc.common.core.web.domain.AjaxResult; +import com.xhpc.user.domain.XhpcDonationInvoice; + +import java.util.List; +import java.util.Map; + +/** + * @author yuyang + * @date 2022/6/22 11:47 + */ +public interface IXhpcDonationInvoiceService { + + + /** + * 添加捐款发票企业 + * @param xhpcDonationInvoice + * @return + */ + AjaxResult insertDonationInvoice(XhpcDonationInvoice xhpcDonationInvoice); + + AjaxResult getDonationInvoiceById(Long donationInvoiceId); + + List getPage(Map params); + + AjaxResult deleteById(String donationInvoiceId); + +} diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/IMechanismServiceImpl.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/IMechanismServiceImpl.java index 7a77d41a..982181d5 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/IMechanismServiceImpl.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/IMechanismServiceImpl.java @@ -156,7 +156,7 @@ public class IMechanismServiceImpl implements IMechanismService { mechanismOperator.setLabel(operatorMap.get("name").toString()); List mechanismdataList =new ArrayList<>(); //场站 - List> dataList = mechanismMapper.dataChargingStationId(userId, type, operatorId,codeArea); + List> dataList = mechanismMapper.dataChargingStationId(userId, type, operatorId,codeArea,tenantId); for (Map dataMap:dataList) { MechanismDto mechanismData =new MechanismDto(); String codeData = dataMap.get("chargingStationId").toString(); @@ -194,7 +194,7 @@ public class IMechanismServiceImpl implements IMechanismService { mechanismOperator.setLabel(operatorMap.get("name").toString()); List mechanismdataList =new ArrayList<>(); //场站 - List> dataList = mechanismMapper.dataChargingStationId(userId, type, operatorId,null); + List> dataList = mechanismMapper.dataChargingStationId(userId, type, operatorId,null,tenantId); for (Map dataMap:dataList) { MechanismDto mechanismData =new MechanismDto(); String codeData = dataMap.get("chargingStationId").toString(); @@ -251,7 +251,7 @@ public class IMechanismServiceImpl implements IMechanismService { mechanismArea.setLabel(areaMap.get("name").toString()); List mechanismOperatorList =new ArrayList<>(); //场站 - List> dataList = mechanismMapper.dataChargingStationId(userId, type, operatorId,codeArea); + List> dataList = mechanismMapper.dataChargingStationId(userId, type, operatorId,codeArea,tenantId); for (Map dataMap:dataList) { MechanismDto mechanismData =new MechanismDto(); String codeData = dataMap.get("chargingStationId").toString(); @@ -302,7 +302,7 @@ public class IMechanismServiceImpl implements IMechanismService { mechanismOperator.setLabel(operatorMap.get("name").toString()); List mechanismdataList =new ArrayList<>(); //场站 - List> dataList = mechanismMapper.dataChargingStationId(userId, type, operatorId,null); + List> dataList = mechanismMapper.dataChargingStationId(userId, type, operatorId,null,tenantId); for (Map dataMap:dataList) { MechanismDto mechanismData =new MechanismDto(); String codeData = dataMap.get("chargingStationId").toString(); diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcDonationInvoiceImpl.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcDonationInvoiceImpl.java new file mode 100644 index 00000000..d975047a --- /dev/null +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcDonationInvoiceImpl.java @@ -0,0 +1,107 @@ +package com.xhpc.user.service.impl; + +import com.xhpc.common.core.web.domain.AjaxResult; +import com.xhpc.common.security.service.TokenService; +import com.xhpc.system.api.model.LoginUser; +import com.xhpc.user.domain.XhpcDonationInvoice; +import com.xhpc.user.mapper.XhpcDonationInvoiceMapper; +import com.xhpc.user.service.IXhpcDonationInvoiceService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; +import java.util.Map; + +/** + * @author yuyang + * @date 2022/6/22 11:47 + */ +@Service +public class XhpcDonationInvoiceImpl implements IXhpcDonationInvoiceService { + + @Resource + XhpcDonationInvoiceMapper xhpcDonationInvoiceMapper; + @Resource + TokenService tokenService; + /** + * 添加捐款发票企业 + * + * @param xhpcDonationInvoice + * @return + */ + @Override + public AjaxResult insertDonationInvoice(XhpcDonationInvoice xhpcDonationInvoice) { + LoginUser loginUser = tokenService.getLoginUser(); + String tenantId = loginUser.getTenantId(); + //名称不能重复\发票抬头不能重复\发票税号不能重复 + if(xhpcDonationInvoice.getDonationInvoiceId() ==null){ + String name = xhpcDonationInvoice.getName(); + if(name !=null){ + int i = xhpcDonationInvoiceMapper.getDonationInvoiceRepeat(null, name, null, null, tenantId); + if(i>0){ + return AjaxResult.error(500, "捐款单位名称重复"); + } + } + String titleContent = xhpcDonationInvoice.getTitleContent(); + if(titleContent !=null){ + int i = xhpcDonationInvoiceMapper.getDonationInvoiceRepeat(null, null, titleContent, null, tenantId); + if(i>0){ + return AjaxResult.error(500, "发票抬头重复"); + } + } + String dutyNumber = xhpcDonationInvoice.getDutyNumber(); + if(dutyNumber !=null){ + int i = xhpcDonationInvoiceMapper.getDonationInvoiceRepeat(null, null, null, dutyNumber, tenantId); + if(i>0){ + return AjaxResult.error(500, "发票税号重复"); + } + } + xhpcDonationInvoiceMapper.insertDonationInvoice(xhpcDonationInvoice); + return AjaxResult.success(); + }else{ + Long donationInvoiceId = xhpcDonationInvoice.getDonationInvoiceId(); + String name = xhpcDonationInvoice.getName(); + if(name !=null){ + int i = xhpcDonationInvoiceMapper.getDonationInvoiceRepeat(donationInvoiceId, name, null, null, tenantId); + if(i>0){ + return AjaxResult.error(500, "捐款单位名称重复"); + } + } + String titleContent = xhpcDonationInvoice.getTitleContent(); + if(titleContent !=null){ + int i = xhpcDonationInvoiceMapper.getDonationInvoiceRepeat(donationInvoiceId, null, titleContent, null, tenantId); + if(i>0){ + return AjaxResult.error(500, "发票抬头重复"); + } + } + String dutyNumber = xhpcDonationInvoice.getDutyNumber(); + if(dutyNumber !=null){ + int i = xhpcDonationInvoiceMapper.getDonationInvoiceRepeat(donationInvoiceId, null, null, dutyNumber, tenantId); + if(i>0){ + return AjaxResult.error(500, "发票税号重复"); + } + } + xhpcDonationInvoiceMapper.updateDonationInvoice(xhpcDonationInvoice); + return AjaxResult.success(); + } + } + + @Override + public AjaxResult getDonationInvoiceById(Long donationInvoiceId) { + LoginUser loginUser = tokenService.getLoginUser(); + String tenantId = loginUser.getTenantId(); + return AjaxResult.success(xhpcDonationInvoiceMapper.getDonationInvoiceById(donationInvoiceId,tenantId)); + } + @Override + public AjaxResult deleteById(String donationInvoiceId) { + LoginUser loginUser = tokenService.getLoginUser(); + String tenantId = loginUser.getTenantId(); + return AjaxResult.success(xhpcDonationInvoiceMapper.updateDonationInvoiceById(Long.parseLong(donationInvoiceId),tenantId)); + } + + + @Override + public List getPage(Map params) { + return xhpcDonationInvoiceMapper.getDonationInvoiceMessage(params); + } +} diff --git a/xhpc-modules/xhpc-user/src/main/resources/mapper/MechanismMapper.xml b/xhpc-modules/xhpc-user/src/main/resources/mapper/MechanismMapper.xml index e61712fa..b891d75b 100644 --- a/xhpc-modules/xhpc-user/src/main/resources/mapper/MechanismMapper.xml +++ b/xhpc-modules/xhpc-user/src/main/resources/mapper/MechanismMapper.xml @@ -130,6 +130,9 @@ and xcs.area_code = #{code} + + and xcs.tenant_id = #{tenantId} + diff --git a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcDonationInvoiceMapper.xml b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcDonationInvoiceMapper.xml new file mode 100644 index 00000000..7b896f05 --- /dev/null +++ b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcDonationInvoiceMapper.xml @@ -0,0 +1,236 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + donation_invoice_id, name, invoice_type, receive_email, title_type, title_content, duty_number, invoice_content, firm_address, firm_phone, firm_bank, + firm_bank_account,is_show_date,tenant_id, `status`, del_flag, create_by, create_time, update_by, update_time + + + insert into xhpc_donation_invoice + + + name, + + + invoice_type, + + + receive_email, + + + title_type, + + + title_content, + + + duty_number, + + + invoice_content, + + + firm_address, + + + firm_phone, + + + firm_bank, + + + firm_bank_account, + + + is_show_date, + + + create_time, + + + status, + + + create_by, + + + update_time, + + + update_by, + + + remark, + + + tenant_id, + + + + + #{name}, + + + #{invoiceType}, + + + #{receiveEmail}, + + + #{titleType}, + + + #{titleContent}, + + + #{dutyNumber}, + + + #{invoiceContent}, + + + #{firmAddress}, + + + #{firmPhone}, + + + #{firmBank}, + + + #{firmBankAccount}, + + + #{isShowDate}, + + + #{createTime}, + + + #{status}, + + + #{createBy}, + + + #{updateTime}, + + + #{updateBy}, + + + #{remark}, + + + #{tenantId}, + + + + + + update xhpc_donation_invoice + + name = #{name}, + invoice_type = #{invoiceType}, + receive_email = #{receiveEmail}, + title_type = #{titleType}, + title_content = #{titleContent}, + duty_number = #{dutyNumber}, + invoice_content = #{invoiceContent}, + firm_address = #{firmAddress}, + firm_phone = #{firmPhone}, + firm_bank = #{firmBank}, + firm_bank_account = #{firmBankAccount}, + is_show_date = #{isShowDate}, + status = #{status}, + del_flag = #{delFlag}, + create_time = #{createTime}, + create_by = #{createBy}, + update_time = #{updateTime}, + update_by = #{updateBy}, + tenant_id = #{tenantId}, + + where donation_invoice_id = #{donationInvoiceId} + + + + + + + + + + + update xhpc_donation_invoice set del_flag =2 where donation_invoice_id = #{donationInvoiceId} and tenant_id =#{tenantId} + +