|
@@ -118,7 +118,7 @@ public class EnterpriseServiceImpl implements EnterpriseService {
|
|
+ "=(select en_uu,'" + content.get("accessSecret") + "' from " + "Enterprise where en_id=" + store.get("en_id") + ") where ma_user='" + ma_user + "'");
|
|
+ "=(select en_uu,'" + content.get("accessSecret") + "' from " + "Enterprise where en_id=" + store.get("en_id") + ") where ma_user='" + ma_user + "'");
|
|
String ma_env = "test";
|
|
String ma_env = "test";
|
|
if (store.get("en_b2benable") != null && store.get("en_b2bwebsite") != null) {// 配置了是否启用B2B,与B2B网址
|
|
if (store.get("en_b2benable") != null && store.get("en_b2bwebsite") != null) {// 配置了是否启用B2B,与B2B网址
|
|
- if (store.get("en_b2bwebsite").equals("http://b2b.usoftchina.com")) {
|
|
|
|
|
|
+ if (store.get("en_b2bwebsite").equals("http://b2brest.usoftchina.com")) {
|
|
ma_env = "prod";
|
|
ma_env = "prod";
|
|
}
|
|
}
|
|
baseDao.execute("update " + sob + ".master set (ma_B2benable,ma_B2bwebsite,ma_env) =(select abs(nvl(En_B2benable,0)),nvl(En_B2bwebsite,' '),'" + ma_env + "' from " + "Enterprise where en_id=" + store.get("en_id") + ") where ma_user='" + ma_user + "'");// 将是否启用B2B,与B2B网址更新到默认账套master表
|
|
baseDao.execute("update " + sob + ".master set (ma_B2benable,ma_B2bwebsite,ma_env) =(select abs(nvl(En_B2benable,0)),nvl(En_B2bwebsite,' '),'" + ma_env + "' from " + "Enterprise where en_id=" + store.get("en_id") + ") where ma_user='" + ma_user + "'");// 将是否启用B2B,与B2B网址更新到默认账套master表
|
|
@@ -221,7 +221,7 @@ public class EnterpriseServiceImpl implements EnterpriseService {
|
|
params.put("emPassword", em_password);
|
|
params.put("emPassword", em_password);
|
|
params.put("emName", en_adminname);
|
|
params.put("emName", en_adminname);
|
|
try {
|
|
try {
|
|
- Response response = HttpUtil.sendGetRequest("http://b2b.usoftchina.com/public/queriable/members/UserEnterprise", params, false);
|
|
|
|
|
|
+ Response response = HttpUtil.sendGetRequest("http://b2brest.usoftchina.com/public/queriable/members/UserEnterprise", params, false);
|
|
if (response.getStatusCode() == HttpStatus.OK.value()) {
|
|
if (response.getStatusCode() == HttpStatus.OK.value()) {
|
|
Map<String, Object> backInfo = FlexJsonUtil.fromJson(response.getResponseText(), HashMap.class);
|
|
Map<String, Object> backInfo = FlexJsonUtil.fromJson(response.getResponseText(), HashMap.class);
|
|
if (backInfo != null) {
|
|
if (backInfo != null) {
|
|
@@ -259,7 +259,7 @@ public class EnterpriseServiceImpl implements EnterpriseService {
|
|
if (enterprise != null) {
|
|
if (enterprise != null) {
|
|
Map<String, Object> regInfos = regEnterprise(enterprise);
|
|
Map<String, Object> regInfos = regEnterprise(enterprise);
|
|
if (regInfos != null && regInfos.get("ok").equals(true)) {
|
|
if (regInfos != null && regInfos.get("ok").equals(true)) {
|
|
- sqls.add("update enterprise set en_uu='" + regInfos.get("enUU") + "',en_adminuu='" + regInfos.get("emUU") + "',en_b2benable=-1,en_b2bwebsite='http://b2b.usoftchina.com' where en_id=" + enid);
|
|
|
|
|
|
+ sqls.add("update enterprise set en_uu='" + regInfos.get("enUU") + "',en_adminuu='" + regInfos.get("emUU") + "',en_b2benable=-1,en_b2bwebsite='http://b2brest.usoftchina.com' where en_id=" + enid);
|
|
sqls.add("update employee set em_uu='" + regInfos.get("emUU") + "' where em_name='" + objs[3].toString() + "'");
|
|
sqls.add("update employee set em_uu='" + regInfos.get("emUU") + "' where em_name='" + objs[3].toString() + "'");
|
|
} else {
|
|
} else {
|
|
BaseUtil.showError(regInfos.get("error").toString());
|
|
BaseUtil.showError(regInfos.get("error").toString());
|
|
@@ -289,7 +289,7 @@ public class EnterpriseServiceImpl implements EnterpriseService {
|
|
HashMap<String, String> params = new HashMap<String, String>();
|
|
HashMap<String, String> params = new HashMap<String, String>();
|
|
params.put("data", FlexJsonUtil.toJson(enterprise));
|
|
params.put("data", FlexJsonUtil.toJson(enterprise));
|
|
try {
|
|
try {
|
|
- Response response = HttpUtil.sendPostRequest("http://b2b.usoftchina.com/public/queriable/erpRegister", params, false);
|
|
|
|
|
|
+ Response response = HttpUtil.sendPostRequest("http://b2brest.usoftchina.com/public/queriable/erpRegister", params, false);
|
|
/*
|
|
/*
|
|
* Response response = HttpUtil.sendPostRequest(
|
|
* Response response = HttpUtil.sendPostRequest(
|
|
* "http://localhost:8080/platform-b2b/public/queriable/erpRegister"
|
|
* "http://localhost:8080/platform-b2b/public/queriable/erpRegister"
|