fix:merge

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/UserAccountServiceImpl.java

@@ -391,6 +391,7 @@ public class UserAccountServiceImpl extends ServiceImpl<UserAccountDao, UserAcco
                             .subtract(total.getLiveRate())
                             .subtract(total.getVideoRate())
                             .subtract(total.getMusicRate())
+                            .subtract(total.getMallShareRate())
                             .subtract(total.getLiveShareRate())
                             .subtract(total.getVideoShareRate())
                             .subtract(total.getAlbumShareRate())

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

@@ -966,7 +966,7 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
             if (GoodTypeEnum.PINAO_ROOM.equals(orderDetailVo.getGoodType())) {
                 platformCashAccountRecord = new PlatformCashAccountRecord(orderDetailVo.getUserId(), platformFee,
                         InOrOutEnum.IN, PostStatusEnum.RECORDED, AccountBizTypeEnum.PIAON_ROOM, orderDetailVo.getBizId(),
-                        orderDetailVo.getOrderNo(), accountPeriodTime);
+                        orderDetailVo.getOrderNo(), new Date());
             } else {
                 AccountBizTypeEnum bizTypeEnum = AccountBizTypeEnum.valueOf(orderDetailVo.getGoodType().getCode());
                 platformCashAccountRecord = new PlatformCashAccountRecord(orderDetailVo.getUserId(), platformFee,

service.md

@@ -1,8 +1,8 @@
 - [ ] gateway-server
 - [ ] auth-server
 - [ ] admin-server
-- [ ] teacher-server
-- [ ] student-server
+- [x] teacher-server
+- [x] student-server
 - [ ] website-server
 - [ ] task-server
 - [ ] websocket-server
@@ -11,5 +11,5 @@
 - [ ] classroom-server
 - [ ] cms-server
 - [ ] mall-admin
-- [x] mall-server
+- [ ] mall-server
 - [ ] EOF