|
@@ -1178,6 +1178,10 @@ public class OrderServiceImpl extends ServiceImpl<AppOrderMapper, AppOrder> impl
|
|
|
}if (appOrder.getType() == 2){
|
|
|
AppSite appSite = appSiteMapper.selectById(appCoursesMapper.selectById(appOrderProInfo.getProductId()).getAddressSiteId());
|
|
|
appIsin.setUseAddress(appSite.getName());
|
|
|
+
|
|
|
+ //判断当前课程是否是在学校上课
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
appIsinMapper.insert(appIsin);
|
|
|
}
|
|
@@ -1226,9 +1230,12 @@ public class OrderServiceImpl extends ServiceImpl<AppOrderMapper, AppOrder> impl
|
|
|
//创建预分账详情
|
|
|
String orgCode = appOrder.getOrgCode();
|
|
|
SysDepart depart = sysDepartMapper.selectOne(Wrappers.lambdaQuery(SysDepart.class).eq(SysDepart::getOrgCode, orgCode).last("limit 1"));
|
|
|
-
|
|
|
+ String deptId = depart.getId();
|
|
|
+ if(depart.getSystemType() == 2){
|
|
|
+ deptId = depart.getParentId();
|
|
|
+ }
|
|
|
if (depart.getSystemType() != 0) {
|
|
|
- SeparateAccounts separateAccounts = separateAccountsMapper.selectOne(Wrappers.lambdaQuery(SeparateAccounts.class).eq(SeparateAccounts::getDeptId, depart.getId()));
|
|
|
+ SeparateAccounts separateAccounts = separateAccountsMapper.selectOne(Wrappers.lambdaQuery(SeparateAccounts.class).eq(SeparateAccounts::getDeptId, deptId));
|
|
|
if (ObjectUtil.isEmpty(separateAccounts)){
|
|
|
throw new JeecgBootException("商户信息未配置!请联系管理员");
|
|
|
}
|