update import
This commit is contained in:
parent
af0765a235
commit
0ec17aa6a4
@ -169,11 +169,6 @@ public class CustomerServiceSupport
|
||||
update.put(Customer.DATE_UPDATED, now);
|
||||
customerPermissionMapper.update(update, (Search) null);
|
||||
*/
|
||||
|
||||
// remove existed records
|
||||
final Search search = new Search();
|
||||
customerPermissionMapper.delete(search);
|
||||
customerPermissionMapper.delete(search);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -192,7 +187,7 @@ public class CustomerServiceSupport
|
||||
customer.setRegion(record.get(6).trim());
|
||||
final String employeeId = record.get(7).trim();
|
||||
customer.setSalesperson(employeeId);
|
||||
log.info("Customer [{}] Read.", customer);
|
||||
log.info("Customer [{}] read.", customer);
|
||||
|
||||
createUserIfNotExist(operator, employeeId, now);
|
||||
createOrUpdateCustomer(operator, customer, now);
|
||||
@ -218,17 +213,17 @@ public class CustomerServiceSupport
|
||||
user.setCreatedBy(operator);
|
||||
user.setDateCreated(date);
|
||||
user.setNote("Init Password: " + password);
|
||||
log.info("User [{}] Does Not Exist, Create.", user);
|
||||
log.info("User [{}] does not exist, create.", user);
|
||||
userService.create(user);
|
||||
}
|
||||
}
|
||||
|
||||
private void createOrUpdateCustomer(final String operator, final Customer customer, final Date date) {
|
||||
log.info("User [{}] Create Or Update Customer [{}] .", operator, customer);
|
||||
log.info("User [{}] create or update customer [{}].", operator, customer);
|
||||
|
||||
final Customer customerExisted = mapper.find(customer.getId());
|
||||
if (customerExisted != null) {
|
||||
log.info("Customer Existed [{}] Found, Update.", customerExisted);
|
||||
log.info("Customer existed [{}] found, update.", customerExisted);
|
||||
// basic props
|
||||
customerExisted.setName(customer.getName());
|
||||
customerExisted.setCountryCode(customer.getCountryCode());
|
||||
@ -243,33 +238,46 @@ public class CustomerServiceSupport
|
||||
customerExisted.setUpdatedBy(operator);
|
||||
customerExisted.setDateUpdated(date);
|
||||
|
||||
log.info("Update Customer [{}].", customerExisted);
|
||||
log.info("Update customer [{}].", customerExisted);
|
||||
mapper.update(customerExisted);
|
||||
}
|
||||
else {
|
||||
customer.setEnabled(true);
|
||||
customer.setCreatedBy(operator);
|
||||
customer.setDateCreated(date);
|
||||
log.info("Create New Customer [{}].", customer);
|
||||
log.info("Create customer [{}].", customer);
|
||||
mapper.insert(customer);
|
||||
}
|
||||
}
|
||||
|
||||
private void createOrUpdateCustomerPermissions(final String operator, final String customerId, final String strAccounts, Date date) {
|
||||
log.info("User [{}] Create Or Update Customer [{}] Permissions [{}].", operator, customerId, strAccounts);
|
||||
log.info("User [{}] create or update customer [{}] permissions [{}].", operator, customerId, strAccounts);
|
||||
|
||||
if (StringUtils.isNotBlank(strAccounts)) {
|
||||
for (final String account : new HashSet<>(
|
||||
Arrays.asList(strAccounts.trim().split("\\s*,\\s*")))) {
|
||||
|
||||
if (StringUtils.isNotBlank(account)) {
|
||||
permission.setId(idSeq.get());
|
||||
permission.setCustomerId(customerId);
|
||||
permission.setUserAccount(account);
|
||||
permission.setEnabled(true);
|
||||
permission.setCreatedBy(operator);
|
||||
permission.setDateCreated(date);
|
||||
customerPermissionMapper.insert(permission);
|
||||
final CustomerPermission permOld = customerPermissionMapper.find(
|
||||
new Search(CustomerPermission.CUSTOMER_ID, customerId)
|
||||
.eq(CustomerPermission.USER_ACCOUNT, account));
|
||||
if (permOld != null) {
|
||||
permOld.setUpdatedBy(operator);
|
||||
permOld.setDateUpdated(date);
|
||||
permOld.setEnabled(true);
|
||||
log.info("Update customer permission [{}].", permOld);
|
||||
customerPermissionMapper.update(permOld);
|
||||
}
|
||||
else {
|
||||
permission.setId(idSeq.get());
|
||||
permission.setCustomerId(customerId);
|
||||
permission.setUserAccount(account);
|
||||
permission.setEnabled(true);
|
||||
permission.setCreatedBy(operator);
|
||||
permission.setDateCreated(date);
|
||||
log.info("Insert customer permission [{}].", permission);
|
||||
customerPermissionMapper.insert(permission);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -59,7 +59,6 @@ public class CustomerYearToDateSaleServiceSupport
|
||||
// update.put(CustomerYearToDateSale.UPDATED_BY, operator);
|
||||
// update.put(CustomerYearToDateSale.DATE_UPDATED, now);
|
||||
// mapper.update(update, (Search) null);
|
||||
mapper.delete(new Search());
|
||||
}
|
||||
|
||||
/**
|
||||
@ -75,32 +74,32 @@ public class CustomerYearToDateSaleServiceSupport
|
||||
// update date added
|
||||
final String strDateAdded = StringUtils.trim(record.get(5));
|
||||
if (StringUtils.isNotBlank(strDateAdded)) {
|
||||
log.info("Update Customer [{}] Date Added [{}].", customerId, strDateAdded);
|
||||
log.info("Update customer [{}] date added [{}].", customerId, strDateAdded);
|
||||
Date dateAdded = null;
|
||||
try {
|
||||
dateAdded = DateUtils.parseDate(strDateAdded, "M/d/yyyy");
|
||||
}
|
||||
catch (ParseException e) {
|
||||
log.warn("Parse Date [{}] Error Caused, Ignore.", strDateAdded, e);
|
||||
log.warn("Parse date [{}] error caused, ignore.", strDateAdded, e);
|
||||
}
|
||||
if (dateAdded != null) {
|
||||
final Customer customer = customerMapper.find(customerId);
|
||||
customer.setDateAdded(dateAdded);
|
||||
customer.setUpdatedBy(operator);
|
||||
customer.setDateUpdated(now);
|
||||
log.info("Update Customer [{}] Date Added.", customer);
|
||||
log.info("Update customer [{}] date added.", customer);
|
||||
customerMapper.update(customer);
|
||||
}
|
||||
}
|
||||
|
||||
log.info("Customer YTD Sale [{}] Read.", customerYtdSale);
|
||||
log.info("Customer YTD sale [{}] read.", customerYtdSale);
|
||||
createOrUpdateCustomerYTDSale(operator, customerYtdSale, now);
|
||||
}
|
||||
}, true);
|
||||
}
|
||||
|
||||
private void createOrUpdateCustomerYTDSale(final String operator, final CustomerYearToDateSale customerYtdSale, final Date date) {
|
||||
log.info("User [{}] Create Or Update Customer [{}] .", operator, customerYtdSale);
|
||||
log.info("User [{}] create or update customer YTD sale [{}].", operator, customerYtdSale);
|
||||
|
||||
final CustomerYearToDateSale customerYtdSaleExisted =
|
||||
mapper.find(new Search(CustomerYearToDateSale.CUSTOMER_ID,
|
||||
@ -109,7 +108,7 @@ public class CustomerYearToDateSaleServiceSupport
|
||||
customerYtdSale.getYear()));
|
||||
|
||||
if (customerYtdSaleExisted != null) {
|
||||
log.info("Customer YTD Sale Existed [{}] Found, Update.", customerYtdSaleExisted);
|
||||
log.info("Customer YTD sale existed [{}] found, update.", customerYtdSaleExisted);
|
||||
// basic props
|
||||
customerYtdSaleExisted.setYtdSale(customerYtdSale.getYtdSale());
|
||||
|
||||
@ -118,7 +117,7 @@ public class CustomerYearToDateSaleServiceSupport
|
||||
customerYtdSaleExisted.setUpdatedBy(operator);
|
||||
customerYtdSaleExisted.setDateUpdated(date);
|
||||
|
||||
log.info("Update Customer [{}].", customerYtdSaleExisted);
|
||||
log.info("Update customer [{}].", customerYtdSaleExisted);
|
||||
mapper.update(customerYtdSaleExisted);
|
||||
}
|
||||
else {
|
||||
@ -126,7 +125,7 @@ public class CustomerYearToDateSaleServiceSupport
|
||||
customerYtdSale.setEnabled(true);
|
||||
customerYtdSale.setCreatedBy(operator);
|
||||
customerYtdSale.setDateCreated(date);
|
||||
log.info("Create New Customer YTD Sale [{}].", customerYtdSaleExisted);
|
||||
log.info("Create customer YTD sale [{}].", customerYtdSaleExisted);
|
||||
mapper.insert(customerYtdSale);
|
||||
}
|
||||
}
|
||||
|
@ -28,7 +28,7 @@ echo "Service Home [$SERVICE_HOME]"
|
||||
# SERVER=root@116.62.189.211
|
||||
|
||||
if [ "$1" = "prod" ]; then
|
||||
SERVER=root@116.62.189.211
|
||||
SERVER=lemo@116.62.189.211
|
||||
else
|
||||
SERVER=ambition@101.236.35.13
|
||||
fi
|
||||
|
Loading…
x
Reference in New Issue
Block a user