diff --git a/suimangCApi/src/main/java/com/iformall/controller/MiniAppUserController.java b/suimangCApi/src/main/java/com/iformall/controller/MiniAppUserController.java index 2370eb6..c2a18bb 100644 --- a/suimangCApi/src/main/java/com/iformall/controller/MiniAppUserController.java +++ b/suimangCApi/src/main/java/com/iformall/controller/MiniAppUserController.java @@ -161,6 +161,7 @@ public class MiniAppUserController extends BaseController { * @param map * @return */ + @AuthIgnore @PostMapping("/loginPhone") @ApiOperation(value = "授权后获取用户的手机号", notes = "{\"encryptedData\":\"string\",\"iv\":\"string\"}") public ResultData getUserPhone(@RequestBody Map map) { diff --git a/suimangCApi/src/main/java/com/iformall/controller/VideoCallbackController.java b/suimangCApi/src/main/java/com/iformall/controller/VideoCallbackController.java index 8c60ee7..d0cd9c7 100644 --- a/suimangCApi/src/main/java/com/iformall/controller/VideoCallbackController.java +++ b/suimangCApi/src/main/java/com/iformall/controller/VideoCallbackController.java @@ -8,15 +8,10 @@ import com.iformall.annotation.AuthIgnore; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.domain.po.base.BaseEntity; -import com.iformall.domain.po.sm.MusicInfo; -import com.iformall.domain.po.sm.PhotoSpeakVideo; -import com.iformall.domain.po.sm.VoiceInfo; +import com.iformall.domain.po.sm.*; import com.iformall.enums.EnumVideoStatus; import com.iformall.exception.MallinkException; -import com.iformall.service.sm.MouldPatchService; -import com.iformall.service.sm.MusicInfoService; -import com.iformall.service.sm.PhotoSpeakVideoService; -import com.iformall.service.sm.VoiceInfoService; +import com.iformall.service.sm.*; import com.iformall.video.VideoFactory; import com.iformall.video.aliyun.sdk.server.UploadCacheHelper; import com.iformall.video.entity.VideUploadResult; @@ -53,6 +48,9 @@ public class VideoCallbackController extends BaseController { @Autowired private PhotoSpeakVideoService photoSpeakVideoService; + @Autowired + private UserDigitalAvatarOrderService userDigitalAvatarOrderService; + @AuthIgnore @ApiOperation("视频回调") @PostMapping(value = "/photo/speak") @@ -128,4 +126,28 @@ public class VideoCallbackController extends BaseController { return new ResultData(); } + + @AuthIgnore + @ApiOperation("生成照片回调") + @PostMapping(value = "/create/photo") + public ResultData createPhoto(@RequestBody Map paranMap) { + logger.debug("[" + getIpAddr() + "] VideoCallbackController::photoSpeak"); + logger.info("照片生成视频结果通知{}"+JSONObject.toJSONString(paranMap)); + Long task_id = (Long) paranMap.get("task_id");//任务ID + String code = (String) paranMap.get("code");//code + String msg = (String) paranMap.get("msg"); + + if (task_id == null){ + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"任务ID不能为空"); + } + UserDigitalAvatarOrder userDigitalAvatarOrder = userDigitalAvatarOrderService.selectById(task_id); + + if (userDigitalAvatarOrder == null){ + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"未找到任务数据"); + } + + + return new ResultData(ErrorCode.SYS_SERVER_ERROR); + } + } diff --git a/suimangSchedule/src/main/java/com/iformall/schedule/ProductOrderSchedule.java b/suimangSchedule/src/main/java/com/iformall/schedule/ProductOrderSchedule.java index 51067b9..7f780b6 100644 --- a/suimangSchedule/src/main/java/com/iformall/schedule/ProductOrderSchedule.java +++ b/suimangSchedule/src/main/java/com/iformall/schedule/ProductOrderSchedule.java @@ -38,7 +38,7 @@ public class ProductOrderSchedule { try{ productOrderService.handldTimeOut(order.getId()); }catch(Exception e){ - logger.error("分账失败:" + e.getMessage()); + logger.error("取消订单失败:" + e.getMessage()); } }