|
@@ -469,6 +469,7 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
|
|
|
Map<String, Object> payMap = new HashMap<>();
|
|
|
payMap.put("orderNo", orderNo);
|
|
|
result.put("payMap", payMap);
|
|
|
+ result.put("amount", productInfo.getPayAmount());
|
|
|
}
|
|
|
createOrderRecord(tenantId, productInfo.getPayAmount(), orderNo, tenantEnum, orderState);
|
|
|
log.info("tenant pay >>>>> {} ", result);
|
|
@@ -510,6 +511,7 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
|
|
|
//续费成功
|
|
|
renewSuccess(val, productInfo, amount);
|
|
|
orderState = 1;
|
|
|
+ result.put("amount", amount);
|
|
|
}
|
|
|
createOrderRecord(tenantId, amount, orderNo, tenantEnum, orderState);
|
|
|
log.info("tenant pay >>>>> {} ", result);
|
|
@@ -729,7 +731,7 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
|
|
|
//生成订单编号
|
|
|
String orderNo = idGenerator.generatorId("payment") + "";
|
|
|
TenantOrderRecordEnum tenantEnum = TenantOrderRecordEnum.TENANT_RECHARGE;
|
|
|
- Map<String, Object> result;
|
|
|
+ Map<String, Object> result = new HashMap<>();
|
|
|
int orderState = 0;
|
|
|
//消费大于0元则拉起支付
|
|
|
if (amount.compareTo(BigDecimal.ZERO) > 0) {
|
|
@@ -745,7 +747,8 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
|
|
|
tenantEnum.getCode()
|
|
|
);
|
|
|
} else {
|
|
|
- return null;
|
|
|
+ result.put("amount",amount);
|
|
|
+ return result;
|
|
|
}
|
|
|
createOrderRecord(tenantId, amount, orderNo, tenantEnum, orderState);
|
|
|
log.info("tenant pay >>>>> {} ", result);
|