diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java index 74f24e9d8..515113723 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/ManageAppService.java @@ -31,6 +31,8 @@ public interface ManageAppService { void updateClientRegisterInfo(JSONObject device, String clientMoniker, ClientRegisterInfo info); + void disableClientRegisterInfo(JSONObject device, String clientMoniker); + JSONObject listPartners(JSONObject device, AppMerchantBean query); JSONObject clientDetail(JSONObject device, String clientMoniker); diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java index 1c5fc06da..24b2f674f 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java @@ -116,6 +116,14 @@ public class ManageAppServiceImp implements ManageAppService { clientManager.updateClientRegisterInfo(manager, clientMoniker, info); } + @Override + public void disableClientRegisterInfo(JSONObject device, String clientMoniker) { + String clientType = device.getString("client_type"); + manageDeviceSupport.findRegister(clientType); + JSONObject manager = managerMapper.findById(device.getString("manager_id")); + clientManager.disableClient(clientMoniker,manager); + } + @Override public JSONObject listPartners(JSONObject device, AppMerchantBean query) { String clientType = device.getString("client_type"); @@ -133,9 +141,9 @@ public class ManageAppServiceImp implements ManageAppService { break; case 3: query.setCompleted_contract(true); + query.setBd_upload_material(true); break; case 4: - query.setBd_upload_material(true); break; case 5: query.setApply_to_back(true); diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java b/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java index 8d0727102..6ceb58eac 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/web/ManageAppController.java @@ -80,6 +80,12 @@ public class ManageAppController { manageAppService.updateClientRegisterInfo(device, clientMoniker, info); } + @RequestMapping(value = "/merchant/{clientMoniker}/delete", method = RequestMethod.PUT) + public void disablePartnerInfo(@PathVariable String clientMoniker, + @ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device) { + manageAppService.disableClientRegisterInfo(device, clientMoniker); + } + @RequestMapping(value = "/merchants", method = RequestMethod.GET) public JSONObject listPartners(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device, AppMerchantBean query) { return manageAppService.listPartners(device, query); diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java b/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java index 8084f0237..cb493a8a4 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java @@ -76,7 +76,9 @@ public class ClientRegisterInfo { private String merchant_video_url; @JSONField(name = "store_name") private String storeName; + @NotEmpty(message = "error.payment.valid.param_missing") private String client_pay_type; + @NotEmpty(message = "error.payment.valid.param_missing") private String client_pay_desc; public JSONObject insertObject() {