From f29b9c16723702f5a6206d35d31eeaa27206cb59 Mon Sep 17 00:00:00 2001 From: yuyang Date: Fri, 1 Apr 2022 11:00:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=82=AE=E4=BB=B6=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=EF=BC=8C=E7=BB=9F=E8=AE=A1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/XhpcInvoiceController.java | 69 ++--- .../service/impl/XhpcInvoiceServiceImpl.java | 4 + .../src/main/resources/config/mail.setting | 3 +- .../impl/XhpcStatisticsServiceImpl.java | 34 +-- .../resources/mapper/XhpcStatisticsMapper.xml | 276 +++++++++--------- 5 files changed, 197 insertions(+), 189 deletions(-) diff --git a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/controller/XhpcInvoiceController.java b/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/controller/XhpcInvoiceController.java index 775dbcac..fee1fed9 100644 --- a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/controller/XhpcInvoiceController.java +++ b/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/controller/XhpcInvoiceController.java @@ -88,43 +88,46 @@ public class XhpcInvoiceController extends BaseController { * @date 2021/12/22 12:03 * @since version-1.0 */ - @Log(title = "用户提交发票状态", businessType = BusinessType.UPDATE) - @PatchMapping() - public AjaxResult invoiceToUser(@RequestBody InvoiceToUserRequest requestData) { - //前置条件 - if (requestData.getInvoiceId() == null) { - return AjaxResult.error("必须上传发票id"); - } - if (requestData.getStatus() == null || requestData.getStatus().equals(InvoiceStatusConst.INVOICING)) { - return AjaxResult.error("必须传递发票状态或发票状态不能为0"); - } - //开失败发票 - if (requestData.getStatus().equals(InvoiceStatusConst.FAIL)) { - try { - xhpcInvoiceService.failInvoiceToUser(requestData); - return AjaxResult.success(); - } catch (Exception e) { - return AjaxResult.error("开失败发票失败"); - } - } else { - //开成功发票 - try { - //捕获参数异常 - Boolean flagOfjudge = xhpcInvoiceService.invoiceToUser(requestData); - if (!flagOfjudge) { - return AjaxResult.error("客户邮箱有误，邮件未发送成功，请通知用户修改邮箱"); - } - } catch (Exception e) { - return AjaxResult.error(e.getMessage()); - } - } - return AjaxResult.success(); - } +// @Log(title = "用户提交发票状态", businessType = BusinessType.UPDATE) +// @PatchMapping() +// public AjaxResult invoiceToUser(@RequestBody InvoiceToUserRequest requestData) { +// //前置条件 +// if (requestData.getInvoiceId() == null) { +// return AjaxResult.error("必须上传发票id"); +// } +// if (requestData.getStatus() == null || requestData.getStatus().equals(InvoiceStatusConst.INVOICING)) { +// return AjaxResult.error("必须传递发票状态或发票状态不能为0"); +// } +// //开失败发票 +// if (requestData.getStatus().equals(InvoiceStatusConst.FAIL)) { +// try { +// xhpcInvoiceService.failInvoiceToUser(requestData); +// return AjaxResult.success(); +// } catch (Exception e) { +// return AjaxResult.error("开失败发票失败"); +// } +// } else { +// //开成功发票 +// try { +// //捕获参数异常 +// Boolean flagOfjudge = xhpcInvoiceService.invoiceToUser(requestData); +// if (!flagOfjudge) { +// return AjaxResult.error("客户邮箱有误，邮件未发送成功，请通知用户修改邮箱"); +// } +// } catch (Exception e) { +// return AjaxResult.error(e.getMessage()); +// } +// } +// return AjaxResult.success(); +// } - @Log(title = "用户提交发票状态", businessType = BusinessType.UPDATE) + //@Log(title = "用户提交发票状态", businessType = BusinessType.UPDATE) @PostMapping("/add") public AjaxResult postInvoiceToUser(@RequestBody InvoiceToUserRequest requestData) { + System.out.println("<<<<<<<<<<<<<<<<<<<进入开发票>>>>>>>>>>>>>>>>>>"); + System.out.println("<<<<<<<<<<<<<<<<<<<进入开发票>>>>>>>>>>>>>>>>>>"); + System.out.println("<<<<<<<<<<<<<<<<<<<进入开发票>>>>>>>>>>>>>>>>>>"); //前置条件 if (requestData.getInvoiceId() == null) { return AjaxResult.error("必须上传发票id"); diff --git a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/service/impl/XhpcInvoiceServiceImpl.java b/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/service/impl/XhpcInvoiceServiceImpl.java index d6e7bfe7..01432424 100644 --- a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/service/impl/XhpcInvoiceServiceImpl.java +++ b/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/service/impl/XhpcInvoiceServiceImpl.java @@ -147,6 +147,7 @@ public class XhpcInvoiceServiceImpl implements XhpcInvoiceService { String receiveEmail = xhpcInvoice.getReceiveEmail(); //从阿里云上下载下来电子发票 String fileUrl = requestData.getEletricInvoiceUrl(); + System.out.println("<<<<<<<<<<111<<<<<<<<<发票路径>>>>>>>>>>222>>>>>>>>"+fileUrl); File electricInvoiceFile = new File(environment.getProperty("file.serverStoreDisposableFileLocation") + "ElectricInvoice.pdf"); try { //参数1 文件下载路径 @@ -156,8 +157,10 @@ public class XhpcInvoiceServiceImpl implements XhpcInvoiceService { } catch (Exception e) { throw new RuntimeException("在阿里云上无法找到该文件，请检查上传的图片路径是否完整或有误"); } + System.out.println("<<<<<<<<<<333<<<<<<<<<发票路径>>>>>>>>>>444>>>>>>>>"+fileUrl); try { MailUtil.send(receiveEmail, "【小华充电】电子发票", "邮件来自小华充电", false, electricInvoiceFile); + System.out.println("<<<<<<<<<<4444<<<<<<<<<发票路径>>>>>>>>>>444>>>>>>>>"+fileUrl); } catch (Exception e) { System.out.println(e.getMessage()); return Boolean.FALSE; @@ -166,6 +169,7 @@ public class XhpcInvoiceServiceImpl implements XhpcInvoiceService { electricInvoiceFile.delete(); } } + System.out.println("<<<<<<<<<<5555<<<<<<<<<发票路径>>>>>>>>>>444>>>>>>>>"+fileUrl); //更新发票数据,并设置用户未阅读状态 Long successFlag = xhpcInvoiceMapper.updateInvoiceToUser(requestData); if (successFlag == 0) { diff --git a/xhpc-modules/xhpc-invoice/src/main/resources/config/mail.setting b/xhpc-modules/xhpc-invoice/src/main/resources/config/mail.setting index 6685409e..dbf1b636 100644 --- a/xhpc-modules/xhpc-invoice/src/main/resources/config/mail.setting +++ b/xhpc-modules/xhpc-invoice/src/main/resources/config/mail.setting @@ -1,4 +1,5 @@ # 发件人（必须正确，否则发送失败） from = coml_aaron@163.com # 密码（注意，某些邮箱需要为SMTP服务单独设置密码，详情查看相关帮助） -pass = DRTYHUCGNKPOFRVE \ No newline at end of file +pass = DRTYHUCGNKPOFRVE +port = 465 \ No newline at end of file diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcStatisticsServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcStatisticsServiceImpl.java index b7aba475..c7f39170 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcStatisticsServiceImpl.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcStatisticsServiceImpl.java @@ -511,23 +511,23 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati } private Map getStatistics(String time){ Map map =new HashMap<>(); - map.put("chargingDegree",0.00); - map.put("chargingTime",0.00); - map.put("chargingNumber",0); - map.put("powerPrice",0.00); - map.put("servicePrice",0.00); - map.put("totalPrice",0.00); - map.put("promotionDiscount",0.00); - map.put("actPrice",0.00); - map.put("actPowerPrice",0.00); - map.put("actServicePrice",0.00); - map.put("internetCommission",0.00); - map.put("internetSvcCommission",0.00); - map.put("internetDegreeCommission",0.00); - map.put("platformCommission",0.00); - map.put("platformSvcCommisssion",0.00); - map.put("operationCommission",0.00); - map.put("operationSvcCommission",0.00); + map.put("chargingDegree","0.00"); + map.put("chargingTime","0.00"); + map.put("chargingNumber","0.00"); + map.put("powerPrice","0.00"); + map.put("servicePrice","0.00"); + map.put("totalPrice","0.00"); + map.put("promotionDiscount","0.00"); + map.put("actPrice","0.00"); + map.put("actPowerPrice","0.00"); + map.put("actServicePrice","0.00"); + map.put("internetCommission","0.00"); + map.put("internetSvcCommission","0.00"); + map.put("internetDegreeCommission","0.00"); + map.put("platformCommission","0.00"); + map.put("platformSvcCommisssion","0.00"); + map.put("operationCommission","0.00"); + map.put("operationSvcCommission","0.00"); map.put("time",time); return map; } diff --git a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcStatisticsMapper.xml b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcStatisticsMapper.xml index 776e0079..8257e4b8 100644 --- a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcStatisticsMapper.xml +++ b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcStatisticsMapper.xml @@ -38,23 +38,23 @@ select - sum(charging_degree) chargingDegree, - sum(charging_time) chargingTime, - sum(charging_number) chargingNumber, - sum(power_price) powerPrice, - sum(service_price) servicePrice, - sum(total_price) totalPrice, - sum(act_price) actPrice, - sum(act_power_price) actPowerPrice, - sum(act_service_price) actServicePrice, - sum(promotion_discount) promotionDiscount, - sum(internet_commission) internetCommission, - sum(internet_svc_commission) internetSvcCommission, - sum(internet_degree_commission) internetDegreeCommission, - sum(platform_commission) platformCommission, - sum(platform_svc_commisssion) platformSvcCommisssion, - sum(operation_commission) operationCommission, - sum(operation_svc_commission) operationSvcCommission, + format(sum(charging_degree), 2) chargingDegree, + format(sum(charging_time), 2) chargingTime, + format(sum(charging_number), 2) chargingNumber, + format(sum(power_price), 2) powerPrice, + format(sum(service_price), 2) servicePrice, + format(sum(total_price), 2) totalPrice, + format(sum(act_price), 2) actPrice, + format(sum(act_power_price), 2) actPowerPrice, + format(sum(act_service_price), 2) actServicePrice, + format(sum(promotion_discount), 2) promotionDiscount, + format(sum(internet_commission), 2) internetCommission, + format(sum(internet_svc_commission), 2) internetSvcCommission, + format(sum(internet_degree_commission), 2) internetDegreeCommission, + format(sum(platform_commission), 2) platformCommission, + format(sum(platform_svc_commisssion), 2) platformSvcCommisssion, + format(sum(operation_commission), 2) operationCommission, + format(sum(operation_svc_commission), 2) operationSvcCommission, DATE_FORMAT(create_time,'%Y-%m-%d') createTime from xhpc_statistics_station where del_flag=0 and type=1 @@ -157,23 +157,23 @@ select - sum(ss.charging_degree) chargingDegree, - sum(ss.charging_time) chargingTime, - sum(ss.charging_number) chargingNumber, - sum(ss.power_price) powerPrice, - sum(ss.service_price) servicePrice, - sum(ss.total_price) totalPrice, - sum(ss.act_price) actPrice, - sum(ss.act_power_price) actPowerPrice, - sum(ss.act_service_price) actServicePrice, - sum(ss.promotion_discount) promotionDiscount, - sum(ss.internet_commission) internetCommission, - sum(ss.internet_svc_commission) internetSvcCommission, - sum(ss.internet_degree_commission) internetDegreeCommission, - sum(ss.platform_commission) platformCommission, - sum(ss.platform_svc_commisssion) platformSvcCommisssion, - sum(ss.operation_commission) operationCommission, - sum(ss.operation_svc_commission) operationSvcCommission, + format(sum(ss.charging_degree), 2) chargingDegree, + format(sum(ss.charging_time), 2) chargingTime, + format(sum(ss.charging_number), 2) chargingNumber, + format(sum(ss.power_price), 2) powerPrice, + format(sum(ss.service_price), 2) servicePrice, + format(sum(ss.total_price), 2) totalPrice, + format(sum(ss.act_price), 2) actPrice, + format(sum(ss.act_power_price), 2) actPowerPrice, + format(sum(ss.act_service_price), 2) actServicePrice, + format(sum(ss.promotion_discount), 2) promotionDiscount, + format(sum(ss.internet_commission), 2) internetCommission, + format(sum(ss.internet_svc_commission), 2) internetSvcCommission, + format(sum(ss.internet_degree_commission), 2) internetDegreeCommission, + format(sum(ss.platform_commission), 2) platformCommission, + format(sum(ss.platform_svc_commisssion), 2) platformSvcCommisssion, + format(sum(ss.operation_commission), 2) operationCommission, + format(sum(ss.operation_svc_commission), 2) operationSvcCommission, op.name operatorName, DATE_FORMAT(ss.create_time,'%Y-%m-%d') createTime from xhpc_statistics_station as ss @@ -261,23 +261,23 @@ select - sum(ss.charging_degree) chargingDegree, - sum(ss.charging_time) chargingTime, - sum(ss.charging_number) chargingNumber, - sum(ss.power_price) powerPrice, - sum(ss.service_price) servicePrice, - sum(ss.total_price) totalPrice, - sum(ss.act_price) actPrice, - sum(ss.act_power_price) actPowerPrice, - sum(ss.act_service_price) actServicePrice, - sum(ss.promotion_discount) promotionDiscount, - sum(ss.internet_commission) internetCommission, - sum(ss.internet_svc_commission) internetSvcCommission, - sum(ss.internet_degree_commission) internetDegreeCommission, - sum(ss.platform_commission) platformCommission, - sum(ss.platform_svc_commisssion) platformSvcCommisssion, - sum(ss.operation_commission) operationCommission, - sum(ss.operation_svc_commission) operationSvcCommission, + format(sum(ss.charging_degree), 2) chargingDegree, + format(sum(ss.charging_time), 2) chargingTime, + format(sum(ss.charging_number), 2) chargingNumber, + format(sum(ss.power_price), 2) powerPrice, + format(sum(ss.service_price), 2) servicePrice, + format(sum(ss.total_price), 2) totalPrice, + format(sum(ss.act_price), 2) actPrice, + format(sum(ss.act_power_price), 2) actPowerPrice, + format(sum(ss.act_service_price), 2) actServicePrice, + format(sum(ss.promotion_discount), 2) promotionDiscount, + format(sum(ss.internet_commission), 2) internetCommission, + format(sum(ss.internet_svc_commission), 2) internetSvcCommission, + format(sum(ss.internet_degree_commission), 2) internetDegreeCommission, + format(sum(ss.platform_commission), 2) platformCommission, + format(sum(ss.platform_svc_commisssion), 2) platformSvcCommisssion, + format(sum(ss.operation_commission), 2) operationCommission, + format(sum(ss.operation_svc_commission), 2) operationSvcCommission, cs.name chargingStationName, te.name terminalName, DATE_FORMAT(ss.create_time,'%Y-%m-%d') createTime @@ -422,23 +422,23 @@ select - sum(ss.charging_degree) chargingDegree, - sum(ss.charging_time) chargingTime, - sum(ss.charging_number) chargingNumber, - sum(ss.power_price) powerPrice, - sum(ss.service_price) servicePrice, - sum(ss.total_price) totalPrice, - sum(ss.act_price) actPrice, - sum(ss.act_power_price) actPowerPrice, - sum(ss.act_service_price) actServicePrice, - sum(ss.promotion_discount) promotionDiscount, - sum(ss.internet_commission) internetCommission, - sum(ss.internet_svc_commission) internetSvcCommission, - sum(ss.internet_degree_commission) internetDegreeCommission, - sum(ss.platform_commission) platformCommission, - sum(ss.platform_svc_commisssion) platformSvcCommisssion, - sum(ss.operation_commission) operationCommission, - sum(ss.operation_svc_commission) operationSvcCommission, - IF(SUM(iu.name) IS NULL,ss.charging_mode, iu.name) as internetUserName, + format(sum(ss.charging_degree), 2) chargingDegree, + format(sum(ss.charging_time), 2) chargingTime, + format(sum(ss.charging_number), 2) chargingNumber, + format(sum(ss.power_price), 2) powerPrice, + format(sum(ss.service_price), 2) servicePrice, + format(sum(ss.total_price), 2) totalPrice, + format(sum(ss.act_price), 2) actPrice, + format(sum(ss.act_power_price), 2) actPowerPrice, + format(sum(ss.act_service_price), 2) actServicePrice, + format(sum(ss.promotion_discount), 2) promotionDiscount, + format(sum(ss.internet_commission), 2) internetCommission, + format(sum(ss.internet_svc_commission), 2) internetSvcCommission, + format(sum(ss.internet_degree_commission), 2) internetDegreeCommission, + format(sum(ss.platform_commission), 2) platformCommission, + format(sum(ss.platform_svc_commisssion), 2) platformSvcCommisssion, + format(sum(ss.operation_commission), 2) operationCommission, + format(sum(ss.operation_svc_commission), 2) operationSvcCommission, + IF(iu.name IS NULL,ss.charging_mode, iu.name) as internetUserName, DATE_FORMAT(ss.create_time,'%Y-%m-%d') createTime from xhpc_statistics_station as ss left join xhpc_internet_user as iu on iu.internet_user_id = ss.charging_mode