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-05-27 21:14:49 +08:00
parent eaa2f4d6a4
commit 46740f14d8
7 changed files with 76 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
electripper-system/src/main/java/com/ruoyi/system/mapper/EtCapitalFlowMapper.java
View File

@ -5,15 +5,15 @@ import com.ruoyi.system.domain.EtCapitalFlow;
/**
* 资金流水Mapper接口
*
*
* @author 邱贞招
* @date 2024-05-24
*/
public interface EtCapitalFlowMapper
public interface EtCapitalFlowMapper
{
/**
* 查询资金流水
*
*
* @param flowId 资金流水主键
* @return 资金流水
*/
@ -21,7 +21,7 @@ public interface EtCapitalFlowMapper
/**
* 查询资金流水列表
*
*
* @param etCapitalFlow 资金流水
* @return 资金流水集合
*/
@ -29,7 +29,7 @@ public interface EtCapitalFlowMapper
/**
* 新增资金流水
*
*
* @param etCapitalFlow 资金流水
* @return 结果
*/
@ -37,7 +37,7 @@ public interface EtCapitalFlowMapper
/**
* 修改资金流水
*
*
* @param etCapitalFlow 资金流水
* @return 结果
*/
@ -45,7 +45,7 @@ public interface EtCapitalFlowMapper
/**
* 删除资金流水
*
*
* @param flowId 资金流水主键
* @return 结果
*/
@ -53,9 +53,11 @@ public interface EtCapitalFlowMapper
/**
* 批量删除资金流水
*
*
* @param flowIds 需要删除的数据主键集合
* @return 结果
*/
public int deleteEtCapitalFlowByFlowIds(Long[] flowIds);
EtCapitalFlow selectEtCapitalFlowByOutTradeNo(String outTradeNo);
}

24
electripper-system/src/main/java/com/ruoyi/system/service/IEtCapitalFlowService.java
View File

@ -5,23 +5,31 @@ import com.ruoyi.system.domain.EtCapitalFlow;
/**
* 资金流水Service接口
*
*
* @author 邱贞招
* @date 2024-05-24
*/
public interface IEtCapitalFlowService
public interface IEtCapitalFlowService
{
/**
* 查询资金流水
*
*
* @param flowId 资金流水主键
* @return 资金流水
*/
public EtCapitalFlow selectEtCapitalFlowByFlowId(Long flowId);
/**
* 根据第三方交易单号查询资金流水
*
* @param outTradeNo 第三方交易单号
* @return 资金流水
*/
public EtCapitalFlow selectEtCapitalFlowByOutTradeNo(String outTradeNo);
/**
* 查询资金流水列表
*
*
* @param etCapitalFlow 资金流水
* @return 资金流水集合
*/
@ -29,7 +37,7 @@ public interface IEtCapitalFlowService
/**
* 新增资金流水
*
*
* @param etCapitalFlow 资金流水
* @return 结果
*/
@ -37,7 +45,7 @@ public interface IEtCapitalFlowService
/**
* 修改资金流水
*
*
* @param etCapitalFlow 资金流水
* @return 结果
*/
@ -45,7 +53,7 @@ public interface IEtCapitalFlowService
/**
* 批量删除资金流水
*
*
* @param flowIds 需要删除的资金流水主键集合
* @return 结果
*/
@ -53,7 +61,7 @@ public interface IEtCapitalFlowService
/**
* 删除资金流水信息
*
*
* @param flowId 资金流水主键
* @return 结果
*/

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

@ -453,7 +453,7 @@ public class AsDeviceServiceImpl extends ServiceImpl<AsDeviceMapper, AsDevice> i
String finalOrderNo = orderNo;
Boolean execute = transactionTemplate.execute(e -> {
/** 2.发送命令*/
sendCommand(asDevice.getMac(), token,IotConstants.COMMAND_OPEN,"编号开锁");
// sendCommand(asDevice.getMac(), token,IotConstants.COMMAND_OPEN,"编号开锁");
/** 3.更新车辆状态*/
asDevice.setLockStatus(ServiceConstants.LOCK_STATUS_OPEN);
asDevice.setStatus(ServiceConstants.VEHICLE_STATUS_IN_USING);
@ -942,13 +942,8 @@ public class AsDeviceServiceImpl extends ServiceImpl<AsDeviceMapper, AsDevice> i
//根据订单的开始时间和还车时间计算出在第几个计费周期，在第一个计费周期内，并没有超过封顶费用，则根据规则算出骑行费，
Integer cycle = null;
Date startTime;
Date startTime = order.getUnlockTime();
Date endTime = order.getReturnTime();
if(ObjectUtil.isNull(order.getAppointmentFee()) || order.getAppointmentFee().compareTo(BigDecimal.ZERO) == 0){//没有预约
startTime = order.getUnlockTime();
}else{//有预约
startTime = order.getAppointmentStartTime();
}
String chargingCycle = rule.getChargingCycle();
String chargingCycleValue = rule.getChargingCycleValue();
@ -1060,12 +1055,13 @@ public class AsDeviceServiceImpl extends ServiceImpl<AsDeviceMapper, AsDevice> i
if(ObjectUtils.isNotEmpty(returnTime) && ObjectUtils.isNotEmpty(unlockTime)){
if(minutes<startingTime){
//小于起步分钟，按照起步价计算费用
order.setRidingFee(new BigDecimal(startingPrice));
ridingFee = new BigDecimal(startingPrice);
}else{
//大于起步分钟，按照时长费计算费用
//minutes除以startingMinutes得到的结构四舍五入
minutes = minutes - timeoutTime;//扣掉起步分钟数后
ridingFee = new BigDecimal(Math.ceil(minutes / timeoutTime) * Integer.parseInt(timeoutPrice));
double ceil = Math.ceil(minutes / timeoutTime) +1 ;
ridingFee = new BigDecimal(ceil * Integer.parseInt(timeoutPrice));
BigDecimal startingPriceB = new BigDecimal(startingPrice);
ridingFee = ridingFee.add(startingPriceB);
}

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

@ -19,6 +19,7 @@ import com.ruoyi.common.utils.http.HttpUtils;
import com.ruoyi.common.utils.onenet.Token;
import com.ruoyi.system.domain.*;
import com.ruoyi.system.domain.vo.AttachVo;
import com.ruoyi.system.mapper.SysUserMapper;
import com.ruoyi.system.service.*;
import com.wechat.pay.java.core.notification.Notification;
import com.wechat.pay.java.core.notification.NotificationParser;
@ -82,8 +83,11 @@ public class CallbackServiceImpl implements CallbackService {
@Value("${et.handlingCharge}")
private String handlingCharge;
// @Autowired
// private ISysUserService sysUserService;
@Autowired
private ISysUserService sysUserService;
private SysUserMapper userMapper;
/**
@ -116,7 +120,6 @@ public class CallbackServiceImpl implements CallbackService {
if(StrUtil.isNotBlank(order.getSn())){
asDevice = asDeviceService.selectAsDeviceBySn(order.getSn());
}
String iotToken = Token.getToken();
//先判断是骑行订单还是押金，如果是骑行订单
// 还要区分是取消预约支付
// 如果是,更新订单状态，pay_time、pay_type（默认是wx）、appointment_fee等于total_fee，状态改为4 订单结束
@ -130,7 +133,6 @@ public class CallbackServiceImpl implements CallbackService {
// 1-骑行支付 关锁
order.setStatus(ServiceConstants.ORDER_STATUS_ORDER_END);
order.setMark("骑行支付");
asDeviceService.sendCommand(asDevice.getMac(), iotToken, IotConstants.COMMAND_OPEN,"套餐开锁");
asDevice.setStatus(ServiceConstants.VEHICLE_STATUS_NORMAL);//还车后车辆正常运营
asDevice.setLockStatus(ServiceConstants.LOCK_STATUS_CLOSE);
@ -200,7 +202,7 @@ public class CallbackServiceImpl implements CallbackService {
order.setAppointmentStartTime(DateUtils.getNowDate());
order.setMark("套餐预约支付");
/** 2.发送命令*/
asDeviceService.sendCommand(asDevice.getMac(), iotToken,IotConstants.COMMAND_CLOSE,"套餐预约");
// asDeviceService.sendCommand(asDevice.getMac(), iotToken,IotConstants.COMMAND_CLOSE,"套餐预约");
/** 3.更新车辆状态*/
asDevice.setStatus(ServiceConstants.VEHICLE_STATUS_IN_APPOINTMENT);//预约中
asDevice.setLockStatus(ServiceConstants.LOCK_STATUS_CLOSE);
@ -209,7 +211,7 @@ public class CallbackServiceImpl implements CallbackService {
order.setMark("套餐骑行支付");
order.setStatus(ServiceConstants.ORDER_STATUS_RIDING);//骑行中
/** 2.发送命令*/
asDeviceService.sendCommand(asDevice.getMac(), iotToken,IotConstants.COMMAND_OPEN,"套餐开锁");
// asDeviceService.sendCommand(asDevice.getMac(), iotToken,IotConstants.COMMAND_OPEN,"套餐开锁");
/** 3.更新车辆状态*/
asDevice.setLockStatus(ServiceConstants.LOCK_STATUS_OPEN);
asDevice.setStatus(ServiceConstants.VEHICLE_STATUS_IN_USING);
@ -266,6 +268,9 @@ public class CallbackServiceImpl implements CallbackService {
* 资金流水记录
* */
private void capitalFlowRecords(EtOrder order,String type,String busType) {
if(ObjectUtil.isNotNull(etCapitalFlowService.selectEtCapitalFlowByOutTradeNo(order.getOutTradeNo()))){
return;
}
EtCapitalFlow capitalFlow = new EtCapitalFlow();
capitalFlow.setAreaId(order.getAreaId());
capitalFlow.setOrderNo(order.getOrderNo());
@ -281,13 +286,13 @@ public class CallbackServiceImpl implements CallbackService {
//获取所有合伙人列表
SysUser sysUser = new SysUser();
sysUser.setUserType("03");
List<SysUser> sysUsers = sysUserService.selectUserList(sysUser);
List<SysUser> sysUsers = userMapper.selectUserList(sysUser);
double totalDividendProportion = sysUsers.stream()
.mapToDouble(SysUser::getDividendProportion)
.sum();//算出总的分成比例
BigDecimal decimal = new BigDecimal(totalDividendProportion).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP);
BigDecimal partnerDividend = order.getTotalFee().multiply(decimal);
BigDecimal operatorDividend = order.getTotalFee().subtract(capitalFlow.getPartnerDividend());
BigDecimal operatorDividend = order.getTotalFee().subtract(partnerDividend);
if(type.equals(ServiceConstants.FLOW_TYPE_INCOME)){
capitalFlow.setPartnerDividend(partnerDividend);
capitalFlow.setOperatorDividend(operatorDividend);

27
electripper-system/src/main/java/com/ruoyi/system/service/impl/EtCapitalFlowServiceImpl.java
View File

@ -10,19 +10,19 @@ import com.ruoyi.system.service.IEtCapitalFlowService;
/**
* 资金流水Service业务层处理
*
*
* @author 邱贞招
* @date 2024-05-24
*/
@Service
public class EtCapitalFlowServiceImpl implements IEtCapitalFlowService
public class EtCapitalFlowServiceImpl implements IEtCapitalFlowService
{
@Autowired
private EtCapitalFlowMapper etCapitalFlowMapper;
/**
* 查询资金流水
*
*
* @param flowId 资金流水主键
* @return 资金流水
*/
@ -32,9 +32,20 @@ public class EtCapitalFlowServiceImpl implements IEtCapitalFlowService
return etCapitalFlowMapper.selectEtCapitalFlowByFlowId(flowId);
}
/**
* 根据第三方交易单号查询资金流水
*
* @param outTradeNo 第三方交易单号
* @return 资金流水
*/
@Override
public EtCapitalFlow selectEtCapitalFlowByOutTradeNo(String outTradeNo) {
return etCapitalFlowMapper.selectEtCapitalFlowByOutTradeNo(outTradeNo);
}
/**
* 查询资金流水列表
*
*
* @param etCapitalFlow 资金流水
* @return 资金流水
*/
@ -46,7 +57,7 @@ public class EtCapitalFlowServiceImpl implements IEtCapitalFlowService
/**
* 新增资金流水
*
*
* @param etCapitalFlow 资金流水
* @return 结果
*/
@ -59,7 +70,7 @@ public class EtCapitalFlowServiceImpl implements IEtCapitalFlowService
/**
* 修改资金流水
*
*
* @param etCapitalFlow 资金流水
* @return 结果
*/
@ -71,7 +82,7 @@ public class EtCapitalFlowServiceImpl implements IEtCapitalFlowService
/**
* 批量删除资金流水
*
*
* @param flowIds 需要删除的资金流水主键
* @return 结果
*/
@ -83,7 +94,7 @@ public class EtCapitalFlowServiceImpl implements IEtCapitalFlowService
/**
* 删除资金流水信息
*
*
* @param flowId 资金流水主键
* @return 结果
*/

6
electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOperatingAreaServiceImpl.java
View File

@ -141,8 +141,10 @@ public class EtOperatingAreaServiceImpl extends ServiceImpl<EtOperatingAreaMappe
etAreaRuleMapper.deleteAreaRuleByAreaId(etOperatingArea.getAreaId());
int i = dao.updateById(etOperatingArea);
Long[] ruleIds = etOperatingArea.getRuleIds();
for (Long ruleId:ruleIds){
etAreaRuleMapper.insert(EtAreaRule.builder().areaId(etOperatingArea.getAreaId()).ruleId(ruleId).build());
if(ObjectUtil.isNotNull(ruleIds)){
for (Long ruleId:ruleIds){
etAreaRuleMapper.insert(EtAreaRule.builder().areaId(etOperatingArea.getAreaId()).ruleId(ruleId).build());
}
}
return i;
}

16
electripper-system/src/main/resources/mapper/system/EtCapitalFlowMapper.xml
View File

@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.EtCapitalFlowMapper">
<resultMap type="EtCapitalFlow" id="EtCapitalFlowResult">
<result property="flowId" column="flow_id" />
<result property="areaId" column="area_id" />
@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectEtCapitalFlowList" parameterType="EtCapitalFlow" resultMap="EtCapitalFlowResult">
<include refid="selectEtCapitalFlowVo"/>
<where>
<where>
<if test="areaId != null "> and area_id = #{areaId}</if>
<if test="orderNo != null and orderNo != ''"> and order_no = #{orderNo}</if>
<if test="outTradeNo != null and outTradeNo != ''"> and out_trade_no = #{outTradeNo}</if>
@ -40,12 +40,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="payType != null and payType != ''"> and pay_type = #{payType}</if>
</where>
</select>
<select id="selectEtCapitalFlowByFlowId" parameterType="Long" resultMap="EtCapitalFlowResult">
<include refid="selectEtCapitalFlowVo"/>
where flow_id = #{flowId}
</select>
<select id="selectEtCapitalFlowByOutTradeNo" resultType="com.ruoyi.system.domain.EtCapitalFlow">
<include refid="selectEtCapitalFlowVo"/>
where out_trade_no = #{outTradeNo}
</select>
<insert id="insertEtCapitalFlow" parameterType="EtCapitalFlow">
insert into et_capital_flow
<trim prefix="(" suffix=")" suffixOverrides=",">
@ -104,9 +108,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<delete id="deleteEtCapitalFlowByFlowIds" parameterType="String">
delete from et_capital_flow where flow_id in
delete from et_capital_flow where flow_id in
<foreach item="flowId" collection="array" open="(" separator="," close=")">
#{flowId}
</foreach>
</delete>
</mapper>
</mapper>