|
|
|
@ -168,7 +168,7 @@ public class RetailAppServiceImp implements RetailAppService {
|
|
|
|
|
private ClientModifySupport clientModifySupport;
|
|
|
|
|
private Map<String, AppMsgSender> senderMap = new HashMap<>();
|
|
|
|
|
|
|
|
|
|
private final String fileName[] = { "client_bank_file", "client_id_file", "client_company_file"};
|
|
|
|
|
private final String fileName[] = { "client_bank_file", "client_id_file", "client_company_file" };
|
|
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
|
public void setAppMsgSenders(AppMsgSender[] senders) {
|
|
|
|
@ -428,16 +428,16 @@ public class RetailAppServiceImp implements RetailAppService {
|
|
|
|
|
if (clientType.equals("iphone")) {
|
|
|
|
|
res.put("skip_clearing", !res.getBoolean("skip_clearing"));
|
|
|
|
|
}
|
|
|
|
|
if("4".equals(clientWithConfig.getString("source"))) {
|
|
|
|
|
if ("4".equals(clientWithConfig.getString("source"))) {
|
|
|
|
|
res.put("refuse_remark", clientWithConfig.getString("refuse_remark"));
|
|
|
|
|
res.put("base_info_lack", false);
|
|
|
|
|
res.put("compliance_info_lack", false);
|
|
|
|
|
if (StringUtils.isEmpty(clientWithConfig.getString("business_structure")) ||
|
|
|
|
|
StringUtils.isEmpty(clientWithConfig.getString("logo_url")) ||
|
|
|
|
|
StringUtils.isEmpty(clientWithConfig.getString("description")) ||
|
|
|
|
|
("Company".equals(clientWithConfig.getString("business_structure")) && StringUtils.isEmpty(clientWithConfig.getString("acn"))) ||
|
|
|
|
|
(!"Company".equals(clientWithConfig.getString("business_structure")) && StringUtils.isEmpty(clientWithConfig.getString("abn"))) ||
|
|
|
|
|
(StringUtils.isEmpty(clientWithConfig.getString("company_website")) && StringUtils.isEmpty(clientWithConfig.getString("company_photo")) && StringUtils.isEmpty(clientWithConfig.getString("store_photo")))) {
|
|
|
|
|
if (StringUtils.isEmpty(clientWithConfig.getString("business_structure")) || StringUtils.isEmpty(clientWithConfig.getString("logo_url"))
|
|
|
|
|
|| StringUtils.isEmpty(clientWithConfig.getString("description"))
|
|
|
|
|
|| ("Company".equals(clientWithConfig.getString("business_structure")) && StringUtils.isEmpty(clientWithConfig.getString("acn")))
|
|
|
|
|
|| (!"Company".equals(clientWithConfig.getString("business_structure")) && StringUtils.isEmpty(clientWithConfig.getString("abn")))
|
|
|
|
|
|| (StringUtils.isEmpty(clientWithConfig.getString("company_website")) && StringUtils.isEmpty(clientWithConfig.getString("company_photo"))
|
|
|
|
|
&& StringUtils.isEmpty(clientWithConfig.getString("store_photo")))) {
|
|
|
|
|
res.put("base_info_lack", true);
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
@ -464,12 +464,12 @@ public class RetailAppServiceImp implements RetailAppService {
|
|
|
|
|
result.put("base_info_lack", false);
|
|
|
|
|
result.put("compliance_info_lack", false);
|
|
|
|
|
JSONObject client = clientMapper.findClient(device.getIntValue("client_id"));
|
|
|
|
|
if(StringUtils.isEmpty(client.getString("business_structure"))||
|
|
|
|
|
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")))) {
|
|
|
|
|
if (StringUtils.isEmpty(client.getString("business_structure")) || 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);
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
@ -480,8 +480,8 @@ public class RetailAppServiceImp implements RetailAppService {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
result.putAll(file);
|
|
|
|
|
result.put("approve_result",client.getString("approve_result"));
|
|
|
|
|
result.put("mail_confirm",client.getBoolean("mail_confirm"));
|
|
|
|
|
result.put("approve_result", client.getString("approve_result"));
|
|
|
|
|
result.put("mail_confirm", client.getBoolean("mail_confirm"));
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -1290,6 +1290,10 @@ public class RetailAppServiceImp implements RetailAppService {
|
|
|
|
|
public JSONObject listDailyTransactions(String dateStr, String timezone, boolean thisDevOnly, JSONObject device, String app_client_ids) {
|
|
|
|
|
try {
|
|
|
|
|
JSONObject client = clientManager.getClientInfo(device.getIntValue("client_id"));
|
|
|
|
|
if(client==null){
|
|
|
|
|
return null;
|
|
|
|
|
}
|
|
|
|
|
timezone = client.getString("timezone");
|
|
|
|
|
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
|
|
|
|
|
dateFormat.setTimeZone(TimeZone.getTimeZone(client.getString("timezone")));
|
|
|
|
|
Date date = dateFormat.parse(dateStr);
|
|
|
|
|