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

改名

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-12-07 11:01:45 +08:00
parent f249184cfe
commit 0e9e112885
13 changed files with 74 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,8 +37,8 @@ import com.jsowell.common.util.bean.BeanUtils;
import com.jsowell.pile.domain.*;
import com.jsowell.pile.dto.*;
import com.jsowell.pile.service.*;
import com.jsowell.pile.service.orderlogic.AbstractOrderLogic;
import com.jsowell.pile.service.orderlogic.OrderLogicFactory;
import com.jsowell.pile.service.programlogic.AbstractProgramLogic;
import com.jsowell.pile.service.programlogic.ProgramLogicFactory;
import com.jsowell.pile.util.UserUtils;
import com.jsowell.pile.vo.base.OrderAmountDetailVO;
import com.jsowell.pile.vo.base.OrderPeriodAmountVO;
@@ -156,7 +156,7 @@ public class OrderService {
public String generateOrderV2(GenerateOrderDTO dto) throws ParseException {
// 新逻辑
String delayMode = pileMerchantInfoService.getDelayModeByWechatAppId(dto.getAppId());
AbstractOrderLogic orderLogic = OrderLogicFactory.getOrderLogic(delayMode);
AbstractProgramLogic orderLogic = ProgramLogicFactory.getProgramLogic(delayMode);
OrderBasicInfo orderBasicInfo = orderLogic.generateOrder(dto);
if (orderBasicInfo != null) {
return orderBasicInfo.getOrderCode();
@@ -182,7 +182,7 @@ public class OrderService {
public Map<String, Object> payOrderV2(PayOrderDTO dto) {
String mode = pileMerchantInfoService.getDelayModeByWechatAppId(dto.getWechatAppId());
// 获取处理逻辑
AbstractOrderLogic orderLogic = OrderLogicFactory.getOrderLogic(mode);
AbstractProgramLogic orderLogic = ProgramLogicFactory.getProgramLogic(mode);
Map<String, Object> map = orderLogic.payOrder(dto);
return map;
}
@@ -703,7 +703,7 @@ public class OrderService {
// orderBasicInfoService.settleOrder(data, orderBasicInfo);
// 新逻辑
String mode = pileMerchantInfoService.getDelayModeByMerchantId(orderBasicInfo.getMerchantId());
AbstractOrderLogic orderLogic = OrderLogicFactory.getOrderLogic(mode);
AbstractProgramLogic orderLogic = ProgramLogicFactory.getProgramLogic(mode);
orderLogic.settleOrder(data, orderBasicInfo);
// 发送停止充电指令

6
jsowell-admin/src/main/java/com/jsowell/service/TempService.java
View File

@@ -23,8 +23,8 @@ import com.jsowell.pile.dto.QueryOrderDTO;
import com.jsowell.pile.dto.SettleOrderReportDTO;
import com.jsowell.pile.mapper.OrderBasicInfoMapper;
import com.jsowell.pile.service.*;
import com.jsowell.pile.service.orderlogic.AbstractOrderLogic;
import com.jsowell.pile.service.orderlogic.DelayMerchantOrderLogic;
import com.jsowell.pile.service.programlogic.AbstractProgramLogic;
import com.jsowell.pile.service.programlogic.DelayMerchantProgramLogic;
import com.jsowell.pile.vo.web.ClearingBillVO;
import com.jsowell.pile.vo.web.OrderListVO;
import com.jsowell.pile.vo.web.OrderPayDetailVO;
@@ -428,7 +428,7 @@ public class TempService {
BigDecimal settleAmount = orderBasicInfo.getSettleAmount();
OrderPayRecord record = orderPayRecordList.get(0);
String deductionRecord = record.getDeductionRecord();
AbstractOrderLogic orderLogic = new DelayMerchantOrderLogic();
AbstractProgramLogic orderLogic = new DelayMerchantProgramLogic();
List<PaymentInfo> paymentInfos = orderLogic.parseDeductionRecord(deductionRecord);
// 通过paymentId查询 分账记录