|
@@ -349,7 +349,7 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
|
|
|
Lists.partition(collectMenuId, 50)
|
|
|
.forEach(idList -> employeeService.batchInsertRoleMenu(roleId, idList, tenantId));
|
|
|
//添加签章信息
|
|
|
- contractService.addTsign(tenantInfo.getUserId(),tenantInfo.getTsignCode(), tenantInfo.getTsignName(), tenantId);
|
|
|
+ contractService.addTsign(tenantInfo.getUserId(), tenantInfo.getTsignCode(), tenantInfo.getTsignName(), tenantId);
|
|
|
|
|
|
Date now = new Date();
|
|
|
|
|
@@ -476,16 +476,16 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
|
|
|
int orderState = 0;
|
|
|
//消费大于0元则拉起支付
|
|
|
if (productInfo.getPayAmount().compareTo(BigDecimal.ZERO) > 0) {
|
|
|
- result = payService.getPayMap(
|
|
|
+ result = payService.getPayToPlatformMap(
|
|
|
+ PaymentChannelEnum.ADAPAY,
|
|
|
+ null,
|
|
|
productInfo.getPayAmount(),
|
|
|
BigDecimal.ZERO,
|
|
|
orderNo,
|
|
|
null,
|
|
|
null,
|
|
|
tenantEnum.getMsg(),
|
|
|
- tenantEnum.getMsg(),
|
|
|
- config.getParanValue(Integer.class),
|
|
|
- tenantEnum.getCode()
|
|
|
+ tenantEnum.getMsg()
|
|
|
);
|
|
|
} else {
|
|
|
//已支付
|
|
@@ -524,16 +524,16 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
|
|
|
int orderState = 0;
|
|
|
//消费大于0元则拉起支付
|
|
|
if (amount.compareTo(BigDecimal.ZERO) > 0) {
|
|
|
- result = payService.getPayMap(
|
|
|
+ result = payService.getPayToPlatformMap(
|
|
|
+ PaymentChannelEnum.ADAPAY,
|
|
|
+ null,
|
|
|
amount,
|
|
|
BigDecimal.ZERO,
|
|
|
orderNo,
|
|
|
null,
|
|
|
null,
|
|
|
tenantEnum.getMsg(),
|
|
|
- tenantEnum.getMsg(),
|
|
|
- config.getParanValue(Integer.class),
|
|
|
- tenantEnum.getCode()
|
|
|
+ tenantEnum.getMsg()
|
|
|
);
|
|
|
//操作续费信息,把续费周期存起来
|
|
|
opsRenewInfo(tenantId).set(val, 1, TimeUnit.HOURS);
|
|
@@ -739,16 +739,16 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
|
|
|
int orderState = 0;
|
|
|
//消费大于0元则拉起支付
|
|
|
if (amount.compareTo(BigDecimal.ZERO) > 0) {
|
|
|
- result = payService.getPayMap(
|
|
|
+ result = payService.getPayToPlatformMap(
|
|
|
+ PaymentChannelEnum.ADAPAY,
|
|
|
+ null,
|
|
|
amount,
|
|
|
BigDecimal.ZERO,
|
|
|
orderNo,
|
|
|
null,
|
|
|
null,
|
|
|
tenantEnum.getMsg(),
|
|
|
- tenantEnum.getMsg(),
|
|
|
- config.getParanValue(Integer.class),
|
|
|
- tenantEnum.getCode()
|
|
|
+ tenantEnum.getMsg()
|
|
|
);
|
|
|
} else {
|
|
|
orderState = 1;
|