Просмотр исходного кода

Merge tag 'refs/tags/jenkins-back_end_wechat-264' into release

test
release
Stormeye Wu 6 лет назад
Родитель
Сommit
0498f31ac6
2 измененных файлов: 18 добавлений и 2 удалений
  1. +12
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxWeappExtSetServiceImpl.java
  2. +6
    -0
      mlWechatOpen/src/main/java/com/iformall/controller/WxWeappExtSetController.java

+ 12
- 2
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);


+ 6
- 0
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();
}


Загрузка…
Отмена
Сохранить