From 9630d624a83d0627963b64e2fbeae9296da9a8a1 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 4 Sep 2019 14:26:50 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E6=89=A9=E5=B1=95=E8=AE=BE=E7=BD=AE][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]:=E6=8F=92=E5=85=A5=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxWeappExtSetServiceImpl.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxWeappExtSetServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxWeappExtSetServiceImpl.java index 170608d..7e166c3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxWeappExtSetServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxWeappExtSetServiceImpl.java @@ -48,18 +48,28 @@ public class WxWeappExtSetServiceImpl implements WxWeappExtSetService { public void saveOrUpdate(WxWeappExtSet record) { Date curDate = new Date(); if (record.getId() == null) { - //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); + boolean isUpdate = false; WxAppinfo appinfo = appinfoMapper.findByAppId(record.getAppId()); if(appinfo != null) { record.setId(appinfo.getId()); record.setType(appinfo.getType()); + WxWeappExtSet q = new WxWeappExtSet(); + q.setId(appinfo.getId()); + int count = wxWeappExtSetMapper.selectCount(q); + if (count > 0) { + isUpdate = true; + } } else { final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); } record.setCreateDate(curDate); record.setUpdateDate(curDate); - wxWeappExtSetMapper.insertSelective(record); + if (!isUpdate) { + wxWeappExtSetMapper.insertSelective(record); + } else { + wxWeappExtSetMapper.updateByPrimaryKeySelective(record); + } } else { record.setUpdateDate(curDate); wxWeappExtSetMapper.updateByPrimaryKeySelective(record); From af12a1fe2ff3506f44d1b3cc9828d39f6c07b7ce Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 4 Sep 2019 14:29:07 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E6=89=A9=E5=B1=95=E8=AE=BE=E7=BD=AE][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]:=E6=8F=92=E5=85=A5=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/WxWeappExtSetController.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappExtSetController.java b/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappExtSetController.java index 37e2219..46c15df 100644 --- a/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappExtSetController.java +++ b/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappExtSetController.java @@ -63,6 +63,12 @@ public class WxWeappExtSetController extends BaseController { public ResultData update(@RequestBody WxWeappExtSet weappExtSet) { logger.debug("[" + getIpAddr() + "] WxWeappBasicSetController::update"); if (null == weappExtSet) return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + if (StringUtils.isBlank(weappExtSet.getExtJson())) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + } + if (StringUtils.isBlank(weappExtSet.getReleaseJson())) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + } weappExtSetService.saveOrUpdate(weappExtSet); return new ResultData(); }