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

修改邮件配置，统计修改

Browse Source
This commit is contained in:
yuyang 2022-04-01 11:00:18 +08:00
parent d814c0f376
commit f29b9c1672
5 changed files with 197 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/controller/XhpcInvoiceController.java
View File

@ -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");

4
xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/service/impl/XhpcInvoiceServiceImpl.java
View File

@ -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) {

3
xhpc-modules/xhpc-invoice/src/main/resources/config/mail.setting
View File

@ -1,4 +1,5 @@
# 发件人（必须正确，否则发送失败）
from = coml_aaron@163.com
# 密码（注意，某些邮箱需要为SMTP服务单独设置密码，详情查看相关帮助）
pass = DRTYHUCGNKPOFRVE
pass = DRTYHUCGNKPOFRVE
port = 465

34
xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcStatisticsServiceImpl.java
View File

@ -511,23 +511,23 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati
}
private Map<String, Object> getStatistics(String time){
Map<String, Object> 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;
}

276
xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcStatisticsMapper.xml
View File

@ -38,23 +38,23 @@
<select id="getTimeIntervalPage" resultType="map">
select
sum(act_price) actPrice,
sum(act_power_price) actPowerPrice,
sum(act_service_price) actServicePrice,
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(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(act_price), 2) actPrice,
format(sum(act_power_price), 2) actPowerPrice,
format(sum(act_service_price), 2) actServicePrice,
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(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,
status,
case when status=1 then "00:00-01:00"
when status=2 then "01:00-02:00"
@ -110,23 +110,23 @@
<select id="getDateIntervalPage" resultType="map">
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 id="getStationIntervalPage" resultType="map">
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,
op.name operatorName,
DATE_FORMAT(ss.create_time,'%Y-%m-%d') createTime
@ -213,23 +213,23 @@
<select id="getOperatorIntervalPage" resultType="map">
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 id="getInternetUserIntervalPage" resultType="map">
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,
iu.name internetUserName,
DATE_FORMAT(ss.create_time,'%Y-%m-%d') createTime
from xhpc_statistics_station as ss
@ -306,23 +306,23 @@
<select id="getTerminalIntervalPage" resultType="map">
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 id="getMechanismPage" resultType="map">
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,
source as source,
CASE
@ -450,7 +450,7 @@
"未知用户"
END sourceName
from xhpc_statistics_station
where del_flag=0 and type=2
where del_flag=0 and type=2 and source !=0 and source !=1
<if test="source !=null and source !=-1">
and source=#{source}
</if>
@ -872,24 +872,24 @@
<select id="getSumSourceList" resultType="map">
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