liujunchi 2 years ago
parent
commit
536bd883a1

+ 1 - 1
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/CourseScheduleServiceImpl.java

@@ -1212,7 +1212,7 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
                     InOrOutEnum.IN, AccountBizTypeEnum.PRACTICE, salary.getCourseScheduleId(), orderParam.getGoodName(), orderParam.getOrderNo(), orderParam.getUserId(), accountPeriodTime);
             userAccountRecordDtos.add(dto);
 
-            // 支出给老师金额
+            // 插入平台账户 支出
             PlatformCashAccountRecord platformCashAccountRecord = new PlatformCashAccountRecord(orderParam.getUserId(), salary.getActualSalary(),
                                                         InOrOutEnum.OUT, PostStatusEnum.WAIT, AccountBizTypeEnum.PRACTICE, salary.getCourseScheduleId(),
                                                                                                 orderParam.getOrderNo(), accountPeriodTime);

+ 3 - 2
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/UserOrderServiceImpl.java

@@ -897,13 +897,14 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
             orderDetailVo.setActivityId(detail.getActivityId());
             orderDetailVo.setRewardId(detail.getRewardId());
             orderDetailVo.setOrderType(detail.getOrderType());
+
+            //记录平台收入和用户分润收入(未记录卖家收益,卖家收益业务逻辑处理)
+            savePlatformAccountRecord(orderDetailVo);
             //调用业务
             Consumer<UserOrderDetailVo> userOrderVoConsumer = orderSuccess.get(orderDetailVo.getGoodType());
             if (!Objects.isNull(userOrderVoConsumer)) {
                 userOrderVoConsumer.accept(orderDetailVo);
             }
-            //记录平台收入和用户分润收入(未记录卖家收益,卖家收益业务逻辑处理)
-            savePlatformAccountRecord(orderDetailVo);
             //清除商家统计缓存
             Long merchId = orderDetailVo.getMerchId();
             if (merchId != null && merchId != 0) {

+ 1 - 1
service.md

@@ -1,6 +1,6 @@
 - [ ] gateway-server
 - [ ] auth-server
-- [ ] admin-server
+- [x] admin-server
 - [x] teacher-server
 - [x] student-server
 - [ ] website-server