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 2021-10-22 18:10:47 +08:00
parent 794070a57a
commit c14543c9ae
5 changed files with 52 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-auth/src/main/java/com/xhpc/auth/controller/TokenController.java
View File

@ -69,12 +69,13 @@ public class TokenController
{ {
//验证 输入的验证码 //验证 输入的验证码
String captcha = redisService.getCacheObject("pcToken:" + form.getUsername()); String captcha = redisService.getCacheObject("pcToken:" + form.getUsername());
if (!form.getPassword().equalsIgnoreCase(captcha)) { if (!form.getPassword().equals(captcha)) {
R.fail(HttpStatus.ERROR_STATUS, "验证码错误"); return R.fail(HttpStatus.ERROR_STATUS, "验证码错误");
} }
// 用户登录 // 用户登录
LoginUser userInfo = sysLoginService.login(form.getUsername(), "123456",1); LoginUser userInfo = sysLoginService.login(form.getUsername(), "123456",1);
// 获取登录token // 获取登录token
redisService.deleteObject("pcToken:"+form.getUsername());
return R.ok(tokenService.createToken(userInfo)); return R.ok(tokenService.createToken(userInfo));
} }

6
ruoyi-auth/src/main/java/com/xhpc/auth/service/SysLoginService.java
View File

@ -91,9 +91,11 @@ public class SysLoginService
throw new BaseException("登陆地址错误，请在管理员界面登陆"); throw new BaseException("登陆地址错误，请在管理员界面登陆");
} }
}else{ }else{
if(user.getDataPowerType()!=1||user.getDataPowerType()!=2 ){ if(user.getDataPowerType()==1 ||user.getDataPowerType()==2){
}else{
remoteLogService.saveLogininfor(username, Constants.LOGIN_FAIL, "登陆地址错误"); remoteLogService.saveLogininfor(username, Constants.LOGIN_FAIL, "登陆地址错误");
throw new BaseException("登陆地址错误，请在管理员界面登陆"); throw new BaseException("登陆地址错误，请在运营商界面登陆");
} }
} }

2
xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcPileOrderController.java
View File

@ -317,7 +317,7 @@ public class XhpcPileOrderController extends BaseController {
xhpcChargeOrder.setChargingDegree(divide); xhpcChargeOrder.setChargingDegree(divide);
xhpcChargeOrder.setAmountCharged(money); xhpcChargeOrder.setAmountCharged(money);
String stopReason = cacheOrderData.getStopReason(); String stopReason = cacheOrderData.getStopReason();
xhpcChargeOrder.setErroRemark(stopReason); xhpcChargeOrder.setRemark(stopReason);
xhpcChargeOrder.setUpdateTime(date); xhpcChargeOrder.setUpdateTime(date);
xhpcChargeOrder.setStatus(status); xhpcChargeOrder.setStatus(status);
XhpcHistoryOrder xhpcHistoryOrder = new XhpcHistoryOrder(); XhpcHistoryOrder xhpcHistoryOrder = new XhpcHistoryOrder();

60
xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcRealTimeOrderServiceImpl.java
View File

@ -250,22 +250,22 @@ public class XhpcRealTimeOrderServiceImpl implements IXhpcRealTimeOrderService {
if("1".equals(state)){ if("1".equals(state)){
//总金额 //总金额
if(fan){ if(fan){
promotionDiscount=money.multiply(discount); promotionDiscount=money.multiply(discount).setScale(2,BigDecimal.ROUND_DOWN);
actPrice = money.subtract(promotionDiscount); actPrice = money.subtract(promotionDiscount);
surplusPowerPrice = surplusPowerPrice.subtract(promotionDiscount.divide(new BigDecimal(2))); surplusPowerPrice = surplusPowerPrice.subtract(promotionDiscount.divide(new BigDecimal(2),BigDecimal.ROUND_DOWN));
surplusServicePrice= surplusServicePrice.subtract(promotionDiscount.divide(new BigDecimal(2))); surplusServicePrice= surplusServicePrice.subtract(promotionDiscount.divide(new BigDecimal(2),BigDecimal.ROUND_DOWN));
} }
}else if("2".equals(state)){ }else if("2".equals(state)){
if(fan){ if(fan){
//电费 //电费
promotionDiscount =powerPrice.multiply(balance); promotionDiscount =powerPrice.multiply(balance).setScale(2,BigDecimal.ROUND_DOWN);
actPrice = money.subtract(promotionDiscount); actPrice = money.subtract(promotionDiscount);
surplusPowerPrice=surplusPowerPrice.subtract(promotionDiscount); surplusPowerPrice=surplusPowerPrice.subtract(promotionDiscount);
} }
}else if("3".equals(state)){ }else if("3".equals(state)){
if(fan){ if(fan){
//服务费 //服务费
promotionDiscount = servicePrice.multiply(balance); promotionDiscount = servicePrice.multiply(balance).setScale(2,BigDecimal.ROUND_DOWN);
actPrice = money.subtract(promotionDiscount); actPrice = money.subtract(promotionDiscount);
surplusServicePrice =surplusServicePrice.subtract(promotionDiscount); surplusServicePrice =surplusServicePrice.subtract(promotionDiscount);
} }
@ -291,31 +291,31 @@ public class XhpcRealTimeOrderServiceImpl implements IXhpcRealTimeOrderService {
if(operatorMessage.get("maintenanceCommissionRate") !=null && operatorMessage.get("commissionType") !=null && operatorMessage.get("platformCommissionRate") !=null){ if(operatorMessage.get("maintenanceCommissionRate") !=null && operatorMessage.get("commissionType") !=null && operatorMessage.get("platformCommissionRate") !=null){
Integer commissionType = (Integer) operatorMessage.get("commissionType"); Integer commissionType = (Integer) operatorMessage.get("commissionType");
//运维提成 //运维提成
BigDecimal maintenanceCommissionRate = new BigDecimal(operatorMessage.get("maintenanceCommissionRate").toString()).divide(new BigDecimal(100)); BigDecimal maintenanceCommissionRate = new BigDecimal(operatorMessage.get("maintenanceCommissionRate").toString()).divide(new BigDecimal(100),2,BigDecimal.ROUND_DOWN);
//平台提成 //平台提成
BigDecimal platformCommissionRate = new BigDecimal(operatorMessage.get("platformCommissionRate").toString()).divide(new BigDecimal(100)); BigDecimal platformCommissionRate = new BigDecimal(operatorMessage.get("platformCommissionRate").toString()).divide(new BigDecimal(100),2,BigDecimal.ROUND_DOWN);
//提成类型（0总金额提成 1服务费提成） //提成类型（0总金额提成 1服务费提成）
if(commissionType==0){ if(commissionType==0){
BigDecimal multiply1 = surplusPowerPrice.multiply(platformCommissionRate); BigDecimal multiply1 = surplusPowerPrice.multiply(platformCommissionRate).setScale(2,BigDecimal.ROUND_DOWN);
BigDecimal multiply2 = surplusServicePrice.multiply(platformCommissionRate); BigDecimal multiply2 = surplusServicePrice.multiply(platformCommissionRate).setScale(2,BigDecimal.ROUND_DOWN);
platformCommission = multiply1.add(multiply2); platformCommission = multiply1.add(multiply2);
//剩下的钱 //剩下的钱
surplusPowerPrice = surplusPowerPrice.subtract(multiply1); surplusPowerPrice = surplusPowerPrice.subtract(multiply1);
surplusServicePrice = surplusServicePrice.subtract(multiply2); surplusServicePrice = surplusServicePrice.subtract(multiply2);
BigDecimal multiply3 = surplusPowerPrice.multiply(maintenanceCommissionRate); BigDecimal multiply3 = surplusPowerPrice.multiply(maintenanceCommissionRate).setScale(2,BigDecimal.ROUND_DOWN);
BigDecimal multiply4 = surplusServicePrice.multiply(maintenanceCommissionRate); BigDecimal multiply4 = surplusServicePrice.multiply(maintenanceCommissionRate).setScale(2,BigDecimal.ROUND_DOWN);
operationCommission = multiply1.add(multiply2); operationCommission = multiply1.add(multiply2);
//剩下的钱 //剩下的钱
surplusPowerPrice = surplusPowerPrice.subtract(multiply3); surplusPowerPrice = surplusPowerPrice.subtract(multiply3);
surplusServicePrice = surplusServicePrice.subtract(multiply4); surplusServicePrice = surplusServicePrice.subtract(multiply4);
}else if(commissionType==1){ }else if(commissionType==1){
BigDecimal multiply2 = surplusServicePrice.multiply(platformCommissionRate); BigDecimal multiply2 = surplusServicePrice.multiply(platformCommissionRate).setScale(2,BigDecimal.ROUND_DOWN);
platformSvcCommission=multiply2; platformSvcCommission=multiply2;
//剩下的钱 //剩下的钱
surplusServicePrice = surplusServicePrice.subtract(multiply2); surplusServicePrice = surplusServicePrice.subtract(multiply2);
BigDecimal multiply4 = surplusServicePrice.multiply(maintenanceCommissionRate); BigDecimal multiply4 = surplusServicePrice.multiply(maintenanceCommissionRate).setScale(2,BigDecimal.ROUND_DOWN);
operationCommission = multiply4; operationCommission = multiply4;
//剩下的钱 //剩下的钱
surplusServicePrice = surplusServicePrice.subtract(multiply4); surplusServicePrice = surplusServicePrice.subtract(multiply4);
@ -376,21 +376,21 @@ public class XhpcRealTimeOrderServiceImpl implements IXhpcRealTimeOrderService {
xhpcHistoryOrderService.insert(xhpcHistoryOrder); xhpcHistoryOrderService.insert(xhpcHistoryOrder);
//添加流水 //添加流水
//xhpcChargeOrderService.addUserAccountStatement(userId, actPrice.negate(), subtract, xhpcChargeOrder.getChargeOrderId(), 3, date); xhpcChargeOrderService.addUserAccountStatement(userId, actPrice.negate(), subtract, xhpcChargeOrder.getChargeOrderId(), 3, date);
try{ try{
// Map<String, Object> xhpcChargingPile = xhpcChargeOrderService.getXhpcChargingPile(xhpcChargeOrder.getTerminalId()); Map<String, Object> xhpcChargingPile = xhpcChargeOrderService.getXhpcChargingPile(xhpcChargeOrder.getTerminalId());
// if(xhpcChargingPile !=null){ if(xhpcChargingPile !=null){
// //发送短信 //发送短信
// if(user.get("phone") !=null){ if(user.get("phone") !=null){
// if("1".equals(xhpcChargingPile.get("type").toString())){ if("1".equals(xhpcChargingPile.get("type").toString())){
// String content = "【小华停止充电】尊敬的用户，你的爱车已停止充电，电量为：" + xhpcChargeOrder.getEndSoc() + "%，总费用为：" + actPrice + "元，充电费用明细，请查询小华充电小程序，谢谢。"; String content = "【小华停止充电】尊敬的用户，你的爱车已停止充电，电量为：" + xhpcChargeOrder.getEndSoc() + "%，总费用为：" + actPrice + "元，充电费用明细，请查询小华充电小程序，谢谢。";
// smsService.sendNotice(user.get("phone").toString(),content); smsService.sendNotice(user.get("phone").toString(),content);
// }else{ }else{
// String content = "【小华停止充电】尊敬的用户，你的爱车已停止充电，总费用为：" + actPrice + "元，充电费用明细，请查询小华充电小程序，谢谢。"; String content = "【小华停止充电】尊敬的用户，你的爱车已停止充电，总费用为：" + actPrice + "元，充电费用明细，请查询小华充电小程序，谢谢。";
// smsService.sendNotice(user.get("phone").toString(),content); smsService.sendNotice(user.get("phone").toString(),content);
// } }
// } }
// } }
}catch (Exception e){ }catch (Exception e){
logger.info("<<<<<<<<<<<<<<<<发送短信失败>>>>>>>>>>>>>>>>>"); logger.info("<<<<<<<<<<<<<<<<发送短信失败>>>>>>>>>>>>>>>>>");
} }
@ -398,7 +398,7 @@ public class XhpcRealTimeOrderServiceImpl implements IXhpcRealTimeOrderService {
executorService.execute(new Runnable() { executorService.execute(new Runnable() {
@Override @Override
public void run() { public void run() {
// addPileEndOrder(xhpcHistoryOrder, xhpcChargeOrder, xhpcChargeOrder.getSerialNumber(),1); addPileEndOrder(xhpcHistoryOrder, xhpcChargeOrder, xhpcChargeOrder.getSerialNumber(),1);
} }
}); });
} }
@ -421,7 +421,7 @@ public class XhpcRealTimeOrderServiceImpl implements IXhpcRealTimeOrderService {
int size = reatTimeList.size(); int size = reatTimeList.size();
if(size==1){ if(size==1){
BigDecimal powerFee = new BigDecimal(reatTimeList.get(0).get("powerFee").toString()); BigDecimal powerFee = new BigDecimal(reatTimeList.get(0).get("powerFee").toString());
powerPriceTotal = powerFee.multiply(chargingDegree).setScale(2, RoundingMode.HALF_UP); powerPriceTotal = powerFee.multiply(chargingDegree).setScale(2, BigDecimal.ROUND_DOWN);
}else{ }else{
for (int i = 0; i <reatTimeList.size() ; i++) { for (int i = 0; i <reatTimeList.size() ; i++) {
Map<String, Object> objectMap = reatTimeList.get(i); Map<String, Object> objectMap = reatTimeList.get(i);
@ -451,7 +451,7 @@ public class XhpcRealTimeOrderServiceImpl implements IXhpcRealTimeOrderService {
private BigDecimal getRateTimeList(String startTime,String endTime,BigDecimal s,BigDecimal powerFee,BigDecimal powerPriceTotal){ private BigDecimal getRateTimeList(String startTime,String endTime,BigDecimal s,BigDecimal powerFee,BigDecimal powerPriceTotal){
BigDecimal decimal = new BigDecimal((DateUtil.parse(endTime).getTime() - DateUtil.parse(startTime).getTime())/60000).setScale(2, RoundingMode.HALF_UP); BigDecimal decimal = new BigDecimal((DateUtil.parse(endTime).getTime() - DateUtil.parse(startTime).getTime())/60000).setScale(2, RoundingMode.HALF_UP);
powerPriceTotal = powerPriceTotal.add(decimal.multiply(powerFee).multiply(s)); powerPriceTotal = powerPriceTotal.add(decimal.multiply(powerFee).multiply(s));
return powerPriceTotal.setScale(2, RoundingMode.HALF_UP); return powerPriceTotal.setScale(2, BigDecimal.ROUND_DOWN);
} }
@Override @Override

15
xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml
View File

@ -690,6 +690,7 @@
co.start_time as startTime, co.start_time as startTime,
co.end_time as endTime, co.end_time as endTime,
co.update_time as updateTime, co.update_time as updateTime,
co.charging_time as chargingTimeTotal,
ho.total_price as totalPrice, ho.total_price as totalPrice,
ho.remark as remark, ho.remark as remark,
ho.promotion_discount as promotionDiscount, ho.promotion_discount as promotionDiscount,
@ -706,7 +707,19 @@
ho.act_power_price as actPowerPrice, ho.act_power_price as actPowerPrice,
ho.act_service_price as actServicePrice, ho.act_service_price as actServicePrice,
(SELECT phone FROM xhpc_app_user where app_user_id = co.user_id) as appUserPhone, (SELECT phone FROM xhpc_app_user where app_user_id = co.user_id) as appUserPhone,
(SELECT phone from xhpc_internet_user where internet_user_id = co.user_id) as internetUserPhone (SELECT phone from xhpc_internet_user where internet_user_id = co.user_id) as internetUserPhone,
case when ho.stop_reason_evcs=40 then "APP远程停止"
when ho.stop_reason_evcs=41 then "SOC达到100%"
when ho.stop_reason_evcs=42 then "充电电量满足设定条件"
when ho.stop_reason_evcs=43 then "充电金额满足设定条件"
when ho.stop_reason_evcs=44 then "充电时间满足设定条件"
when ho.stop_reason_evcs=45 then "手动停止充电"
when ho.stop_reason_evcs=46 then "手动停止充电."
when ho.stop_reason_evcs=47 then "手动停止充电.."
when ho.stop_reason_evcs=48 then "急停停止充电"
when ho.stop_reason_evcs=49 then "手动停止充电..."
else "手动停止充电!"
end stopReasonRvcsName
from xhpc_history_order ho from xhpc_history_order ho
left join xhpc_charging_station as ct on ct.charging_station_id = ho.charging_station_id left join xhpc_charging_station as ct on ct.charging_station_id = ho.charging_station_id
left join xhpc_operator as op on op.operator_id = ct.operator_id left join xhpc_operator as op on op.operator_id = ct.operator_id