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

update 第三方平台生成订单时将 type 写入订单主表

Browse Source
This commit is contained in:
Lemon
2024-01-13 09:55:26 +08:00
parent 7f20c611db
commit 7e49a4be30
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -301,7 +301,7 @@ public interface OrderBasicInfoService{
* @param dto * @param dto
* @return * @return
*/ */
Map<String, Object> generateOrderForLianLian(QueryStartChargeDTO dto); Map<String, Object> generateOrderForThirdParty(QueryStartChargeDTO dto);
List<OrderAmountDetailVO> queryOrderAmountDetail(List<String> orderCodes); List<OrderAmountDetailVO> queryOrderAmountDetail(List<String> orderCodes);

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

@@ -25,6 +25,7 @@ import com.jsowell.common.enums.DelFlagEnum;
import com.jsowell.common.enums.MemberWalletEnum; import com.jsowell.common.enums.MemberWalletEnum;
import com.jsowell.common.enums.adapay.AdapayStatusEnum; import com.jsowell.common.enums.adapay.AdapayStatusEnum;
import com.jsowell.common.enums.adapay.MerchantDelayModeEnum; import com.jsowell.common.enums.adapay.MerchantDelayModeEnum;
import com.jsowell.common.enums.thirdparty.ThirdPartyOperatorIdEnum;
import com.jsowell.common.enums.ykc.*; import com.jsowell.common.enums.ykc.*;
import com.jsowell.common.exception.BusinessException; import com.jsowell.common.exception.BusinessException;
import com.jsowell.common.util.DateUtils; import com.jsowell.common.util.DateUtils;
@@ -2479,8 +2480,11 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
* @return * @return
*/ */
@Override @Override
public Map<String, Object> generateOrderForLianLian(QueryStartChargeDTO dto) { public Map<String, Object> generateOrderForThirdParty(QueryStartChargeDTO dto) {
// 联联平台生成订单 // 获取到第三方平台类型
String operatorId = dto.getOperatorId();
String type = ThirdPartyOperatorIdEnum.getTypeByOperatorId(operatorId);
// 生成订单
String orderCode = dto.getStartChargeSeq(); String orderCode = dto.getStartChargeSeq();
String pileConnectorCode = dto.getConnectorID(); String pileConnectorCode = dto.getConnectorID();
String pileSn = StringUtils.substring(pileConnectorCode, 0, 14); String pileSn = StringUtils.substring(pileConnectorCode, 0, 14);
@@ -2514,6 +2518,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
.pileConnectorCode(pileConnectorCode) .pileConnectorCode(pileConnectorCode)
// .logicCard(pileAuthCardInfo.getLogicCard()) // 卡号 // .logicCard(pileAuthCardInfo.getLogicCard()) // 卡号
.startMode(StartModeEnum.THIRD_PARTY_PLATFORM.getValue()) // 启动方式 .startMode(StartModeEnum.THIRD_PARTY_PLATFORM.getValue()) // 启动方式
.thirdPartyType(type) // 第三方平台类型
.payStatus(Constants.ONE) .payStatus(Constants.ONE)
.payAmount(dto.getAccountBalance()) // 支付金额 .payAmount(dto.getAccountBalance()) // 支付金额
.payTime(new Date()) .payTime(new Date())

2
jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java vendored
View File

@@ -650,7 +650,7 @@ public class LianLianServiceImpl implements LianLianService {
return null; return null;
} }
// 生成订单 // 生成订单
Map<String, Object> map = orderBasicInfoService.generateOrderForLianLian(dto); Map<String, Object> map = orderBasicInfoService.generateOrderForThirdParty(dto);
String orderCode = (String) map.get("orderCode"); String orderCode = (String) map.get("orderCode");
String transactionCode = (String) map.get("transactionCode"); String transactionCode = (String) map.get("transactionCode");
OrderBasicInfo orderBasicInfo = (OrderBasicInfo) map.get("orderBasicInfo"); OrderBasicInfo orderBasicInfo = (OrderBasicInfo) map.get("orderBasicInfo");