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

Merge branch 'dev' into dev-g

Browse Source
This commit is contained in:
Guoqs
2025-07-04 14:08:42 +08:00
parent 758b7da56e 9b966b43ae
commit 678469cdc0
22 changed files with 341 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2439,6 +2439,75 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
return result;
}
/**
* 校验订单分账金额(其他部分与上面方法一致，此方法仅加了撤销分账部分，只给临时接口用)
*
* @param paymentIds 支付id集合
* @param orderCode 订单编号
* @param settleAmount 结算金额
*/
@Override
public OrderSplitResult verifyOrderConfirmAmountWithCancelSplit(List<String> paymentIds, String orderCode, BigDecimal settleAmount, String wechatAppId) throws BaseAdaPayException {
// 分账金额
BigDecimal totalConfirmAmt = BigDecimal.ZERO;
// 手续费
BigDecimal feeAmt = BigDecimal.ZERO;
// 通过支付id查询分账情况
for (String paymentId : paymentIds) {
QueryPaymentConfirmDTO dto = new QueryPaymentConfirmDTO();
dto.setPaymentId(paymentId);
dto.setWechatAppId(wechatAppId);
QueryPaymentConfirmDetailResponse response = adapayService.queryPaymentConfirmList(dto);
if (response != null) {
List<PaymentConfirmInfo> confirms = response.getPaymentConfirms();
if (CollectionUtils.isNotEmpty(confirms)) {
for (PaymentConfirmInfo confirm : confirms) {
// 校验分账是否撤销
if (queryConfirmReverseStatus(confirm.getId(), wechatAppId)) {
logger.info("支付确认id:" + confirm.getId() + "撤销了。。。");
continue;
}
// 如果没有撤销，先撤销分账，再重新进行分账
adapayService.createConfirmReverse(confirm.getId(), wechatAppId);
JSONObject jsonObject = JSON.parseObject(confirm.getDescription());
if (StringUtils.equals(jsonObject.getString("orderCode"), orderCode)) {
// 订单号对的上，累计分账金额
BigDecimal confirmAmt = new BigDecimal(confirm.getConfirmAmt());
BigDecimal confirmedAmt = new BigDecimal(confirm.getConfirmedAmt());
BigDecimal orderConfirmedAmt = confirmedAmt.compareTo(BigDecimal.ZERO) == 0
? confirmedAmt
: confirmAmt;
totalConfirmAmt = totalConfirmAmt.add(orderConfirmedAmt);
feeAmt = feeAmt.add(new BigDecimal(confirm.getFeeAmt()));
}
}
}
}
}
OrderSplitResult result = new OrderSplitResult();
result.setOrderCode(orderCode);
result.setSettleAmt(settleAmount.toString());
result.setConfirmAmt(totalConfirmAmt.toString());
if (totalConfirmAmt.compareTo(BigDecimal.ZERO) == 0) {
feeAmt = BigDecimal.ZERO;
}
result.setFeeAmt(feeAmt.toString());
String status;
// 如果确认金额和结算金额相等，返回succeeded，其他情况返回PENDING
if (settleAmount.compareTo(totalConfirmAmt) == 0) {
// 返回succeeded 标识该笔订单已经完成了分账，不要再次执行分账
status = AdapayStatusEnum.SUCCEEDED.getValue();
} else {
status = AdapayStatusEnum.PENDING.getValue();
}
result.setStatus(status);
logger.info("校验订单分账金额-orderCode:{}, 分账结果:{}", orderCode, JSON.toJSONString(result));
return result;
}
/**
* 查询分账撤销状态
*/
@@ -5240,5 +5309,10 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
return map;
}
@Override
public List<OrderBasicInfo> getOrderBasicInfoByTimeInterval(List<String> stationIds, String startTime, String endTime) {
return orderBasicInfoMapper.getOrderBasicInfoByTimeInterval(stationIds, startTime, endTime);
}
}

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

@@ -37,6 +37,7 @@ import com.jsowell.pile.vo.uniapp.business.StationOrderQuantityInfoVO;
import com.jsowell.pile.vo.uniapp.business.StationStatisticsInfosVO;
import com.jsowell.pile.vo.uniapp.customer.CurrentTimePriceDetails;
import com.jsowell.pile.vo.web.PileStationVO;
import com.jsowell.pile.vo.web.StationSelectVO;
import com.jsowell.system.service.SysDeptService;
import com.jsowell.system.service.SysUserService;
import lombok.extern.slf4j.Slf4j;
@@ -424,15 +425,18 @@ public class PileStationInfoServiceImpl implements PileStationInfoService {
}
// 2024年8月16日14点15分 天地图坐标转高德坐标
String stationLng = pileStationInfo.getStationLng();
String stationLat = pileStationInfo.getStationLat();
if (StringUtils.isNotBlank(stationLng) && StringUtils.isNotBlank(stationLat)) {
// 获取经纬度
CoordinateUtil.Coordinate coordinate = CoordinateUtil.wgs84ToGcj02(Double.parseDouble(stationLng), Double.parseDouble(stationLat));
pileStationInfo.setStationLng(String.format("%.6f", coordinate.getLng()));
pileStationInfo.setStationLat(String.format("%.6f", coordinate.getLat()));
log.info("天地图坐标:{}, 转高德坐标:{}", stationLng + ", " + stationLat, pileStationInfo.getStationLng() + ", " + pileStationInfo.getStationLat());
}
// String stationLng = pileStationInfo.getStationLng();
// String stationLat = pileStationInfo.getStationLat();
// 2025-07-01 存到数据库的经纬度数据不再进行转换，直接入库
// if (StringUtils.isNotBlank(stationLng) && StringUtils.isNotBlank(stationLat)) {
// // 获取经纬度
// CoordinateUtil.Coordinate coordinate = CoordinateUtil.wgs84ToGcj02(Double.parseDouble(stationLng), Double.parseDouble(stationLat));
// pileStationInfo.setStationLng(String.format("%.6f", coordinate.getLng()));
// pileStationInfo.setStationLat(String.format("%.6f", coordinate.getLat()));
// log.info("天地图坐标:{}, 转高德坐标:{}", stationLng + ", " + stationLat, pileStationInfo.getStationLng() + ", " + pileStationInfo.getStationLat());
// }
pileStationInfo.setUpdateBy(SecurityUtils.getUsername());
pileStationInfo.setUpdateTime(DateUtils.getNowDate());
@@ -837,7 +841,7 @@ public class PileStationInfoServiceImpl implements PileStationInfoService {
* @return
*/
@Override
public List<PileStationVO> getStationSelectList(QueryStationDTO dto) {
public List<StationSelectVO> getStationSelectList(QueryStationDTO dto) {
AuthorizedDeptVO authorizedMap = UserUtils.getAuthorizedMap();
if (authorizedMap == null) {
// 为空表示没有权限，返回空数组