|
|
@ -3061,12 +3061,6 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
|
|
|
|
throw new InvalidShortIdException();
|
|
|
|
throw new InvalidShortIdException();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
client.putAll(clientConfigService.find(client.getIntValue("client_id")));
|
|
|
|
client.putAll(clientConfigService.find(client.getIntValue("client_id")));
|
|
|
|
if (client.getInteger("open_status") == null) {
|
|
|
|
|
|
|
|
int countProduct = commoditiesMapper.checkProduct(client.getInteger("client_id"));
|
|
|
|
|
|
|
|
if (countProduct <= 0) {
|
|
|
|
|
|
|
|
throw new BadRequestException("The Merchant's Product is empty!");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if (manager != null && ManagerRole.BD_USER.hasRole(manager.getIntValue("role"))) {
|
|
|
|
if (manager != null && ManagerRole.BD_USER.hasRole(manager.getIntValue("role"))) {
|
|
|
|
int bdOperatClientRole = clientBDMapper.checkBDPermission(client.getIntValue("client_id"), manager.getString("manager_id"));
|
|
|
|
int bdOperatClientRole = clientBDMapper.checkBDPermission(client.getIntValue("client_id"), manager.getString("manager_id"));
|
|
|
|
if (bdOperatClientRole <= 0) {
|
|
|
|
if (bdOperatClientRole <= 0) {
|
|
|
@ -3140,13 +3134,6 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (client.getInteger("open_status") == null) {
|
|
|
|
|
|
|
|
int countProduct = commoditiesMapper.checkProduct(client.getInteger("client_id"));
|
|
|
|
|
|
|
|
if (countProduct <= 0) {
|
|
|
|
|
|
|
|
throw new BadRequestException("The Merchant's Product is empty!");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
JSONObject surCharge = merchantInfoProvider.clientCurrentRate(client.getIntValue("client_id"), new Date(), "Wechat");
|
|
|
|
JSONObject surCharge = merchantInfoProvider.clientCurrentRate(client.getIntValue("client_id"), new Date(), "Wechat");
|
|
|
|
if (surCharge == null || surCharge.size() <= 0) {
|
|
|
|
if (surCharge == null || surCharge.size() <= 0) {
|
|
|
|
throw new BadRequestException("The Partner's Rate is not config!");
|
|
|
|
throw new BadRequestException("The Partner's Rate is not config!");
|
|
|
@ -3174,12 +3161,6 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
|
|
|
|
throw new InvalidShortIdException();
|
|
|
|
throw new InvalidShortIdException();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
client.putAll(clientConfigService.find(client.getIntValue("client_id")));
|
|
|
|
client.putAll(clientConfigService.find(client.getIntValue("client_id")));
|
|
|
|
if (client.getInteger("open_status") == null) {
|
|
|
|
|
|
|
|
int countProduct = commoditiesMapper.checkProduct(client.getInteger("client_id"));
|
|
|
|
|
|
|
|
if (countProduct <= 0) {
|
|
|
|
|
|
|
|
throw new BadRequestException("The Merchant's Product is empty!");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (manager != null && ManagerRole.BD_USER.hasRole(manager.getIntValue("role"))) {
|
|
|
|
if (manager != null && ManagerRole.BD_USER.hasRole(manager.getIntValue("role"))) {
|
|
|
|
int bdOperatClientRole = clientBDMapper.checkBDPermission(client.getIntValue("client_id"), manager.getString("manager_id"));
|
|
|
|
int bdOperatClientRole = clientBDMapper.checkBDPermission(client.getIntValue("client_id"), manager.getString("manager_id"));
|
|
|
|