autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-28 15:05:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2024-01-06 15:13:50 +08:00
parent caf9eb21bf
commit d685d12723
35 changed files with 2352 additions and 784 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -80,7 +80,7 @@ import java.util.stream.Collectors;
* @date 2022-09-30
*/
@Service
public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
private Logger logger = LoggerFactory.getLogger(this.getClass());
@@ -615,7 +615,8 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
/**
* 清除订单缓存 订单编号或交易流水号 任意传一个
* @param orderCode 订单编号
*
* @param orderCode 订单编号
* @param transactionCode 交易流水号
*/
@Override
@@ -837,6 +838,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
* 延迟商家订单退款处理逻辑
* 例如：举视以及下面的二级运营商
* 因为在结算时还没有到分账的时间，先解冻需要退款的金额，并退款
*
* @param orderBasicInfo 订单信息
* @param adapayMemberAccount 汇付用户信息
* @param wechatAppId 小程序appId
@@ -1025,6 +1027,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
/**
* 通过站点id修改运营商id
*
* @param stationId
* @return
*/
@@ -1035,6 +1038,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
/**
* 通过订单编号获取南瑞平台所需要的订单数据信息
*
* @param orderCode
* @return
*/
@@ -1053,6 +1057,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
/**
* 通过充电结束时间批量查询
*
* @param dto
* @return
*/
@@ -1433,6 +1438,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
}
return resultList;
}
/**
* 计算余额扣除金额
*
@@ -1517,8 +1523,9 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
/**
* 校验订单分账金额
* @param paymentIds 支付id集合
* @param orderCode 订单编号
*
* @param paymentIds 支付id集合
* @param orderCode 订单编号
* @param settleAmount 结算金额
*/
private OrderSettleResult verifyOrderConfirmAmount(List<String> paymentIds, String orderCode, BigDecimal settleAmount, String wechatAppId) throws BaseAdaPayException {
@@ -1683,8 +1690,8 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
* 余额支付 计算需要退回的金额
*
* @param principalPay 本金支付金额
* @param giftPay 赠送金额支付的金额
* @param orderAmount 订单消费金额
* @param giftPay 赠送金额支付的金额
* @param orderAmount 订单消费金额
* @return
*/
private Map<String, BigDecimal> calculateReturnAmount(BigDecimal principalPay, BigDecimal giftPay, BigDecimal orderAmount) {
@@ -1805,10 +1812,10 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
String transactionIdentifier = data.getTransactionIdentifier();
String startMode = null;
if (StringUtils.equals(transactionIdentifier, "01")) {
startMode = StartModeEnum.APP.getValue();
startMode = StartModeEnum.APP.getValue();
} else if (StringUtils.equals(transactionIdentifier, "02")) {
// 鉴权卡启动
startMode = StartModeEnum.AUTH_CARD.getValue();
// 鉴权卡启动
startMode = StartModeEnum.AUTH_CARD.getValue();
orderBasicInfo.setLogicCard(data.getLogicCard());
} else if (StringUtils.equals(transactionIdentifier, "04")) {
// 离线卡启动
@@ -2090,6 +2097,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
/**
* 校验未支付订单
* 如果存在因为未收到支付回调导致超时关闭的订单，在修改订单状态后，检查一下是否支付过，把支付的金额退款
*
* @param orderBasicInfo
*/
private void checkUnpaidOrder(OrderBasicInfo orderBasicInfo) {
@@ -3216,6 +3224,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
/**
* 余额支付订单逻辑
* 去除赠送金额相关的代码
*
* @param dto
*/
// private void balancePayOrder(PayOrderDTO dto) {
@@ -3309,7 +3318,6 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
// orderPayRecordService.batchInsert(payRecordList);
// }
// }
@Transactional(rollbackFor = Exception.class)
public void balancePayOrderV2(PayOrderDTO dto) {
String orderCode = dto.getOrderCode(); // 订单编号
@@ -3549,6 +3557,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
/**
* 根据车牌号查询订单信息（宁夏交投 用）
*
* @param dto
* @return
*/
@@ -3556,4 +3565,60 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
public List<OrderVO> getOrderInfoByNXJT(NXJTQueryOrdersInfoDTO dto) {
return orderBasicInfoMapper.getOrderInfoByNXJT(dto);
}
@Override
public int deleteByPrimaryKey(Integer id) {
return orderBasicInfoMapper.deleteByPrimaryKey(id);
}
@Override
public int insert(OrderBasicInfo record) {
return orderBasicInfoMapper.insert(record);
}
@Override
public int insertOrUpdate(OrderBasicInfo record) {
return orderBasicInfoMapper.insertOrUpdate(record);
}
@Override
public int insertOrUpdateSelective(OrderBasicInfo record) {
return orderBasicInfoMapper.insertOrUpdateSelective(record);
}
@Override
public int insertSelective(OrderBasicInfo record) {
return orderBasicInfoMapper.insertSelective(record);
}
@Override
public OrderBasicInfo selectByPrimaryKey(Integer id) {
return orderBasicInfoMapper.selectByPrimaryKey(id);
}
@Override
public int updateByPrimaryKeySelective(OrderBasicInfo record) {
return orderBasicInfoMapper.updateByPrimaryKeySelective(record);
}
@Override
public int updateByPrimaryKey(OrderBasicInfo record) {
return orderBasicInfoMapper.updateByPrimaryKey(record);
}
@Override
public int updateBatch(List<OrderBasicInfo> list) {
return orderBasicInfoMapper.updateBatch(list);
}
@Override
public int updateBatchSelective(List<OrderBasicInfo> list) {
return orderBasicInfoMapper.updateBatchSelective(list);
}
@Override
public int batchInsert(List<OrderBasicInfo> list) {
return orderBasicInfoMapper.batchInsert(list);
}
}

4
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderInvoiceRecordServiceImpl.java
View File

@@ -7,8 +7,8 @@ import com.jsowell.pile.dto.GetInvoiceInfoDTO;
import com.jsowell.pile.dto.QueryInvoiceRecordDTO;
import com.jsowell.pile.mapper.OrderInvoiceRecordMapper;
import com.jsowell.pile.service.IMemberInvoiceTitleService;
import com.jsowell.pile.service.IOrderBasicInfoService;
import com.jsowell.pile.service.IOrderInvoiceRecordService;
import com.jsowell.pile.service.OrderBasicInfoService;
import com.jsowell.pile.util.UserUtils;
import com.jsowell.pile.vo.base.OrderAmountDetailVO;
import com.jsowell.pile.vo.uniapp.InvoiceTitleVO;
@@ -37,7 +37,7 @@ public class OrderInvoiceRecordServiceImpl implements IOrderInvoiceRecordService
private IMemberInvoiceTitleService memberInvoiceTitleService;
@Autowired
private IOrderBasicInfoService orderBasicInfoService;
private OrderBasicInfoService orderBasicInfoService;
/**
* 查询申请开票

2
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPayRecordServiceImpl.java
View File

@@ -36,7 +36,7 @@ public class OrderPayRecordServiceImpl implements OrderPayRecordService {
private IMemberTransactionRecordService memberTransactionRecordService;
@Autowired
private IOrderBasicInfoService orderBasicInfoService;
private OrderBasicInfoService orderBasicInfoService;
@Autowired
private RedisCache redisCache;

2
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java
View File

@@ -57,7 +57,7 @@ public class OrderPileOccupyServiceImpl implements OrderPileOccupyService {
private IPileBasicInfoService pileBasicInfoService;
@Resource
private IOrderBasicInfoService orderBasicInfoService;
private OrderBasicInfoService orderBasicInfoService;
@Resource
private IPileBillingTemplateService pileBillingTemplateService;

2
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java
View File

@@ -65,7 +65,7 @@ public class PileConnectorInfoServiceImpl implements IPileConnectorInfoService {
private IPileModelInfoService pileModelInfoService;
@Autowired
private IOrderBasicInfoService orderBasicInfoService;
private OrderBasicInfoService orderBasicInfoService;
@Autowired
private IPileStationInfoService pileStationInfoService;

2
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java
View File

@@ -86,7 +86,7 @@ public class PileStationInfoServiceImpl implements IPileStationInfoService {
private IThirdPartyParkingConfigService parkingConfigService;
@Autowired
private IOrderBasicInfoService orderBasicInfoService;
private OrderBasicInfoService orderBasicInfoService;
/**