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

update 记录scenarioType

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-08-14 13:57:58 +08:00
parent d4663a78ae
commit fd5420dc78
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
View File

@@ -983,7 +983,9 @@ public class OrderService {
.build();
memberTransactionRecordService.insertSelective(record);
String scenarioType = null;
if (StringUtils.equals(type, ScenarioEnum.ORDER.getValue())) { // 1-订单支付
scenarioType = ScenarioEnum.ORDER.getValue();
// 支付订单成功
PayOrderSuccessCallbackDTO callbackDTO = PayOrderSuccessCallbackDTO.builder()
.orderCode(orderCode)
@@ -1003,6 +1005,7 @@ public class OrderService {
.build();
orderPayRecordService.batchInsert(Lists.newArrayList(orderPayRecord));
} else if (StringUtils.equals(type, ScenarioEnum.BALANCE.getValue())) { // 2-充值余额
scenarioType = ScenarioEnum.BALANCE.getValue();
// 充值余额成功
UpdateMemberBalanceDTO dto = new UpdateMemberBalanceDTO();
dto.setMemberId(memberId);
@@ -1017,7 +1020,7 @@ public class OrderService {
memberAdapayRecord.setMemberId(memberId);
memberAdapayRecord.setPaymentId(adapayCallbackRecord.getPaymentId());
memberAdapayRecord.setPaymentOrderNo(adapayCallbackRecord.getOutTransId());
memberAdapayRecord.setScenarioType(ScenarioEnum.BALANCE.getValue());
memberAdapayRecord.setScenarioType(scenarioType);
memberAdapayRecord.setPayAmt(amount);
memberAdapayRecord.setRefundAmt(BigDecimal.ZERO);
memberAdapayRecord.setSpendAmt(BigDecimal.ZERO);

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

@@ -117,11 +117,11 @@ public class OrderPileOccupyServiceImpl implements OrderPileOccupyService{
orderPileOccupy.setPileConnectorCode(pileSn + connectorCode);
orderPileOccupy.setStartTime(DateUtils.getNowDate());
orderPileOccupy.setDelFlag(DelFlagEnum.NORMAL.getValue());
orderPileOccupyMapper.insertOrUpdate(orderPileOccupy);
orderPileOccupyMapper.insertSelective(orderPileOccupy);
}
/**
* 占桩订单停止计费
* 占桩订单停止计费/停止占桩订单计费
*/
@Override
public void stopOccupyPileOrder(String occupyCode) {
@@ -131,7 +131,15 @@ public class OrderPileOccupyServiceImpl implements OrderPileOccupyService{
return;
}
orderPileOccupy.setEndTime(DateUtils.getNowDate());
orderPileOccupyMapper.insertOrUpdate(orderPileOccupy);
orderPileOccupyMapper.updateByPrimaryKeySelective(orderPileOccupy);
}
/**
* 计算占桩订单金额
* calculateTheAmountOfTheOccupancyOrder
*/
public void calculateOccupyPileOrderAmount(String occupyCode) {
}
}