Quellcode durchsuchen

Merge remote-tracking branch 'origin/photo' into photo

private_deployment
lrh vor 1 Jahr
Ursprung
Commit
8003301c7b
4 geänderte Dateien mit 6 neuen und 9 gelöschten Zeilen
  1. +1
    -2
      suimangCApi/src/main/java/com/iformall/controller/PersonPhotoController.java
  2. +3
    -5
      suimangCApi/src/main/java/com/iformall/controller/VoiceMaterialController.java
  3. +1
    -1
      suimangService/src/main/java/com/iformall/service/sm/impl/PersonPhotoServiceImpl.java
  4. +1
    -1
      suimangService/src/main/java/com/iformall/service/sm/impl/VoiceMaterialServiceImpl.java

+ 1
- 2
suimangCApi/src/main/java/com/iformall/controller/PersonPhotoController.java Datei anzeigen

@@ -83,8 +83,7 @@ public class PersonPhotoController extends BaseController {
}
record.setPrice(0);
record.setSalePrice(0);
personPhotoService.saveOrUpdate(record);
return new ResultData();
return personPhotoService.saveOrUpdate(record);
}

@ApiOperation("根据id查询接口")


+ 3
- 5
suimangCApi/src/main/java/com/iformall/controller/VoiceMaterialController.java Datei anzeigen

@@ -71,19 +71,17 @@ public class VoiceMaterialController extends BaseController {
if(record == null)record = new VoiceMaterial();
record.setSendType(EnumMouldSendType.build.getCode());
record.setUserId(getMemberId());
if(StringUtils.isBlank(record.getMaterial())){
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"素材为空");
if(StringUtils.isBlank(record.getVideoId())){
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"音频为空");
}
//todo 掉第三方接口判断声音是否符合规范


if(record.getTitle() == null){
record.setTitle("用户自建");
}
record.setPrice(0);
record.setSalePrice(0);
voiceMaterialService.saveOrUpdate(record);
return new ResultData();
return voiceMaterialService.saveOrUpdate(record);
}

@ApiOperation("根据id查询接口")


+ 1
- 1
suimangService/src/main/java/com/iformall/service/sm/impl/PersonPhotoServiceImpl.java Datei anzeigen

@@ -102,7 +102,7 @@ public class PersonPhotoServiceImpl implements PersonPhotoService {
record.setUpdateDate(now);
personPhotoMapper.updateById(record);
}
return new ResultData();
return new ResultData(record);
}

@Override


+ 1
- 1
suimangService/src/main/java/com/iformall/service/sm/impl/VoiceMaterialServiceImpl.java Datei anzeigen

@@ -100,7 +100,7 @@ public class VoiceMaterialServiceImpl implements VoiceMaterialService {
record.setUpdateDate(now);
voiceMaterialMapper.updateById(record);
}
return new ResultData();
return new ResultData(record);
}

@Override


Laden…
Abbrechen
Speichern