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

update 删除充电桩固件

Browse Source
This commit is contained in:
Guoqs
2025-01-10 11:53:34 +08:00
parent f61e3633ea
commit 841ae04fba
2 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,7 +3,10 @@ package com.jsowell.pile.service.impl;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.jsowell.adapay.dto.PaymentConfirmParam; import com.jsowell.adapay.dto.PaymentConfirmParam;
import com.jsowell.adapay.dto.SplitData; import com.jsowell.adapay.dto.SplitData;
import com.jsowell.common.constant.Constants;
import com.jsowell.common.enums.DelFlagEnum; import com.jsowell.common.enums.DelFlagEnum;
import com.jsowell.common.enums.adapay.AdapayStatusEnum;
import com.jsowell.common.util.DateUtils;
import com.jsowell.pile.domain.OrderSplitRecord; import com.jsowell.pile.domain.OrderSplitRecord;
import com.jsowell.pile.mapper.OrderSplitRecordMapper; import com.jsowell.pile.mapper.OrderSplitRecordMapper;
import com.jsowell.pile.service.OrderSplitRecordService; import com.jsowell.pile.service.OrderSplitRecordService;
@@ -66,28 +69,11 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService {
String orderCode = param.getOrderCode(); String orderCode = param.getOrderCode();
BigDecimal settleAmount = param.getConfirmAmt(); BigDecimal settleAmount = param.getConfirmAmt();
String paymentId = param.getPaymentId(); String paymentId = param.getPaymentId();
// List<DivMember> divMemberList = param.getDivMemberList();
// for (DivMember divMember : divMemberList) {
// OrderSplitRecord orderSplitRecord = new OrderSplitRecord();
// orderSplitRecord.setOrderCode(orderCode);
// orderSplitRecord.setStatus("");
// orderSplitRecord.setSettleAmount(settleAmount);
// orderSplitRecord.setAdapayMemberId(divMember.getMemberId());
// orderSplitRecord.setPaymentId(paymentId);
// orderSplitRecord.setPaymentConfirmId(paymentConfirmId);
// // orderSplitRecord.setElectricitySplitRatio(divMember.getElectricitySplitRatio());
// // orderSplitRecord.setElectricitySplitAmount(divMember.getElectricitySplitAmount());
// // orderSplitRecord.setServiceSplitRatio(divMember.getServiceSplitRatio());
// // orderSplitRecord.setServiceSplitAmount(divMember.getServiceSplitAmount());
// orderSplitRecord.setRemark("");
// orderSplitRecord.setDelFlag(DelFlagEnum.NORMAL.getValue());
// list.add(orderSplitRecord);
// }
for (SplitData splitData : splitDataList) { for (SplitData splitData : splitDataList) {
OrderSplitRecord orderSplitRecord = new OrderSplitRecord(); OrderSplitRecord orderSplitRecord = new OrderSplitRecord();
orderSplitRecord.setOrderCode(orderCode); orderSplitRecord.setOrderCode(orderCode);
orderSplitRecord.setStatus(""); orderSplitRecord.setStatus(AdapayStatusEnum.SUCCEEDED.getValue());
orderSplitRecord.setSettleAmount(settleAmount); orderSplitRecord.setSettleAmount(settleAmount);
orderSplitRecord.setAdapayMemberId(splitData.getMemberId()); orderSplitRecord.setAdapayMemberId(splitData.getMemberId());
orderSplitRecord.setPaymentId(paymentId); orderSplitRecord.setPaymentId(paymentId);
@@ -98,6 +84,8 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService {
orderSplitRecord.setServiceSplitAmount(splitData.getServiceAmount()); orderSplitRecord.setServiceSplitAmount(splitData.getServiceAmount());
orderSplitRecord.setRemark(""); orderSplitRecord.setRemark("");
orderSplitRecord.setDelFlag(DelFlagEnum.NORMAL.getValue()); orderSplitRecord.setDelFlag(DelFlagEnum.NORMAL.getValue());
orderSplitRecord.setCreateBy(Constants.SYSTEM);
orderSplitRecord.setCreateTime(DateUtils.getNowDate());
list.add(orderSplitRecord); list.add(orderSplitRecord);
} }
this.batchInsert(list); this.batchInsert(list);

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

@@ -81,7 +81,7 @@ public class StationSplitConfigServiceImpl implements StationSplitConfigService{
.electricitySplitRatio(new BigDecimal(100)) .electricitySplitRatio(new BigDecimal(100))
.serviceSplitRatio(new BigDecimal(100)) .serviceSplitRatio(new BigDecimal(100))
.feeFlag(Constants.ONE) .feeFlag(Constants.ONE)
.createBy("system") .createBy(Constants.SYSTEM)
.createTime(DateUtils.getNowDate()) .createTime(DateUtils.getNowDate())
.delFlag(DelFlagEnum.NORMAL.getValue()) .delFlag(DelFlagEnum.NORMAL.getValue())
.build(); .build();