Merge branch 'bug_20221130' into online

cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/service/impl/OmsPortalOrderServiceImpl.java

@@ -383,6 +383,7 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
             MallOrderItemDto teacherShareDto = new MallOrderItemDto();
             BeanUtils.copyProperties(omsOrderItem,teacherShareDto);
             teacherShareDto.setRealAmount(omsOrderItem.getRealAmount().multiply(BigDecimal.valueOf(omsOrderItem.getProductQuantity()))
+                                                        .subtract(omsOrderItem.getCouponAmount())
                                                       .subtract(omsOrderItem.getPrecisionAmount()));
             teacherShareDto.setStatus(status);
             teacherShareDto.setUserId(detail.getMemberId());

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/UserAccountRecordController.java

@@ -57,6 +57,9 @@ public class UserAccountRecordController extends BaseController {
     @ApiOperation(value = "查询分页", notes = "传入userAccountRecordSearch")
     @PreAuthorize("@pcs.hasPermissions('userAccountRecord/page')")
     public HttpResponseResult<PageInfo<UserAccountRecordVo>> page(@RequestBody UserAccountRecordSearch query) {
+        if (query.getInOrOut() == null) {
+            query.setInOrOut(InOrOutEnum.IN);
+        }
         IPage<UserAccountRecordVo> pages = userAccountRecordService.selectPage(PageUtil.getPage(query), query);
         return succeed(PageUtil.pageInfo(pages));
     }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/UserAccountRecordSearch.java

@@ -27,7 +27,7 @@ public class UserAccountRecordSearch extends QueryInfo{
 	private String orderNo;
 
 	@ApiModelProperty("收支类型：IN、收入 OUT、支出 ")
-	private InOrOutEnum inOrOut;
+	private InOrOutEnum inOrOut ;
 
 	@ApiModelProperty(value = "入账状态 WAIT 待入账 FROZEN 冻结入账 RECORDED 已入账 CANCEL 退费 ")
 	private PostStatusEnum postStatus;

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.getMusicShareRate())
                             .subtract(total.getLiveShareRate())
                             .subtract(total.getVideoShareRate())
                             .subtract(total.getAlbumShareRate())
@@ -499,7 +500,7 @@ public class UserAccountServiceImpl extends ServiceImpl<UserAccountDao, UserAcco
         }
         //平台收入
         PlatformCashAccountRecord platformCashAccountRecord = new PlatformCashAccountRecord(shareDto.getUserId(), expectPrice,
-                InOrOutEnum.IN, PostStatusEnum.WAIT, AccountBizTypeEnum.MALL, shareDto.getProductSkuId(), shareDto.getOrderSn(), new Date());
+                InOrOutEnum.IN, PostStatusEnum.RECORDED, AccountBizTypeEnum.MALL, shareDto.getProductSkuId(), shareDto.getOrderSn(), new Date());
 
         platformCashAccountRecordService.save(platformCashAccountRecord);
 

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

@@ -966,12 +966,12 @@ 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,
-                        InOrOutEnum.IN, PostStatusEnum.WAIT, bizTypeEnum, orderDetailVo.getBizId(),
-                        orderDetailVo.getOrderNo(), accountPeriodTime);
+                        InOrOutEnum.IN, PostStatusEnum.RECORDED, bizTypeEnum, orderDetailVo.getBizId(),
+                        orderDetailVo.getOrderNo(), new Date());
             }
             platformCashAccountRecordService.save(platformCashAccountRecord);
 

cooleshow-user/user-biz/src/main/resources/config/mybatis/PlatformCashAccountRecordMapper.xml

@@ -161,12 +161,12 @@
 
     <update id="cancelRecord">
 		update platform_cash_account_record set post_status_ = 'CANCEL'
-		where post_status_ = 'WAIT' and order_no_ = #{orderNo} and biz_id_ = #{bizId}
+		where  order_no_ = #{orderNo} and biz_id_ = #{bizId}
 		and biz_type_ = #{bizType}
 	</update>
 
     <update id="mallRecordedRecord">
 		update platform_cash_account_record set post_status_ = 'RECORDED'
-		where post_status_ = 'WAIT' and order_no_ = #{orderNo} and biz_id_ = #{bizId}
+		where order_no_ = #{orderNo} and biz_id_ = #{bizId}
 	</update>
 </mapper>

service.md

@@ -1,8 +1,8 @@
 - [ ] gateway-server
 - [ ] auth-server
-- [x] admin-server
-- [ ] teacher-server
-- [ ] student-server
+- [ ] admin-server
+- [x] teacher-server
+- [x] student-server
 - [ ] website-server
 - [ ] task-server
 - [ ] websocket-server