|
|
|
@ -285,13 +285,16 @@ public class RetailAppServiceImp implements RetailAppService {
|
|
|
|
throw new NotFoundException("Client not found, please check");
|
|
|
|
throw new NotFoundException("Client not found, please check");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (updateSurchargeDTO.getApiSurcharge() != null) {
|
|
|
|
if (updateSurchargeDTO.getApiSurcharge() != null) {
|
|
|
|
clientModifySupport.processClientConfigModify(new SwitchPermissionModify(account,client.getString("client_moniker"),"api_surcharge",updateSurchargeDTO.getApiSurcharge()));
|
|
|
|
clientModifySupport.processClientConfigModify(
|
|
|
|
|
|
|
|
new SwitchPermissionModify(account, client.getString("client_moniker"), "api_surcharge", updateSurchargeDTO.getApiSurcharge()));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (updateSurchargeDTO.getQrcodeSurcharge() != null) {
|
|
|
|
if (updateSurchargeDTO.getQrcodeSurcharge() != null) {
|
|
|
|
clientModifySupport.processClientConfigModify(new SwitchPermissionModify(account,client.getString("client_moniker"),"qrcode_surcharge",updateSurchargeDTO.getQrcodeSurcharge()));
|
|
|
|
clientModifySupport.processClientConfigModify(
|
|
|
|
|
|
|
|
new SwitchPermissionModify(account, client.getString("client_moniker"), "qrcode_surcharge", updateSurchargeDTO.getQrcodeSurcharge()));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (updateSurchargeDTO.getRetailSurcharge() != null) {
|
|
|
|
if (updateSurchargeDTO.getRetailSurcharge() != null) {
|
|
|
|
clientModifySupport.processClientConfigModify(new SwitchPermissionModify(account,client.getString("client_moniker"),"retail_surcharge",updateSurchargeDTO.getRetailSurcharge()));
|
|
|
|
clientModifySupport.processClientConfigModify(
|
|
|
|
|
|
|
|
new SwitchPermissionModify(account, client.getString("client_moniker"), "retail_surcharge", updateSurchargeDTO.getRetailSurcharge()));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@ -440,9 +443,14 @@ public class RetailAppServiceImp implements RetailAppService {
|
|
|
|
public JSONObject getClientInfoMe(JSONObject device) {
|
|
|
|
public JSONObject getClientInfoMe(JSONObject device) {
|
|
|
|
JSONObject result = new JSONObject();
|
|
|
|
JSONObject result = new JSONObject();
|
|
|
|
JSONObject client = clientMapper.findClient(device.getIntValue("client_id"));
|
|
|
|
JSONObject client = clientMapper.findClient(device.getIntValue("client_id"));
|
|
|
|
|
|
|
|
if(StringUtils.isEmpty(client.getString("business_structure"))||
|
|
|
|
if (StringUtils.isEmpty(client.getString("store_photo"))|| StringUtils.isEmpty(client.getString("logo_url"))|| StringUtils.isEmpty(client.getString("company_photo"))) {
|
|
|
|
StringUtils.isEmpty(client.getString("logo_url"))||
|
|
|
|
|
|
|
|
StringUtils.isEmpty(client.getString("description")) ||
|
|
|
|
|
|
|
|
("Company".equals(client.getString("business_structure")) && StringUtils.isEmpty(client.getString("acn")))||
|
|
|
|
|
|
|
|
(!"Company".equals(client.getString("business_structure")) && StringUtils.isEmpty(client.getString("abn")))||
|
|
|
|
|
|
|
|
(StringUtils.isEmpty(client.getString("company_website")) && StringUtils.isEmpty(client.getString("company_photo")) &&StringUtils.isEmpty(client.getString("store_photo")))) {
|
|
|
|
result.put("base_info_lack", true);
|
|
|
|
result.put("base_info_lack", true);
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
JSONObject file = clientManager.getAuthFiles(null, client.getString("client_moniker"));
|
|
|
|
JSONObject file = clientManager.getAuthFiles(null, client.getString("client_moniker"));
|
|
|
|
for (String s : fileName) {
|
|
|
|
for (String s : fileName) {
|
|
|
|
|