qzz/electripper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.调整

Browse Source
This commit is contained in:
邱贞招 2024-07-09 14:18:54 +08:00
parent 7c401c0666
commit 545dc266e0
23 changed files with 271 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppVerifyController.java
View File

@ -492,11 +492,12 @@ public class AppVerifyController extends BaseController
*/
@Log(title = "更新车牌号", businessType = BusinessType.UPDATE)
@PutMapping("/device/edit")
public AjaxResult deviceEdit(String sn, String vehicleNum)
public AjaxResult deviceEdit(String sn, String vehicleNum, String status)
{
AsDevice asDevice = new AsDevice();
asDevice.setSn(sn);
asDevice.setVehicleNum(vehicleNum);
asDevice.setStatus(status);
return toAjax(asDeviceService.updateAsDeviceBySn(asDevice));
}
@ -579,7 +580,7 @@ public class AppVerifyController extends BaseController
public AjaxResult offline(String sn)
{
logger.info("【车辆下线请求】：{}",sn);
Boolean aBoolean =asDeviceService.offline(sn);
Boolean aBoolean =asDeviceService.offline(sn,ServiceConstants.VEHICLE_STATUS_IN_OFFLINE);
return success(aBoolean);
}
@ -617,11 +618,11 @@ public class AppVerifyController extends BaseController
}
/**
* 批量禁用/解禁
* disable-禁用 enable-解禁
* 批量禁用/解禁、出仓/回仓
* disable-禁用 enable-解禁 inStash-回仓 outStash-出仓
*/
@Transactional
@Log(title = "批量禁用/解禁", businessType = BusinessType.DISABLE)
@Log(title = "批量修改操作", businessType = BusinessType.DISABLE)
@PostMapping("/device/disable")
public AjaxResult batchDisable(String sns, String disableType)
{
@ -632,12 +633,16 @@ public class AppVerifyController extends BaseController
String[] smList = sns.split(",");
if(ServiceConstants.BATCH_OPERATION_TYPE_DISABLE.equals(disableType)){//禁用
for(String sn:smList){
asDeviceService.offline(sn);
asDeviceService.offline(sn,ServiceConstants.VEHICLE_STATUS_IN_OFFLINE);
}
}else if(ServiceConstants.BATCH_OPERATION_TYPE_ENABLE.equals(disableType)){
}else if(ServiceConstants.BATCH_OPERATION_TYPE_ENABLE.equals(disableType) || ServiceConstants.BATCH_OPERATION_TYPE_OUTSTASH.equals(disableType)){
for(String sn:smList){
asDeviceService.online(sn);
}
}else if(ServiceConstants.BATCH_OPERATION_TYPE_INSTASH.equals(disableType)) {//回仓
for (String sn : smList) {
asDeviceService.offline(sn,ServiceConstants.VEHICLE_STATUS_NOT_LISTING);
}
}else{
throw new ServiceException("操作类型错误");
}
@ -852,4 +857,18 @@ public class AppVerifyController extends BaseController
logger.info("根据token获取运营区列表：【{}】", JSON.toJSON(longs));
return success(longs);
}
/**
* 重启设备
*/
@PostMapping("/device/reboot")
public AjaxResult reboot(String sn)
{
if(StrUtil.isBlank(sn)){
logger.info("没有sn号参数：【sn={}】",sn);
return error("请传sn号参数"+"【sn="+sn+"】");
}
Boolean i =asDeviceService.reboot(sn);
return success(i);
}
}

3
electripper-admin/src/main/java/com/ruoyi/web/controller/iot/receive/ReceiveController.java
View File

@ -212,8 +212,9 @@ public class ReceiveController {
**/
boolean noRidingArea = asDeviceService.isNoRidingArea(device.getSn(), device.getAreaId());
if(noRidingArea){
String isAdminUnlocking = device.getIsAdminUnlocking();// 是否管理员开锁
String noRidingOutage = area.getNoRidingOutage();
if (noRidingOutage.equals("1") && value.getStatus() != 3) { // 禁行区内断电
if (noRidingOutage.equals("1") && value.getStatus() != 3 && !isAdminUnlocking.equals("1")) { // 禁行区内断电
log.info("禁行区内断电命令--SN：" + device.getSn());
asDeviceService.sendCommand(device.getMac(), Token.getToken(), IotConstants.COMMAND_QLOSE+IotConstants.COMMAND_FREQUENCY_5, "禁行区内断电");
device.setLockStatus(ServiceConstants.LOCK_STATUS_CLOSE);

18
electripper-admin/src/main/java/com/ruoyi/web/controller/system/AsDeviceController.java
View File

@ -2,6 +2,7 @@ package com.ruoyi.web.controller.system;
import cn.hutool.core.util.StrUtil;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.ServiceConstants;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
@ -146,6 +147,21 @@ public class AsDeviceController extends BaseController
return success(i);
}
/**
* 重启 reboot
*/
@PreAuthorize("@ss.hasPermi('system:device:reboot')")
@PostMapping("/device/reboot")
public AjaxResult reboot(String mac)
{
if(StrUtil.isBlank(mac)){
logger.info("没有sn号参数：【mac={}】",mac);
return error("请传sn号参数"+"【mac="+mac+"】");
}
Boolean i =asDeviceService.rebootByMac(mac);
return success(i);
}
/**
* 管理员开锁
*/
@ -222,7 +238,7 @@ public class AsDeviceController extends BaseController
public AjaxResult offline(String sn)
{
logger.info("【车辆下线请求】：{}",sn);
Boolean aBoolean =asDeviceService.offline(sn);
Boolean aBoolean =asDeviceService.offline(sn, ServiceConstants.VEHICLE_STATUS_IN_OFFLINE);
return success(aBoolean);
}

13
electripper-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
View File

@ -180,4 +180,17 @@ public class SysDeptController extends BaseController
return ajax;
}
/**
* 查询运营商
*/
@GetMapping("/getDept")
public AjaxResult getDept()
{
AjaxResult ajax = AjaxResult.success();
Long deptId = getDeptId();
SysDept sysDept = deptService.selectDeptById(deptId);
ajax.put(AjaxResult.DATA_TAG, sysDept);
return ajax;
}
}

5
electripper-common/src/main/java/com/ruoyi/common/constant/IotConstants.java
View File

@ -131,6 +131,11 @@ public class IotConstants {
*/
public static final String COMMAND_FREQUENCY_3600 = "sub300@";
/**
* 命令 重启设备
*/
public static final String COMMAND_REBOOT = "reboot";
/**----------------------------命令end----------------------------*/

12
electripper-common/src/main/java/com/ruoyi/common/constant/ServiceConstants.java
View File

@ -312,7 +312,7 @@ public class ServiceConstants {
/**----------------------------工单类型end----------------------------*/
/**----------------------------批量操作类型tart----------------------------*/
/** 批量操作类型： disable-禁用 enable-解禁 */
/** 批量操作类型： disable-禁用 enable-解禁 inStash-回仓 outStash-出仓*/
/**
* 批量操作类型：disable-禁用
*/
@ -323,6 +323,16 @@ public class ServiceConstants {
*/
public static final String BATCH_OPERATION_TYPE_ENABLE = "enable";
/**
* 批量操作类型：inStash-回仓
*/
public static final String BATCH_OPERATION_TYPE_INSTASH = "inStash";
/**
* 批量操作类型：outStash-出仓
*/
public static final String BATCH_OPERATION_TYPE_OUTSTASH = "outStash";
/**----------------------------批量操作类型end----------------------------*/

11
electripper-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
View File

@ -61,6 +61,9 @@ public class SysDept extends BaseEntity
/** 平台服务费 */
private String platformServiceFee;
/** 手续费 */
private String handlingCharge;
/** 是否开启分账 */
private String isProfitSharing;
@ -100,6 +103,14 @@ public class SysDept extends BaseEntity
/** 退款回调地址 */
private String refundNotifyUrl;
public String getHandlingCharge() {
return handlingCharge;
}
public void setHandlingCharge(String handlingCharge) {
this.handlingCharge = handlingCharge;
}
public BigDecimal getBalance() {
return balance;
}

4
electripper-common/src/main/java/com/ruoyi/common/enums/BusinessType.java
View File

@ -123,4 +123,8 @@ public enum BusinessType
* 维修处理
*/
REPAIR,
/**
* 出仓
*/
STASH,
}

4
electripper-system/src/main/java/com/ruoyi/system/domain/EtFeeRule.java
View File

@ -157,4 +157,8 @@ public class EtFeeRule extends BaseEntity
/** 是否缴纳过押金*/
@Excel(name = "是否缴纳过押金")
private Boolean isDeposit;
/** 是否已删除*/
@Excel(name = "是否已删除")
private String isDeleted;
}

3
electripper-system/src/main/java/com/ruoyi/system/domain/vo/RechargeVo.java
View File

@ -54,4 +54,7 @@ public class RechargeVo {
@Excel(name = "充值状态:1-充值成功;2-退款成功；")
private String rechargeStatus;
@Excel(name = "是否已退款")
private Boolean isRefunded;
}

8
electripper-system/src/main/java/com/ruoyi/system/mapper/EtFeeRuleMapper.java
View File

@ -19,6 +19,14 @@ public interface EtFeeRuleMapper
*/
public EtFeeRule selectEtFeeRuleByRuleId(Long ruleId);
/**
* 查询收费方式
*
* @param ruleId 收费方式主键
* @return 收费方式
*/
public EtFeeRule selectEtFeeRuleByRuleIdIncludeDelete(Long ruleId);
/**
* 查询收费方式列表
*

12
electripper-system/src/main/java/com/ruoyi/system/service/IAsDeviceService.java
View File

@ -162,6 +162,16 @@ public interface IAsDeviceService extends IService<AsDevice>
*/
Boolean ring(String sn);
/**
* 重启设备
*/
Boolean rebootByMac(String mac);
/**
* 重启设备
*/
Boolean reboot(String sn);
/**
* 响铃寻车
*/
@ -220,7 +230,7 @@ public interface IAsDeviceService extends IService<AsDevice>
/**
* 车辆下线
*/
Boolean offline(String sn);
Boolean offline(String sn,String status);
/**
* 根据条件模糊查询车辆信息

8
electripper-system/src/main/java/com/ruoyi/system/service/IEtFeeRuleService.java
View File

@ -20,6 +20,14 @@ public interface IEtFeeRuleService
*/
public EtFeeRule selectEtFeeRuleByRuleId(Long ruleId);
/**
* 查询收费方式
*
* @param ruleId 收费方式主键
* @return 收费方式
*/
public EtFeeRule selectEtFeeRuleByRuleIdIncludeDelete(Long ruleId);
/**
* 查询收费方式列表
*

1
electripper-system/src/main/java/com/ruoyi/system/service/IWxPayService.java
View File

@ -1,7 +1,6 @@
package com.ruoyi.system.service;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.system.domain.EtOperatingArea;
import com.ruoyi.system.domain.EtOrder;
import com.wechat.pay.java.service.payments.jsapi.model.PrepayWithRequestPaymentResponse;
import com.wechat.pay.java.service.payments.model.Transaction;

45
electripper-system/src/main/java/com/ruoyi/system/service/impl/AsDeviceServiceImpl.java
View File

@ -700,7 +700,7 @@ public class AsDeviceServiceImpl extends ServiceImpl<AsDeviceMapper, AsDevice> i
*/
@SneakyThrows
@Override
public Boolean offline(String sn) {
public Boolean offline(String sn,String status) {
AsDevice asDevice = asDeviceMapper.selectAsDeviceBySn(sn);
if(ServiceConstants.VEHICLE_STATUS_IN_APPOINTMENT.equals(asDevice.getStatus())){
throw new ServiceException("车辆处于预约中，不能下线");
@ -711,7 +711,7 @@ public class AsDeviceServiceImpl extends ServiceImpl<AsDeviceMapper, AsDevice> i
if(ServiceConstants.VEHICLE_STATUS_TEMPORARILY_LOCK.equals(asDevice.getStatus())){
throw new ServiceException("车辆临时停车中，不能下线");
}
asDevice.setStatus(ServiceConstants.VEHICLE_STATUS_IN_OFFLINE);
asDevice.setStatus(status);
int device = asDeviceMapper.updateAsDevice(asDevice);
if(device==0){
log.info("车辆下线状态失败");
@ -892,6 +892,45 @@ public class AsDeviceServiceImpl extends ServiceImpl<AsDeviceMapper, AsDevice> i
return Boolean.TRUE;
}
/**
* 重启设备
* @param sn
* @return
*/
@SneakyThrows
@Override
public Boolean reboot(String sn) {
AsDevice asDevice = asDeviceMapper.selectAsDeviceBySn(sn);
/** 1.获取token*/
String token = Token.getToken();
Boolean execute = transactionTemplate.execute(e -> {
/** 2.发送命令*/
sendCommand(asDevice.getMac(), token,IotConstants.COMMAND_PLAY1,"重启设备");
return Boolean.TRUE;
});
if(!execute)throw new ServiceException("重启设备失败");
return Boolean.TRUE;
}
/**
* 重启设备
* @param mac
* @return
*/
@SneakyThrows
@Override
public Boolean rebootByMac(String mac) {
/** 1.获取token*/
String token = Token.getToken();
Boolean execute = transactionTemplate.execute(e -> {
/** 2.发送命令*/
sendCommand(mac, token,IotConstants.COMMAND_REBOOT,"重启设备");
return Boolean.TRUE;
});
if(!execute)throw new ServiceException("重启设备失败");
return Boolean.TRUE;
}
/**
* 响铃寻车
* @param mac
@ -1300,7 +1339,7 @@ public class AsDeviceServiceImpl extends ServiceImpl<AsDeviceMapper, AsDevice> i
String type = order.getType();
if(type.equals("1")){//骑行订单,正常骑行（包含预约费），计时收费，根据开锁时间、起步价和起步时长、时长费和时长分钟等参数，如果有预约，还要加上预约费计算费用,还要判断封顶费用（根据开锁时间）
Long ruleId = order.getRuleId();
EtFeeRule rule = etFeeRuleService.selectEtFeeRuleByRuleId(ruleId);
EtFeeRule rule = etFeeRuleService.selectEtFeeRuleByRuleIdIncludeDelete(ruleId);
if(ObjectUtil.isNull(rule)){
throw new ServiceException("计费规则不存在");
}

16
electripper-system/src/main/java/com/ruoyi/system/service/impl/CallbackServiceImpl.java
View File

@ -115,8 +115,8 @@ public class CallbackServiceImpl implements CallbackService {
@Resource
private EtCallbackLogMapper callbackLogMapper;
@Value("${et.handlingCharge}")
private String handlingCharge;
// @Value("${et.handlingCharge}")
// private String handlingCharge;
/**
@ -389,7 +389,7 @@ public class CallbackServiceImpl implements CallbackService {
* 退还押金定时任务
*/
private void refundDeposit(String deposit, EtOrder order, AsUser asUser) {
EtFeeRule rule = etFeeRuleService.selectEtFeeRuleByRuleId(order.getRuleId());
EtFeeRule rule = etFeeRuleService.selectEtFeeRuleByRuleIdIncludeDelete(order.getRuleId());
Integer autoRefundDeposit = rule.getAutoRefundDeposit();
logger.info("【微信支付回调】进入退还押金");
@ -470,8 +470,9 @@ public class CallbackServiceImpl implements CallbackService {
capitalFlow.setType(type);
capitalFlow.setBusType(busType);
capitalFlow.setAmount(order.getPayFee());
logger.info("【微信支付回调--保存资金流水记录】 获取到配置手续费==============handlingCharge=====================："+handlingCharge);
BigDecimal bigDecimal = new BigDecimal(handlingCharge).divide(new BigDecimal(1000), 6, BigDecimal.ROUND_HALF_UP);
String handlingCharge1 = sysDept.getHandlingCharge();
logger.info("【微信支付回调--保存资金流水记录】 获取到配置手续费==============handlingCharge=====================："+handlingCharge1);
BigDecimal bigDecimal = new BigDecimal(handlingCharge1).divide(new BigDecimal(1000), 6, BigDecimal.ROUND_HALF_UP);
logger.info("【微信支付回调--保存资金流水记录】 转换后手续费==============bigDecimal=====================："+bigDecimal);
BigDecimal handlingCharge = bigDecimal.multiply(order.getPayFee()).setScale(2, BigDecimal.ROUND_HALF_UP);
logger.info("【微信支付回调--保存资金流水记录】 计算出的手续费==============handlingCharge=====================："+handlingCharge);
@ -481,10 +482,9 @@ public class CallbackServiceImpl implements CallbackService {
capitalFlow.setPlatformServiceFee(platformServiceFee);
capitalFlow.setHandlingCharge(handlingCharge);//手续费
if(busType.equals(ServiceConstants.ORDER_TYPE_WITHDRAW)){//提现，需要手续费，不需要平台服务费
platformServiceFee = BigDecimal.ZERO;
BigDecimal separateAccountFee = order.getPayFee().subtract(handlingCharge).subtract(platformServiceFee);
BigDecimal separateAccountFee = order.getPayFee();
capitalFlow.setPartnerDividend(BigDecimal.ZERO);
capitalFlow.setPlatformServiceFee(platformServiceFee);
capitalFlow.setPlatformServiceFee(BigDecimal.ZERO);
capitalFlow.setOperatorDividend(separateAccountFee.negate());
capitalFlow.setOperatorBalance(sysDept.getBalance().subtract(separateAccountFee));
deptService.changeDeptBalance(separateAccountFee.negate(),sysDept.getDeptId());

12
electripper-system/src/main/java/com/ruoyi/system/service/impl/EtFeeRuleServiceImpl.java
View File

@ -37,6 +37,18 @@ public class EtFeeRuleServiceImpl implements IEtFeeRuleService
return etFeeRuleMapper.selectEtFeeRuleByRuleId(ruleId);
}
/**
* 查询收费方式
*
* @param ruleId 收费方式主键
* @return 收费方式
*/
@Override
public EtFeeRule selectEtFeeRuleByRuleIdIncludeDelete(Long ruleId)
{
return etFeeRuleMapper.selectEtFeeRuleByRuleIdIncludeDelete(ruleId);
}
/**
* 查询收费方式列表
*

101
electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOrderServiceImpl.java
View File

@ -89,8 +89,8 @@ public class EtOrderServiceImpl implements IEtOrderService
@Autowired
private CallbackService callbackService;
@Value("${et.handlingCharge}")
private String handlingCharge;
// @Value("${et.handlingCharge}")
// private String handlingCharge;
@Resource
private EtRefundMapper etRefundMapper;
@ -108,7 +108,7 @@ public class EtOrderServiceImpl implements IEtOrderService
EtOrder order = etOrderMapper.selectEtOrderByOrderId(orderId);
AsDevice device = asDeviceMapper.selectAsDeviceBySn(order.getSn());
order.setDevice(device);
EtFeeRule etFeeRule = etFeeRuleService.selectEtFeeRuleByRuleId(order.getRuleId());
EtFeeRule etFeeRule = etFeeRuleService.selectEtFeeRuleByRuleIdIncludeDelete(order.getRuleId());
order.setRule(etFeeRule);
//行程记录
EtTripLog tripLog = new EtTripLog();
@ -178,7 +178,7 @@ public class EtOrderServiceImpl implements IEtOrderService
AsDevice device = asDeviceMapper.selectAsDeviceBySn(order.getSn());
order.setDevice(device);
//根据规则id查询规则
EtFeeRule etFeeRule = etFeeRuleService.selectEtFeeRuleByRuleId(order.getRuleId());
EtFeeRule etFeeRule = etFeeRuleService.selectEtFeeRuleByRuleIdIncludeDelete(order.getRuleId());
if(ObjectUtils.isNotEmpty(etFeeRule)){
order.setRule(etFeeRule);
}
@ -268,38 +268,49 @@ public class EtOrderServiceImpl implements IEtOrderService
@DataScope(deptAlias = "d")
public List<RechargeVo> rechargeList(EtOrder etOrder) {
List<RechargeVo> rechargeVoList = new ArrayList<>();
etOrder.setPaid(ServiceConstants.ORDER_PAY_STATUS_PAID);
etOrder.setStatus(ServiceConstants.ORDER_STATUS_ORDER_END);
List<EtOrder> etOrders = etOrderMapper.selectEtOrderList(etOrder);
etOrders.forEach(etOrder1 -> {
RechargeVo rechargeVo = new RechargeVo();
BeanUtils.copyProperties(etOrder1,rechargeVo);
rechargeVo.setRechargeStatus(ServiceConstants.RECHARGE_STATUS_SUCCESS);
rechargeVo.setRechargeType(ServiceConstants.ORDER_TYPE_DEPOSIT);
rechargeVo.setTotalFee(etOrder1.getPayFee());
rechargeVoList.add(rechargeVo);
});
//如果查询押金则增加退款记录
EtRefund refund = new EtRefund();
refund.setType(ServiceConstants.REFUND_TYPE_DEPOSIT);
refund.setRefundResult(Constants.SUCCESS2);
refund.setUserName(etOrder.getUserName());
PageUtils.startPage();
List<EtRefund> etRefunds = etRefundMapper.selectEtRefundList(refund);;
etRefunds.forEach(etRefund -> {
AsUser asUser = asUserService.selectUserById(etRefund.getUserId());
RechargeVo rechargeVo = new RechargeVo();
BeanUtils.copyProperties(etRefund,rechargeVo);
rechargeVo.setOutTradeNo(etRefund.getRefundNo());
rechargeVo.setPayTime(etRefund.getCreateTime());
rechargeVo.setTotalFee(etRefund.getAmount());
rechargeVo.setUserId(etRefund.getUserId());
rechargeVo.setUserName(asUser.getUserName());
rechargeVo.setPhonenumber(asUser.getPhonenumber());
rechargeVo.setRechargeStatus(ServiceConstants.RECHARGE_STATUS_REFUND_SUCCESS);
rechargeVo.setRechargeType(ServiceConstants.ORDER_TYPE_DEPOSIT_REFUND);
rechargeVoList.add(rechargeVo);
});
String status = etOrder.getStatus();
if(StrUtil.isBlank(status) || "1".equals(status)){
etOrder.setPaid(ServiceConstants.ORDER_PAY_STATUS_PAID);
etOrder.setStatus(ServiceConstants.ORDER_STATUS_ORDER_END);
List<EtOrder> etOrders = etOrderMapper.selectEtOrderList(etOrder);
etOrders.forEach(etOrder1 -> {
RechargeVo rechargeVo = new RechargeVo();
BeanUtils.copyProperties(etOrder1,rechargeVo);
rechargeVo.setRechargeStatus(ServiceConstants.RECHARGE_STATUS_SUCCESS);
rechargeVo.setRechargeType(ServiceConstants.ORDER_TYPE_DEPOSIT);
rechargeVo.setTotalFee(etOrder1.getPayFee());
List<EtRefund> etRefunds = etRefundMapper.selectEtRefundByOrderNo(etOrder1.getOrderNo());
if(ObjectUtil.isNull(etRefunds) || etRefunds.size() == 0){
rechargeVo.setIsRefunded(false);
}else{
rechargeVo.setIsRefunded(true);
}
rechargeVoList.add(rechargeVo);
});
}
if(StrUtil.isBlank(status) || "2".equals(status)){
//如果查询押金则增加退款记录
EtRefund refund = new EtRefund();
refund.setType(ServiceConstants.REFUND_TYPE_DEPOSIT);
refund.setRefundResult(Constants.SUCCESS2);
refund.setUserName(etOrder.getUserName());
PageUtils.startPage();
List<EtRefund> etRefunds = etRefundMapper.selectEtRefundList(refund);;
etRefunds.forEach(etRefund -> {
AsUser asUser = asUserService.selectUserById(etRefund.getUserId());
RechargeVo rechargeVo = new RechargeVo();
BeanUtils.copyProperties(etRefund,rechargeVo);
rechargeVo.setOutTradeNo(etRefund.getRefundNo());
rechargeVo.setPayTime(etRefund.getCreateTime());
rechargeVo.setTotalFee(etRefund.getAmount());
rechargeVo.setUserId(etRefund.getUserId());
rechargeVo.setUserName(asUser.getUserName());
rechargeVo.setPhonenumber(asUser.getPhonenumber());
rechargeVo.setRechargeStatus(ServiceConstants.RECHARGE_STATUS_REFUND_SUCCESS);
rechargeVo.setRechargeType(ServiceConstants.ORDER_TYPE_DEPOSIT_REFUND);
rechargeVoList.add(rechargeVo);
});
}
//将rechargeVoList根据payTime倒序
rechargeVoList.sort(Comparator.comparing(RechargeVo::getPayTime).reversed());
return rechargeVoList;
@ -678,6 +689,8 @@ public class EtOrderServiceImpl implements IEtOrderService
String totalRefund = etOrderMapper.getTotalRefund(timeStart, timeEnd, areaId);//已退款
income.setTotalPaid(totalPaid);//已支付
//handlingFee 手续费 = 0.0054 * 已支付金额
SysDept sysDept = wxPayService.getDeptObjByAreaId(Long.parseLong(areaId));
String handlingCharge = sysDept.getHandlingCharge();
BigDecimal divide = new BigDecimal(handlingCharge).divide(new BigDecimal(1000), 4, RoundingMode.HALF_UP);
BigDecimal handlingFee = new BigDecimal(totalPaid).multiply(divide);
income.setHandlingFee(handlingFee.setScale(2, RoundingMode.HALF_UP).toString());
@ -906,7 +919,7 @@ public class EtOrderServiceImpl implements IEtOrderService
List<AsDevice> devices = asDeviceMapper.selectAsDeviceList(device1);
log.info("【收入对账】根据sn搜索出的devices:{}", JSON.toJSON(devices));
for (AsDevice device : devices) {
reconciliations.add(createReconciliationByVehicle(timeStart, timeEnd, device.getSn()));
reconciliations.add(createReconciliationByVehicle(timeStart, timeEnd, device.getSn(),device.getAreaId()));
}
ReconciliationVo reconciliationVo = new ReconciliationVo();
@ -922,7 +935,8 @@ public class EtOrderServiceImpl implements IEtOrderService
SysDept deptObjByAreaId = wxPayService.getDeptObjByAreaId(areaId);
reconciliation.setDeptName(deptObjByAreaId.getDeptName());
reconciliation.setDay(formattedDate);
SysDept sysDept = wxPayService.getDeptObjByAreaId(areaId);
String handlingCharge = sysDept.getHandlingCharge();
BigDecimal payFee = defaultIfNull(etOrderMapper.getPayFee(startDateStr, endDateStr, null, areaId), BigDecimal.ZERO);//新增
BigDecimal refundFee = defaultIfNull(etOrderMapper.getRefundFee(startDateStr, endDateStr, null, areaId), BigDecimal.ZERO);//退款
BigDecimal divide = new BigDecimal(handlingCharge).divide(new BigDecimal(1000), 4, RoundingMode.HALF_UP);
@ -952,13 +966,15 @@ public class EtOrderServiceImpl implements IEtOrderService
return reconciliation;
}
private ReconciliationVo.Reconciliation createReconciliationByVehicle(String timeStart, String timeEnd, String sn) {
private ReconciliationVo.Reconciliation createReconciliationByVehicle(String timeStart, String timeEnd, String sn,Long areaId) {
ReconciliationVo.Reconciliation reconciliation = new ReconciliationVo.Reconciliation();
reconciliation.setSn(sn);
BigDecimal payFee = etOrderMapper.getPayFee(timeStart, timeEnd, sn, null);
reconciliation.setPayFee(payFee);
BigDecimal refundFee = etOrderMapper.getRefundFee(timeStart, timeEnd, sn, null);
reconciliation.setRefundFee(refundFee);
SysDept sysDept = wxPayService.getDeptObjByAreaId(areaId);
String handlingCharge = sysDept.getHandlingCharge();
BigDecimal divide = new BigDecimal(handlingCharge).divide(new BigDecimal(1000), 4, RoundingMode.HALF_UP);
BigDecimal serviceFee = payFee.multiply(divide).setScale(2, RoundingMode.HALF_UP);//手续费
reconciliation.setIncome(payFee.subtract(refundFee).subtract(serviceFee));
@ -1018,6 +1034,11 @@ public class EtOrderServiceImpl implements IEtOrderService
if(dividendDetailService.isDividendComputedByOrderNo(etOrder.getOrderNo())){
throw new ServiceException("订单【{}】已经分账，不能退款");
}
SysDept sysDept = wxPayService.getDeptObjByAreaId(etOrder1.getAreaId());
BigDecimal subtract = sysDept.getBalance().subtract(etOrder1.getTotalFee());
if(subtract.compareTo(BigDecimal.ZERO) <= 0){
throw new ServiceException("余额不足，不能退款");
}
/** 1.退款*/
//退款金额
BigDecimal refundAmount = new BigDecimal("0");
@ -1120,7 +1141,7 @@ public class EtOrderServiceImpl implements IEtOrderService
public List<EtOrder> isInOrder(Long userId,String orderNo) {
List<EtOrder> inOrder = etOrderMapper.isInOrder(userId, orderNo);
for(EtOrder order:inOrder){
EtFeeRule etFeeRule = etFeeRuleService.selectEtFeeRuleByRuleId(order.getRuleId());
EtFeeRule etFeeRule = etFeeRuleService.selectEtFeeRuleByRuleIdIncludeDelete(order.getRuleId());
if(ObjectUtil.isNotNull(etFeeRule)){
order.setRule(etFeeRule);
}

2
electripper-system/src/main/java/com/ruoyi/system/service/impl/EtWithdrawServiceImpl.java
View File

@ -132,7 +132,7 @@ public class EtWithdrawServiceImpl implements IEtWithdrawService
transferDetailInput.setOpenid(etWithdraw.getWxopenid());
transferDetailInputs.add(transferDetailInput);
log.info("【审核通过】发起转账到零钱:{}",JSON.toJSONString(transferDetailInputs));
// todo 暂时先不发起真实提现
// todo 暂时先不发起真实提现 真正的提现是
// wxPayService.transfer(sysDept,etWithdraw.getWithdrawNo(),batchName,batchName,etWithdraw.getAmount(),1,transferDetailInputs);
//扣余额并记录资金流水
sysDept.getBalance().subtract(etWithdraw.getAmount());

2
electripper-system/src/main/java/com/ruoyi/system/task/EtTask.java
View File

@ -105,7 +105,7 @@ public class EtTask {
List<EtOrder> orders = etOrderMapper.selectUserListFinishOrder();
log.info("已完成的订单未退还押金的的订单 = " + JSON.toJSONString(orders));
for(EtOrder order:orders){
EtFeeRule rule = etFeeRuleService.selectEtFeeRuleByRuleId(order.getRuleId());
EtFeeRule rule = etFeeRuleService.selectEtFeeRuleByRuleIdIncludeDelete(order.getRuleId());
if(ObjectUtil.isNull(rule)){
throw new ServiceException("骑行订单：【"+order.getOrderNo()+"】未找到该套餐【"+order.getRuleId()+"】");
}

23
electripper-system/src/main/resources/mapper/system/EtFeeRuleMapper.xml
View File

@ -25,6 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="instructions" column="instructions" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="isDeleted" column="is_deleted" />
</resultMap>
<sql id="selectEtFeeRuleVo">
@ -40,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
r.free_ride_time, r.rental_unit, r.riding_rule, r.riding_rule_json, r.charging_cycle, r.charging_cycle_value,
r.capped_amount, r.instructions, r.create_by, r.create_time from et_fee_rule r
left join sys_dept d on d.dept_id = r.dept_id
where 1 = 1
where r.is_deleted = 0
<if test="name != null and name != ''"> and r.`name` like concat('%', #{name}, '%')</if>
<if test="status != null and status != ''"> and r.status = #{status}</if>
<if test="deptId != null "> and r.dept_id = #{deptId}</if>
@ -49,6 +50,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="selectEtFeeRuleByRuleId" parameterType="Long" resultMap="EtFeeRuleResult">
<include refid="selectEtFeeRuleVo"/>
where is_deleted = 0 rule_id = #{ruleId}
</select>
<select id="selectEtFeeRuleByRuleIdIncludeDelete" parameterType="Long" resultMap="EtFeeRuleResult">
<include refid="selectEtFeeRuleVo"/>
where rule_id = #{ruleId}
</select>
@ -58,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from et_fee_rule r
left join et_area_rule ar on ar.rule_id = r.rule_id
left join et_operating_area a on a.area_id = ar.area_id
where a.area_id = #{areaId}
where r.is_deleted = 0 and a.area_id = #{areaId}
</select>
<select id="selectRuleInfoListByAreaId" parameterType="Long" resultMap="EtFeeRuleResult">
@ -69,7 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from et_fee_rule r
left join et_area_rule ar on ar.rule_id = r.rule_id
left join et_operating_area a on a.area_id = ar.area_id
where a.area_id = #{areaId}
where r.is_deleted = 0 and a.area_id = #{areaId}
</select>
<select id="selectRuleNameListByAreaId" parameterType="Long" resultType="java.lang.String">
@ -77,7 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from et_fee_rule r
left join et_area_rule ar on ar.rule_id = r.rule_id
left join et_operating_area a on a.area_id = ar.area_id
where a.area_id = #{areaId}
where r.is_deleted = 0 and a.area_id = #{areaId}
</select>
<insert id="insertEtFeeRule" parameterType="EtFeeRule" useGeneratedKeys="true" keyProperty="ruleId">
@ -150,10 +156,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
delete from et_fee_rule where rule_id = #{ruleId}
</delete>
<delete id="deleteEtFeeRuleByRuleIds" parameterType="String">
delete from et_fee_rule where rule_id in
<update id="deleteEtFeeRuleByRuleIds" parameterType="String">
update et_fee_rule
set is_deleted = 1
where rule_id in
<foreach item="ruleId" collection="array" open="(" separator="," close=")">
#{ruleId}
</foreach>
</delete>
</update>
</mapper>

1
electripper-system/src/main/resources/mapper/system/EtOrderMapper.xml
View File

@ -57,6 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
oa.is_deposit_deduction isDepositDeduction,
u.user_name AS userName,
u.phonenumber AS phonenumber,
u.real_name AS realName,
o.order_no,
o.out_trade_no,
o.user_id,

8
electripper-system/src/main/resources/mapper/system/SysDeptMapper.xml
View File

@ -17,6 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="delFlag" column="del_flag" />
<result property="parentName" column="parent_name" />
<result property="platformServiceFee" column="platform_service_fee" />
<result property="handlingCharge" column="handling_charge" />
<result property="isProfitSharing" column="is_profit_sharing" />
<result property="isUsePlatformApp" column="is_use_platform_app" />
<result property="domain" column="domain" />
@ -39,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<sql id="selectDeptVo">
select d.dept_id, d.parent_id, d.ancestors, d.dept_name,
d.order_num, d.leader, d.phone, d.email, d.status,
d.del_flag,d.platform_service_fee, d.is_profit_sharing, d.domain, d.is_use_platform_app, d.appid, d.app_name, d.balance, d.app_secret,
d.del_flag,d.platform_service_fee, d.handling_charge, d.is_profit_sharing, d.domain, d.is_use_platform_app, d.appid, d.app_name, d.balance, d.app_secret,
d.merchant_id, d.api_v3_key, d.notify_url, d.private_key_path,d.merchant_serial_number,d.refund_notify_url,
d.create_by, d.create_time
from sys_dept d
@ -77,7 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="selectDeptById" parameterType="Long" resultMap="SysDeptResult">
select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status,d.platform_service_fee, d.is_profit_sharing,d.domain,d.is_use_platform_app, d.appid, d.app_name, d.balance, d.app_secret,
select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status,d.platform_service_fee, d.handling_charge, d.is_profit_sharing,d.domain,d.is_use_platform_app, d.appid, d.app_name, d.balance, d.app_secret,
d.merchant_id, d.api_v3_key, d.notify_url, d.private_key_path,d.merchant_serial_number,d.refund_notify_url,
(select dept_name from sys_dept where dept_id = d.parent_id) parent_name
from sys_dept d
@ -124,6 +125,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="status != null">status,</if>
<if test="createBy != null and createBy != ''">create_by,</if>
<if test="platformServiceFee != null and platformServiceFee != ''">platform_service_fee,</if>
<if test="handlingCharge != null and handlingCharge != ''">handling_charge,</if>
<if test="isProfitSharing != null and isProfitSharing != ''">is_profit_sharing,</if>
<if test="isUsePlatformApp != null and isUsePlatformApp != ''">is_use_platform_app,</if>
<if test="domain != null and domain != ''">domain,</if>
@ -149,6 +151,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="status != null">#{status},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>
<if test="platformServiceFee != null and platformServiceFee != ''">#{platformServiceFee},</if>
<if test="handlingCharge != null and handlingCharge != ''">#{handlingCharge},</if>
<if test="isProfitSharing != null and isProfitSharing != ''">#{isProfitSharing},</if>
<if test="isUsePlatformApp != null and isUsePlatformApp != ''">#{isUsePlatformApp},</if>
<if test="domain != null and domain != ''">#{domain},</if>
@ -178,6 +181,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="status != null and status != ''">status = #{status},</if>
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
<if test="platformServiceFee != null and platformServiceFee != ''">platform_service_fee = #{platformServiceFee},</if>
<if test="handlingCharge != null and handlingCharge != ''">handling_charge = #{handlingCharge},</if>
<if test="isProfitSharing != null and isProfitSharing != ''">is_profit_sharing = #{isProfitSharing},</if>
<if test="isUsePlatformApp != null and isUsePlatformApp != ''">is_use_platform_app = #{isUsePlatformApp},</if>
<if test="domain != null and domain != ''">domain = #{domain},</if>