From 5c19193c78dd57dfcc929c50173b6f643d4f6ce1 Mon Sep 17 00:00:00 2001 From: kira <164851225@qq.com> Date: Wed, 25 Jul 2018 11:27:24 +0800 Subject: [PATCH] fixbug --- .../manage/appclient/core/impls/RetailAppServiceImp.java | 1 + .../payment/manage/appclient/web/RetailAppController.java | 5 ----- .../royalpay/payment/manage/openim/OpenimController.java | 8 +++++--- .../manage/openim/core/CustomerServiceService.java | 2 +- .../openim/core/impl/CustomerServiceServiceImpl.java | 4 ++-- .../payment/manage/task/SendUnreadMsgWechatTask.java | 8 +++++--- .../payment/manage/mappers/system/ManagerMapper.xml | 2 +- src/main/ui/static/config/sysconfigs/sysconfigs.js | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java index e11eb9228..cfd9247ed 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java @@ -422,6 +422,7 @@ public class RetailAppServiceImp implements RetailAppService { return customerServiceService.checkAndSave(account); } + //暂不使用 @Override public void addUnreadMsg(JSONObject device, JSONObject param) { customerServiceService.addUnreadMsg(param); diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java b/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java index b31557c8e..8da6e9e7c 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java @@ -549,9 +549,4 @@ public class RetailAppController { return retailAppService.openimCheck(device); } - @RequestMapping(value = "/openim/chat",method = RequestMethod.POST) - public void openimChat(@ModelAttribute(RETAIL_DEVICE) JSONObject device,@RequestBody JSONObject param) { - retailAppService.addUnreadMsg(device,param); - } - } diff --git a/src/main/java/au/com/royalpay/payment/manage/openim/OpenimController.java b/src/main/java/au/com/royalpay/payment/manage/openim/OpenimController.java index 11a9d432e..467fc56ad 100644 --- a/src/main/java/au/com/royalpay/payment/manage/openim/OpenimController.java +++ b/src/main/java/au/com/royalpay/payment/manage/openim/OpenimController.java @@ -13,6 +13,7 @@ import com.alibaba.fastjson.JSONObject; import org.springframework.validation.Errors; import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -57,9 +58,10 @@ public class OpenimController { return customerServiceService.query(clientMoniker,userNames); } - @ManagerMapping(value = "/servant/onoff", method = RequestMethod.PUT,role = {ManagerRole.ADMIN}) - public void listServants(@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject loginManager, @RequestBody JSONObject param) { - customerServiceService.onoff(loginManager,param.getBoolean("onoff")); + @ManagerMapping(value = "/servant/{manager_id}/onoff", method = RequestMethod.PUT,role = {ManagerRole.ADMIN}) + public void listServants(@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject loginManager,@PathVariable String manager_id, @RequestBody JSONObject param) { + param.put("manager_id",manager_id); + customerServiceService.onoff(param); } } diff --git a/src/main/java/au/com/royalpay/payment/manage/openim/core/CustomerServiceService.java b/src/main/java/au/com/royalpay/payment/manage/openim/core/CustomerServiceService.java index d00549626..c63334113 100644 --- a/src/main/java/au/com/royalpay/payment/manage/openim/core/CustomerServiceService.java +++ b/src/main/java/au/com/royalpay/payment/manage/openim/core/CustomerServiceService.java @@ -18,7 +18,7 @@ public interface CustomerServiceService { List query(String clientMoniker,String userNames); - void onoff(JSONObject manager,boolean status); + void onoff(JSONObject param); void addUnreadMsg(JSONObject params); diff --git a/src/main/java/au/com/royalpay/payment/manage/openim/core/impl/CustomerServiceServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/openim/core/impl/CustomerServiceServiceImpl.java index db9b3a929..e98d09b7b 100644 --- a/src/main/java/au/com/royalpay/payment/manage/openim/core/impl/CustomerServiceServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/openim/core/impl/CustomerServiceServiceImpl.java @@ -141,10 +141,10 @@ public class CustomerServiceServiceImpl implements CustomerServiceService { } @Override - public void onoff(JSONObject manager, boolean onoff) { + public void onoff(JSONObject manager) { JSONObject record = new JSONObject(); record.put("manager_id", manager.getString("manager_id")); - record.put("onoff", onoff); + record.put("onoff", manager.getBoolean("onoff")); udpateOrSave(record); } diff --git a/src/main/java/au/com/royalpay/payment/manage/task/SendUnreadMsgWechatTask.java b/src/main/java/au/com/royalpay/payment/manage/task/SendUnreadMsgWechatTask.java index 43094024f..38df5d256 100644 --- a/src/main/java/au/com/royalpay/payment/manage/task/SendUnreadMsgWechatTask.java +++ b/src/main/java/au/com/royalpay/payment/manage/task/SendUnreadMsgWechatTask.java @@ -9,6 +9,7 @@ import javax.annotation.Resource; /** * Created by wangning on 2018/1/2. + * 发送客服未读消息提醒 */ @Component @ConditionalOnProperty(value = "app.run-tasks", havingValue = "true") @@ -17,7 +18,8 @@ public class SendUnreadMsgWechatTask { private CustomerServiceService customerServiceService; // @Scheduled(cron = "0 0/10 * * * ?") - public void ofeiOrderCheck() { - customerServiceService.sendUnreadWxMsg(); - } +// public void ofeiOrderCheck() { +// customerServiceService.sendUnreadWxMsg(); +// } + } diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ManagerMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ManagerMapper.xml index 0c2ab740d..20bfbdc2c 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ManagerMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ManagerMapper.xml @@ -97,7 +97,7 @@