master
luoyang 6 years ago
parent f222cc265d
commit d5c5aa2208

@ -31,6 +31,8 @@ public interface ManageAppService {
void updateClientRegisterInfo(JSONObject device, String clientMoniker, ClientRegisterInfo info); void updateClientRegisterInfo(JSONObject device, String clientMoniker, ClientRegisterInfo info);
void disableClientRegisterInfo(JSONObject device, String clientMoniker);
JSONObject listPartners(JSONObject device, AppMerchantBean query); JSONObject listPartners(JSONObject device, AppMerchantBean query);
JSONObject clientDetail(JSONObject device, String clientMoniker); JSONObject clientDetail(JSONObject device, String clientMoniker);

@ -116,6 +116,14 @@ public class ManageAppServiceImp implements ManageAppService {
clientManager.updateClientRegisterInfo(manager, clientMoniker, info); 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 @Override
public JSONObject listPartners(JSONObject device, AppMerchantBean query) { public JSONObject listPartners(JSONObject device, AppMerchantBean query) {
String clientType = device.getString("client_type"); String clientType = device.getString("client_type");
@ -133,9 +141,9 @@ public class ManageAppServiceImp implements ManageAppService {
break; break;
case 3: case 3:
query.setCompleted_contract(true); query.setCompleted_contract(true);
query.setBd_upload_material(true);
break; break;
case 4: case 4:
query.setBd_upload_material(true);
break; break;
case 5: case 5:
query.setApply_to_back(true); query.setApply_to_back(true);

@ -80,6 +80,12 @@ public class ManageAppController {
manageAppService.updateClientRegisterInfo(device, clientMoniker, info); 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) @RequestMapping(value = "/merchants", method = RequestMethod.GET)
public JSONObject listPartners(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device, AppMerchantBean query) { public JSONObject listPartners(@ModelAttribute(CommonConsts.MANAGER_DEVICE) JSONObject device, AppMerchantBean query) {
return manageAppService.listPartners(device, query); return manageAppService.listPartners(device, query);

@ -76,7 +76,9 @@ public class ClientRegisterInfo {
private String merchant_video_url; private String merchant_video_url;
@JSONField(name = "store_name") @JSONField(name = "store_name")
private String storeName; private String storeName;
@NotEmpty(message = "error.payment.valid.param_missing")
private String client_pay_type; private String client_pay_type;
@NotEmpty(message = "error.payment.valid.param_missing")
private String client_pay_desc; private String client_pay_desc;
public JSONObject insertObject() { public JSONObject insertObject() {

Loading…
Cancel
Save