diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxMsgCallbackController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxMsgCallbackController.java index f29eeda95..de54b6af3 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxMsgCallbackController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxMsgCallbackController.java @@ -68,14 +68,13 @@ public class WxMsgCallbackController extends BaseController { } - @RequestMapping(value = "/receivemsg/{bid}") + @PostMapping(value = "/receivemsg/{bid}") public void receivemsg(@PathVariable String bid, @RequestParam Map param) { logger.info(param.toString()); //解析param数据插入数据库中 String item = param.get("item"); String sign = param.get("sign"); - String tenantId = getTenantId(); - wxMsgCallbackService.saveOrUpdate(tenantId, bid, item, sign); + wxMsgCallbackService.saveOrUpdate(bid, item, sign); } @@ -83,7 +82,7 @@ public class WxMsgCallbackController extends BaseController { public void receivemodel(@PathVariable String bid, @RequestParam Map param) { logger.info(param.toString()); //解析param数据插入数据库中 - wxMsgCallbackService.receivemodel(getTenantId(), bid, param); + wxMsgCallbackService.receivemodel(bid, param); } diff --git a/mallinkService/src/main/java/com/simple/service/WxMsgCallbackService.java b/mallinkService/src/main/java/com/simple/service/WxMsgCallbackService.java index f60d823e5..0414a7164 100644 --- a/mallinkService/src/main/java/com/simple/service/WxMsgCallbackService.java +++ b/mallinkService/src/main/java/com/simple/service/WxMsgCallbackService.java @@ -39,9 +39,9 @@ public interface WxMsgCallbackService { void deleteById(Long id); - void saveOrUpdate(String tenantId, String bid, String item, String sign); + void saveOrUpdate(String bid, String item, String sign); - void receivemodel(String tenantId, String bid, Map param); + void receivemodel(String bid, Map param); void receiveverifymodel(String bid, Map param); diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMsgCallbackServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMsgCallbackServiceImpl.java index beb9fe8c1..cbc8ba41a 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxMsgCallbackServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxMsgCallbackServiceImpl.java @@ -63,58 +63,47 @@ public class WxMsgCallbackServiceImpl implements WxMsgCallbackService { } @Override - public void saveOrUpdate(String tenantId,String bid, String item, String sign) { + public void saveOrUpdate(String bid, String item, String sign) { WxMsgConfig wxMsgConfig = new WxMsgConfig(); - wxMsgConfig.setTenantId(tenantId); wxMsgConfig.setBid(bid); List list = wxMsgConfigMapper.findList(wxMsgConfig); - if(list.size()==1) { - List wxMsgCallbacks = JSONArray.parseArray(item, WxMsgCallback.class); - wxMsgConfig = list.get(0); - wxMsgConfig.setRemains(wxMsgConfig.getRemains() - wxMsgCallbacks.size()); - wxMsgConfigMapper.updateByPrimaryKeySelective(wxMsgConfig); - - for (WxMsgCallback wxMsgCallback : wxMsgCallbacks) { - wxMsgCallback.setTenantId(wxMsgConfig.getTenantId()); - wxMsgCallback.setSign(sign); - wxMsgCallback.setCreatetime(new Date()); - wxMsgCallbackMapper.insertSelective(wxMsgCallback); - } + List wxMsgCallbacks = JSONArray.parseArray(item, WxMsgCallback.class); + wxMsgConfig = list.get(0); + wxMsgConfig.setRemains(wxMsgConfig.getRemains() - wxMsgCallbacks.size()); + wxMsgConfigMapper.updateByPrimaryKeySelective(wxMsgConfig); + + for (WxMsgCallback wxMsgCallback : wxMsgCallbacks) { + wxMsgCallback.setTenantId(wxMsgConfig.getTenantId()); + wxMsgCallback.setSign(sign); + wxMsgCallback.setCreatetime(new Date()); + wxMsgCallbackMapper.insertSelective(wxMsgCallback); } + } @Override - public void receivemodel(String tenantId, String bid, Map param) { - WxMsgConfig wxMsgConfig = new WxMsgConfig(); - wxMsgConfig.setTenantId(tenantId); - wxMsgConfig.setBid(bid); - List list = wxMsgConfigMapper.findList(wxMsgConfig); - if(list.size()==1) { + public void receivemodel(String bid, Map param) { + + WxMsgModel wxMsgModel = new WxMsgModel(); + wxMsgModel.setModelId(Integer.valueOf(param.get("id"))); + wxMsgModel = wxMsgModelMapper.findList(wxMsgModel).get(0); + wxMsgModel.setStatus(param.get("status").equals("1")?Integer.valueOf(param.get("status")):0); + wxMsgModelMapper.updateByPrimaryKeySelective(wxMsgModel); - WxMsgModel wxMsgModel = new WxMsgModel(); - wxMsgModel.setModelId(Integer.valueOf(param.get("id"))); - wxMsgModel = wxMsgModelMapper.findList(wxMsgModel).get(0); - wxMsgModel.setStatus(param.get("status").equals("1")?Integer.valueOf(param.get("status")):0); - wxMsgModelMapper.updateByPrimaryKeySelective(wxMsgModel); - } } @Override public void receiveverifymodel(String bid, Map param) { - WxMsgConfig wxMsgConfig = new WxMsgConfig(); - wxMsgConfig.setBid(bid); - List list = wxMsgConfigMapper.findList(wxMsgConfig); - if(list.size()==1) { - WxMsgValidationcodeModel wxMsgModel = new WxMsgValidationcodeModel(); - wxMsgModel.setModelId(Integer.valueOf(param.get("id"))); - wxMsgModel = wxMsgValidationcodeModelMapper.findList(wxMsgModel).get(0); - wxMsgModel.setStatus(param.get("status").equals("1")?Integer.valueOf(param.get("status")):0); - wxMsgValidationcodeModelMapper.updateByPrimaryKeySelective(wxMsgModel); + WxMsgValidationcodeModel wxMsgModel = new WxMsgValidationcodeModel(); + wxMsgModel.setModelId(Integer.valueOf(param.get("id"))); + wxMsgModel = wxMsgValidationcodeModelMapper.findList(wxMsgModel).get(0); + wxMsgModel.setStatus(param.get("status").equals("1")?Integer.valueOf(param.get("status")):0); + wxMsgValidationcodeModelMapper.updateByPrimaryKeySelective(wxMsgModel); + - } }