diff --git a/suimangAdmin/src/main/java/com/iformall/shiro/PasswordHelper.java b/suimangAdmin/src/main/java/com/iformall/shiro/PasswordHelper.java index 2f4f409..2aa962c 100644 --- a/suimangAdmin/src/main/java/com/iformall/shiro/PasswordHelper.java +++ b/suimangAdmin/src/main/java/com/iformall/shiro/PasswordHelper.java @@ -23,8 +23,8 @@ public class PasswordHelper { public static void main(String[] args) { MallUserInfo user = new MallUserInfo(); - user.setUsername("localtest"); - user.setPassword("123456"); + user.setUsername("smadmin"); + user.setPassword("sm2023@1"); PasswordHelper passwordHelper = new PasswordHelper(); passwordHelper.encryptPassword(user); System.out.println(user); diff --git a/suimangCApi/src/main/java/com/iformall/controller/CallbackSmController.java b/suimangCApi/src/main/java/com/iformall/controller/CallbackSmController.java index b5dc908..6e88a68 100644 --- a/suimangCApi/src/main/java/com/iformall/controller/CallbackSmController.java +++ b/suimangCApi/src/main/java/com/iformall/controller/CallbackSmController.java @@ -82,7 +82,7 @@ public class CallbackSmController extends BaseController { userMouldVideoService.updateById(videoUnd); } - userMouldVideoService.uploadVideo(videoUnd); + userMouldVideoService.uploadVideo(videoUnd,true); return new ResultData(); } diff --git a/suimangSchedule/src/main/java/com/iformall/schedule/VideoSchedule.java b/suimangSchedule/src/main/java/com/iformall/schedule/VideoSchedule.java index 52d0131..44ed11f 100644 --- a/suimangSchedule/src/main/java/com/iformall/schedule/VideoSchedule.java +++ b/suimangSchedule/src/main/java/com/iformall/schedule/VideoSchedule.java @@ -79,7 +79,7 @@ public class VideoSchedule { if (videos != null && videos.size() > 0) { for (UserMouldVideo video : videos) { try { - userMouldVideoService.uploadVideo(video); + userMouldVideoService.uploadVideo(video,true); } catch (Exception e) { logger.error("TtCouponVideoSchedule error.couponVideoSchedule:"+video.getId(),e); } diff --git a/suimangService/src/main/java/com/iformall/service/sm/UserMouldVideoService.java b/suimangService/src/main/java/com/iformall/service/sm/UserMouldVideoService.java index a397e74..df8d4ad 100644 --- a/suimangService/src/main/java/com/iformall/service/sm/UserMouldVideoService.java +++ b/suimangService/src/main/java/com/iformall/service/sm/UserMouldVideoService.java @@ -47,7 +47,7 @@ public interface UserMouldVideoService { Future createVideo(UserMouldVideo mouldVideo); - void uploadVideo(UserMouldVideo mouldVideo); + void uploadVideo(UserMouldVideo mouldVideo,boolean finisedAndCost); UserMouldVideo findVideo(Long id); diff --git a/suimangService/src/main/java/com/iformall/service/sm/impl/UserMouldVideoServiceImpl.java b/suimangService/src/main/java/com/iformall/service/sm/impl/UserMouldVideoServiceImpl.java index 29b724c..72953af 100644 --- a/suimangService/src/main/java/com/iformall/service/sm/impl/UserMouldVideoServiceImpl.java +++ b/suimangService/src/main/java/com/iformall/service/sm/impl/UserMouldVideoServiceImpl.java @@ -439,7 +439,7 @@ public class UserMouldVideoServiceImpl implements UserMouldVideoService { this.saveOrUpdate(videoUpd); videoUpd.setTitle(mouldVideo.getTitle()); - this.uploadVideo(videoUpd); + this.uploadVideo(videoUpd,false); return new AsyncResult<>(1); } @@ -460,7 +460,7 @@ public class UserMouldVideoServiceImpl implements UserMouldVideoService { @Async @Override - public void uploadVideo(UserMouldVideo mouldVideo){ + public void uploadVideo(UserMouldVideo mouldVideo,boolean finisedAndCost){ String lockKey = "oralBroadcasting:handleVideo:"+mouldVideo.getId(); long time = System.currentTimeMillis() + 30000; String timeStr = String.valueOf(time); @@ -510,15 +510,17 @@ public class UserMouldVideoServiceImpl implements UserMouldVideoService { videoUpd.setVideoStatus(EnumVideoStatus.upload_success.getCode()); videoUpd.setVideoMsg("视频上传成功"); videoUpd.setUpdateDate(new Date()); - //设置扣费,当前方法是慧影项目专用的 - if (StringUtils.isBlank(videoUpd.getVideoTime())) { - break; - } - CreateBilling cb = projectFactory.getProjectService(EnumProject.PROJECT_2.getCode()) - .handleCreateVideoBilling(userMouldVideo.getUserId(), userMouldVideo.getFinalTenantId(), videoUpd.getVideoTime(), videoUpd.getVideoSize()); - if (null != cb) { - videoUpd.setCostPoints(cb.getTotalCostPoins()); - videoUpd.setCostPointsDetail(cb.getDetail()); + if (finisedAndCost) { + //设置扣费,当前方法是慧影项目专用的 + if (StringUtils.isBlank(videoUpd.getVideoTime())) { + break; + } + CreateBilling cb = projectFactory.getProjectService(EnumProject.PROJECT_2.getCode()) + .handleCreateVideoBilling(userMouldVideo.getUserId(), userMouldVideo.getFinalTenantId(), videoUpd.getVideoTime(), videoUpd.getVideoSize()); + if (null != cb) { + videoUpd.setCostPoints(cb.getTotalCostPoins()); + videoUpd.setCostPointsDetail(cb.getDetail()); + } } this.updateById(videoUpd); break;