diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/CheckChargeOrderController.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/CheckChargeOrderController.java index d60e5ef8..14e2f34f 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/CheckChargeOrderController.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/CheckChargeOrderController.java @@ -116,8 +116,8 @@ public class CheckChargeOrderController { System.out.println("==========sss==============="+s); - String date= "NR0oe4La+0SLizVoKCDfRkj37avo59qzZBUm7BFSmU+XA81uaP2614Vjbb7VvhRRumS4LwHu6CR981cKMxNM5xCGT+yjGgDwRG4B6xnEJ9upiW7iathKmMrN3lZBkvzstkKcx502kVSMy4x82RBkHUio1KCXoCPIyj9WxpgkJJKnHXaZKrk1Qd6G3xn3MGHvBimnbKssC/bJyD+F9sEp61r5oVPVym7UGSr1GoK9A5sR+j4hrOHeLtlPxgcdJgAuFSXBT75wP2WF1YRsfYppCHh/ERHhIApQ6ym1iAJOE/El/3wehkHLZQAzEMBfEIvtPnpbt9KUItOv16i/GkRR+lrcdcqgrnArOPfKbexWVuqb1zX6/qlQYlQ4yQANrzJ9Dm3KRKtH/sxZ+Uve8d9pJiTAavKpdI9zJwcdywZPOjedoj5X/5GS3bnP/xVofwVgX2l5Vt6Jf4CICDtTHkLREy5ZbwqN5vNPyf+PeF+wp+zCVCXOqBxi+P3hwPVMf/Odm0hEj8byL4ctNmbQZw5A7JcWTrINDOtoeR/C1OYDT+WDj7ZfznJ9y15JllcBAqTFG5GLScvA7kCh4Sk669r6QMbmQek1HYEftVzg8Uh+y+/ItWM1bPfvMUZ9QyyeGJlzWQr/YbxbXdoMqc6STuYkqiLarFUnP3y7lPvomitrdXHub2r9iciCvCDM+WH0WFTFM7rRWdg23D7LahcpBGgObVQpgxuXmnr0SQCVvHKr0Xj6l1o4N/45AAn7JSWPGjclBUNcVOiz1LqVDJaswb8Ymbfgcxqf99Ho0d7nAUvmon4C6IFN3/mmgFSDamGxvIXUTMUtJ9Arj+HP7YQMPGpHgO4ULszzBmh4dR2EQgL4PMSY2smXSzE4DBWYTQ8odMZChm2b5gU/8SBNC89UZFEXNj9/V/J1QqGYiCC18Sp+UNypjpr52MbAV7VDqRWUaovUXnsbnFa8jPHiHOXX9zfvuRuLI22mWLdre4gvmeYBgJ9zweHFdGMBLw7pfKl57/d9GkYP/8yC0QDbtBljd9e605INsY4Va0UJi0oDc1YMKwsXdIbh5zXnN7F0jhOd5uK6rOuBvY5Xo2cvjp2DIUNUsNavaLhkPT9bwmFPICINx1MQkLH4cDB+FYUut7yxFUltGPkd7Vw15nVmFs3ZtCI/OQ2FqX6KtY2aBjlqMc1FG5oQecjLYclgQcWdMLe3jqMqYvM7hGZF1orC65nbztiekl6XQO+pIMcrpkXfjZ9andFK0mBCHLOdUrgvbQeC0ifRdJY+VIfweB+H5IF2934tSF3nD4D+KvLkeg6aqyBFomtw4OWxROmvPF7T7zQWzWETRCDo0pVrBOWKgfByXpsA3BCc/mN7sjJhZTxVcT9OIIJKdBceufAROGtVTmpiVInlUqNRgseT85w6n6PYSNu62jqjLWXP1bFvCRdxHIXn49RfeQMXs8/lAts6DEmD18fU31vtxcWSxAO2W0UAH9YTJuK96Qt8zman1QLiO2U6PRA="; - String s2 = decryptString(date, "8LpncubmWiPCzY3V", "av6A8QdnRaVRMXu6"); + String date= "3VW7G53nG+8tIdKvSR9f2cGAjCHtSITxHxd73DXf6hiepOujG1Jidj3pIef3uOXVshhdLhoWPfWtkGDndjLrQ4CNezfdrXXIi1V2NlPfBpE="; + String s2 = decryptString(date, "ojs67l46z3f7rhok", "tet9swfkyojkhaos"); System.out.println("===111=======sss==============="+s2); }catch (Exception e){ diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryStartChargeController.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryStartChargeController.java index bcb77e22..513d6443 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryStartChargeController.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryStartChargeController.java @@ -142,14 +142,14 @@ public class QueryStartChargeController extends CoreDispatcher { } } - if("0".equals(resp.getRet())){ - String finalOrderNo = orderNo; - CompletableFuture.runAsync(()->{ - System.out.println(">>> 异步回复 <<<"); - processRequest(pushOrder,startChargeRequest.getStartChargeSeq(), finalOrderNo); - },asyncExecutor); - } - System.out.println(">>> 回复启动结果 <<<"); +// if("0".equals(resp.getRet())){ +// String finalOrderNo = orderNo; +// CompletableFuture.runAsync(()->{ +// System.out.println(">>> 异步回复 <<<"); +// processRequest(pushOrder,startChargeRequest.getStartChargeSeq(), finalOrderNo); +// },asyncExecutor); +// } +// System.out.println(">>> 回复启动结果 <<<"); return resp; } diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryStopChargeController.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryStopChargeController.java index a73fba3c..8f17d545 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryStopChargeController.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryStopChargeController.java @@ -142,13 +142,13 @@ public class QueryStopChargeController extends CoreDispatcher { commonResponse.setData(data); } - if("0".equals(commonResponse.getRet())){ - String finalOrderNo = orderNo; - CompletableFuture.runAsync(()->{ - processRequest(finalOrderNo); - },asyncExecutor); - } - System.out.println(">>> 回复停止结果 <<<"); +// if("0".equals(commonResponse.getRet())){ +// String finalOrderNo = orderNo; +// CompletableFuture.runAsync(()->{ +// processRequest(finalOrderNo); +// },asyncExecutor); +// } +// System.out.println(">>> 回复停止结果 <<<"); return commonResponse; } diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/cdjgpc/notification/CDConnectorChargeStatusInfoTask.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/cdjgpc/notification/CDConnectorChargeStatusInfoTask.java index b69bff18..15ad5d8d 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/cdjgpc/notification/CDConnectorChargeStatusInfoTask.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/cdjgpc/notification/CDConnectorChargeStatusInfoTask.java @@ -61,7 +61,7 @@ public class CDConnectorChargeStatusInfoTask extends CoreDispatcher { * 清除5天前数据 * 实时数据没40秒 */ - //@Scheduled(fixedDelay = 1000 * 120) + @Scheduled(fixedDelay = 1000 * 120) public void runYu() throws Exception{ Collection realtimeOrder = REDIS.keys("orderOutpu:*"); for (String okey : realtimeOrder) { diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/cdjgpc/notification/CDNotificationStationStatusTask.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/cdjgpc/notification/CDNotificationStationStatusTask.java index d3fffdc2..4ec6f251 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/cdjgpc/notification/CDNotificationStationStatusTask.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/cdjgpc/notification/CDNotificationStationStatusTask.java @@ -51,8 +51,6 @@ public class CDNotificationStationStatusTask extends CoreDispatcher { private XhpcTerminalRepository terminalRepository; //都开放 @Scheduled(fixedRate = 1000 * 180) - - protected void run() throws IOException { Collection stationTerminalKeys = REDIS.keys("stationTerminalStatus:*"); diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationChargeOrderInfoTask.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationChargeOrderInfoTask.java index 6a3403ba..7b46eeb1 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationChargeOrderInfoTask.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationChargeOrderInfoTask.java @@ -53,7 +53,6 @@ public class NotificationChargeOrderInfoTask extends CoreDispatcher { List authSecretTokenList = authSecretTokenRepository.findBySecretTokenType(SECRET_TOKEN_TYPE_OUT); List xhpcHistoryOrderList =xhpcHistoryOrderRepository.findByConfirmResultAndSource(-1, 1); for (XhpcHistoryOrder horder : xhpcHistoryOrderList) { - logger.info("==============推送开始=======111================"+horder.getSerialNumber()+"========11111==========="+horder.getInternetSerialNumber()); if("765367656".equals(horder.getInternetSerialNumber().substring(0, 9))){ continue; } @@ -66,7 +65,6 @@ public class NotificationChargeOrderInfoTask extends CoreDispatcher { xhpcHistoryOrderRepository.save(horder); // mending } } - logger.info("==============推送开始=====222=================="+horder.getSerialNumber()+"========2222==========="+horder.getInternetSerialNumber()); if (authSecretToken.getOperatorId3irdpty().equals(operatorId3rdptyEvcs)) { ChargeOrderInfo chargeOrderInfo = new ChargeOrderInfo(horder); final ChargeOrderInfoResponse pushResp = notify(chargeOrderInfo, authSecretToken); diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationStartChargeResultTask.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationStartChargeResultTask.java index fb518a9b..316962b6 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationStartChargeResultTask.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationStartChargeResultTask.java @@ -36,7 +36,7 @@ public class NotificationStartChargeResultTask extends CoreDispatcher { */ //(evcs 放开 30 秒， 测试平台开放 15秒) //都开放 - @Scheduled(cron = "0/15 * * * * ? ") + @Scheduled(cron = "0/30 * * * * ? ") public void run() throws IOException { //Getting the charge orders which from 3rd. @@ -49,7 +49,6 @@ public class NotificationStartChargeResultTask extends CoreDispatcher { } Integer startChargeNotificationStat = (Integer) pushOrder.get("startChargeNotificationStat"); if (null != startChargeNotificationStat && 1 != startChargeNotificationStat && startChargeNotificationStat <= 20) { - logger.info("===============启动推送开始============================"+pushOrderKey); if(pushOrder.get("internetSerialNumber")==null || "".equals((String) pushOrder.get("internetSerialNumber"))){ continue; } @@ -87,7 +86,6 @@ public class NotificationStartChargeResultTask extends CoreDispatcher { CommonRequest commonRequest = new CommonRequest<>(); commonRequest.setData(data); String responseBody = ok(commonRequest, "/notification_start_charge_result", authSecretTokenOut); - logger.info("===============启动推送结果=====responseBody======================="+responseBody+"=================orderNo================="+orderNo); NotificationStartStopChargeResultResponse notificationStartStopChargeResultResponse =DTOJsonHelper.parseResponseData(responseBody,NotificationStartStopChargeResultResponse.class, authSecretTokenOut); if (null != notificationStartStopChargeResultResponse) { @@ -121,8 +119,6 @@ public class NotificationStartChargeResultTask extends CoreDispatcher { String s = Aes128Cbc.decryptString(data, "4d593ae4f74f2798", "0802395fab41d38c"); - - System.out.println("==========s========="+s); }catch (Exception e){ } diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationStationStatusTask.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationStationStatusTask.java index 77d95747..86e0f45b 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationStationStatusTask.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationStationStatusTask.java @@ -49,7 +49,6 @@ public class NotificationStationStatusTask extends CoreDispatcher { @Resource private XhpcTerminalRepository terminalRepository; - //推送不开放(evcs 放开) //都开放 9009 40 9099 60 @Scheduled(cron = "0 0/1 * * * ? ") protected void run() throws IOException { diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/kuaidian/NotificationOvertimeOrderInfoTask.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/kuaidian/NotificationOvertimeOrderInfoTask.java index cf3b1a34..d639fdb3 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/kuaidian/NotificationOvertimeOrderInfoTask.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/kuaidian/NotificationOvertimeOrderInfoTask.java @@ -43,7 +43,7 @@ public class NotificationOvertimeOrderInfoTask extends CoreDispatcher { private final Logger logger = LoggerFactory.getLogger(NotificationOvertimeOrderInfoTask.class); //9009开放定时任务 9099不开放 - @Scheduled(fixedRate = 1000 * 30) + //@Scheduled(fixedRate = 1000 * 30) public void run() throws IOException { AuthSecretToken authSecretTokenOut = diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/kuaidian/NotificationStationInfoKuaiDianTask.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/kuaidian/NotificationStationInfoKuaiDianTask.java index 856a6b1d..1ded5411 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/kuaidian/NotificationStationInfoKuaiDianTask.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/kuaidian/NotificationStationInfoKuaiDianTask.java @@ -14,6 +14,7 @@ import com.xhpc.evcs.utils.JSONUtil; import lombok.extern.slf4j.Slf4j; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import javax.annotation.Resource; @@ -38,8 +39,8 @@ public class NotificationStationInfoKuaiDianTask extends CoreDispatcher { private final Logger logger = LoggerFactory.getLogger(NotificationStationInfoKuaiDianTask.class); - //9099开放定时任务 9009不开放 - //@Scheduled(cron = "0 50 0 1/1 * ? ") + //9009开放定时任务 9099不开放 + @Scheduled(cron = "0 50 0 1/1 * ? ") public void run() throws IOException { try{ List xhpcStationInternetBlacklist = xhpcStationInternetBlacklistRepo.findByInternetUserId(1L); diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/xindiantu/NotificationPlaceholderOrderInfoTask.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/xindiantu/NotificationPlaceholderOrderInfoTask.java index 5fb41225..98b99b5c 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/xindiantu/NotificationPlaceholderOrderInfoTask.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/xindiantu/NotificationPlaceholderOrderInfoTask.java @@ -38,7 +38,7 @@ public class NotificationPlaceholderOrderInfoTask extends CoreDispatcher { private final Logger logger = LoggerFactory.getLogger(NotificationPlaceholderOrderInfoTask.class); //9009开放定时任务 9099不开放 - @Scheduled(fixedRate = 1000 * 30) + //@Scheduled(fixedRate = 1000 * 30) public void run() throws IOException { AuthSecretToken authSecretTokenOut = diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/xindiantu/NotificationPlaceholderRulesTask.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/xindiantu/NotificationPlaceholderRulesTask.java index 1f878882..a1315453 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/xindiantu/NotificationPlaceholderRulesTask.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/xindiantu/NotificationPlaceholderRulesTask.java @@ -43,7 +43,7 @@ public class NotificationPlaceholderRulesTask extends CoreDispatcher { private final Logger logger = LoggerFactory.getLogger(NotificationPlaceholderRulesTask.class); //9009开放定时任务 9099不开放 - @Scheduled(cron = "0 0 3 1/1 * ? ") + //@Scheduled(cron = "0 0 3 1/1 * ? ") public void run() throws IOException { AuthSecretToken authSecretTokenOut = authSecretTokenRepository.findByOperatorId3irdptyAndOperatorIdAndSecretTokenType("MA25CNM38", "MA6DFCTD5", SECRET_TOKEN_TYPE_OUT).orElse(null); //todo diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/xindiantu/NotificationStationInfoXinDianTuTask.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/xindiantu/NotificationStationInfoXinDianTuTask.java index ddfcb213..6aa7aad7 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/xindiantu/NotificationStationInfoXinDianTuTask.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/xindiantu/NotificationStationInfoXinDianTuTask.java @@ -14,6 +14,7 @@ import com.xhpc.evcs.utils.JSONUtil; import lombok.extern.slf4j.Slf4j; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import javax.annotation.Resource; @@ -38,8 +39,8 @@ public class NotificationStationInfoXinDianTuTask extends CoreDispatcher { private final Logger logger = LoggerFactory.getLogger(NotificationStationInfoXinDianTuTask.class); - //9099开放定时任务 9009不开放 - //@Scheduled(cron = "0 40 0 1/1 * ? ") + //9009开放定时任务 9099不开放 + @Scheduled(cron = "0 40 0 1/1 * ? ") public void run() throws IOException { try{ List xhpcStationInternetBlacklist = xhpcStationInternetBlacklistRepo.findByInternetUserId(3L); diff --git a/ruoyi-auth/src/main/java/com/xhpc/auth/controller/TokenController.java b/ruoyi-auth/src/main/java/com/xhpc/auth/controller/TokenController.java index 61bad08c..6aa6c0c8 100644 --- a/ruoyi-auth/src/main/java/com/xhpc/auth/controller/TokenController.java +++ b/ruoyi-auth/src/main/java/com/xhpc/auth/controller/TokenController.java @@ -187,11 +187,11 @@ public class TokenController extends BaseController HashMap paramMap = new HashMap<>(); paramMap.put("code", random); paramMap.put("phone", phone); - paramMap.put("content", "【小华充电】您的验证码是：" + random + "，有效期为5分钟。如非本人操作，可不用理会。"); + paramMap.put("content", "【翔桦充电】您的验证码是：" + random + "，有效期为5分钟。如非本人操作，可不用理会。"); com.aliyun.dysmsapi20170525.Client client = createClient(); com.aliyun.dysmsapi20170525.models.SendSmsRequest sendSmsRequest = new com.aliyun.dysmsapi20170525.models.SendSmsRequest() - .setSignName("小华充电") + .setSignName("翔桦充电") .setTemplateCode("SMS_226786362") .setTemplateParam("{\"code\":\""+random+"\"}") .setPhoneNumbers(phone); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/task/XhpcTenantTask.java b/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/task/XhpcTenantTask.java index 0bdb6a54..7a12b795 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/task/XhpcTenantTask.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/task/XhpcTenantTask.java @@ -57,7 +57,7 @@ public class XhpcTenantTask { HashMap paramMap = new HashMap<>(); paramMap.put("phone", domain.getContactNumber()); paramMap.put("tenantName", domain.getTenantName()); - paramMap.put("content", "【小华充电】尊敬的租户，您申请的租户(租户名称: " + domain.getTenantName() + ")还有15天到期，请联系业务人员进行续费。"); + paramMap.put("content", "【翔桦充电】尊敬的租户，您申请的租户(租户名称: " + domain.getTenantName() + ")还有15天到期，请联系业务人员进行续费。"); smsService.sendNotice(paramMap); } } diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/StationLogServiceImpl.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/StationLogServiceImpl.java index 90700ae6..5a3a47dc 100644 --- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/StationLogServiceImpl.java +++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/StationLogServiceImpl.java @@ -23,7 +23,7 @@ public class StationLogServiceImpl extends BaseService implements StationLogServ @Resource XhpcChargingStationMapper stationMapper; - @Autowired + @Resource private TokenService tokenService; @Override @@ -56,7 +56,7 @@ public class StationLogServiceImpl extends BaseService implements StationLogServ }else{ startPage(); params.put("type",2); - params.put("operatorIdYu",sysUserId); + params.put("operatorId",sysUserId); list = stationMapper.selectXhpcChargingStationList(params); } }else{ diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/WorkOrderServiceImpl.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/WorkOrderServiceImpl.java index 78f158d6..7458f102 100644 --- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/WorkOrderServiceImpl.java +++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/WorkOrderServiceImpl.java @@ -344,7 +344,7 @@ public class WorkOrderServiceImpl implements WorkOrderService { HashMap paramMap = new HashMap<>(); paramMap.put("orderNo", orderId); paramMap.put("phone", phoneList); - paramMap.put("content", "【小华充电】您好，您有新的工单(工单号:" + orderId + ")待处理，请及时登陆后台查看并处理，谢谢。"); + paramMap.put("content", "【翔桦充电】您好，您有新的工单(工单号:" + orderId + ")待处理，请及时登陆后台查看并处理，谢谢。"); R r = smsService.sendNotice(paramMap); XhpcWorkOrderPushMessageDomain messageDomain = new XhpcWorkOrderPushMessageDomain(); diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcClearingBankServiceImpl.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcClearingBankServiceImpl.java index 1a050fba..5cf24886 100644 --- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcClearingBankServiceImpl.java +++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcClearingBankServiceImpl.java @@ -129,7 +129,7 @@ public class XhpcClearingBankServiceImpl implements XhpcClearingBankService { HashMap paramMap = new HashMap<>(); paramMap.put("phone", phone); paramMap.put("code", random); - paramMap.put("content", "【小华充电】您的动态码为：" + random + "，您正在进行提现到银行账户操作，如非本人操作，请忽略本短信！"); + paramMap.put("content", "【翔桦充电】您的动态码为：" + random + "，您正在进行提现到银行账户操作，如非本人操作，请忽略本短信！"); smsService.sendNotice(paramMap); String key = "opcash:" + phone; diff --git a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcHistoryOrderMapper.xml b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcHistoryOrderMapper.xml index 59bd35ea..2af13af5 100644 --- a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcHistoryOrderMapper.xml +++ b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcHistoryOrderMapper.xml @@ -94,42 +94,96 @@ + + + + + + + + insert into xhpc_placeholder_time_order @@ -679,4 +690,9 @@ from xhpc_placeholder_time where placeholder_id=#{placeholderId} and del_flag=0 + + + update xhpc_placeholder_order set type=2 where TIMESTAMPDIFF(MINUTE, IFNULL(start_time, NOW()), NOW()) > 720 and (status=1 or status=2) and type =0 + + diff --git a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/AlipayPaymentController.java b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/AlipayPaymentController.java index 4752ed64..38c19433 100644 --- a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/AlipayPaymentController.java +++ b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/AlipayPaymentController.java @@ -161,7 +161,7 @@ public class AlipayPaymentController { "\"product_code\":\"JSAPI_PAY\"," + "\"op_app_id\":\"2021002156615717\"," + "\"total_amount\":"+amount+"," + - "\"subject\":\"小华充电\"," + + "\"subject\":\"翔桦充电\"," + "\"timeout_express\":\"30m\"," + "\"passback_params\":\""+encode+"\"," + "\"buyer_id\":\""+openid+"\"" + diff --git a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcRefundAuditController.java b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcRefundAuditController.java index 096547cf..bf94ac92 100644 --- a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcRefundAuditController.java +++ b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcRefundAuditController.java @@ -771,7 +771,7 @@ public class XhpcRefundAuditController extends BaseController { //发送短信 HashMap paramMap = new HashMap<>(); paramMap.put("phone", phone); - paramMap.put("content", "【小华充电】退款-尊敬的用户，当前退款人数较多，申请退款失败，请您重新提交申请！"); + paramMap.put("content", "【翔桦充电】退款-尊敬的用户，当前退款人数较多，申请退款失败，请您重新提交申请！"); smsService.sendNotice(paramMap); }catch (Exception e){ diff --git a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/impl/XhpcRefundOriginalOrderServiceImpl.java b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/impl/XhpcRefundOriginalOrderServiceImpl.java index 82c1c981..4babe417 100644 --- a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/impl/XhpcRefundOriginalOrderServiceImpl.java +++ b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/impl/XhpcRefundOriginalOrderServiceImpl.java @@ -1184,8 +1184,8 @@ public class XhpcRefundOriginalOrderServiceImpl implements IXhpcRefundOriginalOr HashMap paramMap = new HashMap<>(); paramMap.put("number",refundOrder.getRefundOrderId()+""); paramMap.put("phone", "18123374652"); - paramMap.put("content", "【小华充电订单异常】尊敬的管理员，用户退款订单："+refundOrder.getRefundOrderId()+"，有问题请速速查看。"); - smsService.sendNotice(paramMap); + paramMap.put("content", "【翔桦充电】尊敬的管理员，用户退款订单："+refundOrder.getRefundOrderId()+"，有问题请速速查看。"); + //smsService.sendNotice(paramMap); } iXhpcRefundOrderService.update(refundOrder); } @@ -1516,8 +1516,8 @@ public class XhpcRefundOriginalOrderServiceImpl implements IXhpcRefundOriginalOr public void getTestSms(String number){ HashMap paramMap = new HashMap<>(); paramMap.put("phone", "18123374652"); - paramMap.put("content", "【小华充电订单异常】尊敬的管理员，用户退款订单："+number+"，有问题请速速查看。"); - smsService.sendNotice(paramMap); + paramMap.put("content", "【翔桦充电】尊敬的管理员，用户退款订单："+number+"，有问题请速速查看。"); + // smsService.sendNotice(paramMap); } @Override diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RealtimeDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RealtimeDataLogic.java index 017252c6..6892bffa 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RealtimeDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RealtimeDataLogic.java @@ -216,7 +216,7 @@ public class RealtimeDataLogic implements ServiceLogic { HashMap paramMap = new HashMap<>(); paramMap.put("money", "5"); paramMap.put("phone", tel); - paramMap.put("content", "【小华充电】尊敬的用户，你的账户余额小于5元,为不影响您的正常充电，请您尽快充值交费，谢谢。"); + paramMap.put("content", "【翔桦充电】尊敬的用户，你的账户余额小于5元,为不影响您的正常充电，请您尽快充值交费，谢谢。"); smsService.sendNotice(paramMap); cacheOrder.put("lt5alerted", "true"); } diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcInvoiceServiceImpl.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcInvoiceServiceImpl.java index f8794550..daa5ac65 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcInvoiceServiceImpl.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcInvoiceServiceImpl.java @@ -166,7 +166,7 @@ public class XhpcInvoiceServiceImpl implements XhpcInvoiceService { throw new RuntimeException("在阿里云上无法找到该文件，请检查上传的图片路径是否完整或有误"); } try { - MailUtil.send(receiveEmail, "【小华充电】电子发票", "邮件来自小华充电", false, electricInvoiceFile); + MailUtil.send(receiveEmail, "【翔桦充电】电子发票", "邮件来自翔桦充电", false, electricInvoiceFile); } catch (Exception e) { System.out.println(e.getMessage()); return Boolean.FALSE;