活动报名订单修改

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

@@ -10,6 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
+import java.time.LocalTime;
 
 /**
  * @Author: liweifan
@@ -75,6 +76,8 @@ public class PianoRoomChangeRecordSearch extends QueryInfo{
 	}
 
 	public void setEndTime(LocalDateTime endTime) {
-		this.endTime = endTime;
+		if(null != endTime){
+			this.endTime = LocalDateTime.of(endTime.toLocalDate(), LocalTime.MAX);
+		}
 	}
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/PlatformCashAccountRecord.java

@@ -44,11 +44,11 @@ public class PlatformCashAccountRecord implements Serializable {
     private PostStatusEnum postStatus;
 
     @TableField("biz_type_")
-    @ApiModelProperty(value = "业务类型：PRACTICE、陪练课 LIVE、直播课 VIDEO、视频课 MUSIC、乐谱")
+    @ApiModelProperty(value = "业务类型：PRACTICE、陪练课 LIVE、直播课 VIDEO、视频课 MUSIC、乐谱 VIP、会员充值 MALL、商品购买 PIAON_ROOM、琴房充值 ACTI_REGIST、活动报名 LIVE_SHARE、直播课分润 VIDEO_SHARE、视频课分润  MUSIC_SHARE、乐谱分润  VIP_SHARE、会员分润  MALL_SHARE、商品分润")
     private AccountBizTypeEnum bizType;
 
     @TableField("biz_id_")
-    @ApiModelProperty(value = "业务id(陪练课,直播课course_schedule_id_ | 视频课,乐谱为课程组曲子id | 提现为提现记录id)")
+    @ApiModelProperty(value = "业务id(PRACTICE,LIVE,LIVE_SHARE为课程组id | VIDEO,VIDEO_SHARE为视频组id |MUSIC,MUSIC_SHARE为曲谱id | VIP,VIP_SHARE,PIAON_ROOM为会员琴房价格表id | MALL,MALL_SHARE为商品id | ACTI_REGIST为活动id )")
     private Long bizId;
 
     @TableField("memo_")

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/AccountBizTypeEnum.java

@@ -18,6 +18,7 @@ public enum AccountBizTypeEnum implements BaseEnum<String, AccountBizTypeEnum> {
     VIP("会员充值"),
     MALL("商品购买"),
     PIAON_ROOM("琴房充值"),
+    ACTI_REGIST("活动报名"),
     WITHDRAWAL("结算"),
 
     LIVE_SHARE("直播课分润"),

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

@@ -56,6 +56,8 @@ public class PianoRoomChangeRecordServiceImpl extends ServiceImpl<PianoRoomChang
 
                             if (null == pianoRoomTime) {
                                 pianoRoomTime = new PianoRoomTime();
+                                pianoRoomTime.setRemainTime(0);
+                                pianoRoomTime.setFrozenTime(0);
                                 pianoRoomTime.setTeacherId(pianoRoomChangeRecord.getUserId());
                                 pianoRoomTimeService.save(pianoRoomTime);
                             }

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

@@ -417,6 +417,7 @@ public class UserAccountServiceImpl extends ServiceImpl<UserAccountDao, UserAcco
         if (CollectionUtils.isEmpty(shareDto)) {
             return;
         }
+
         for (MallOrderItemDto mallOrderItemDto : shareDto) {
             mallTeacherRecordState(mallOrderItemDto);
         }

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

@@ -805,9 +805,11 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
 
         if (platformFee.compareTo(BigDecimal.ZERO) > 0) {
             PlatformCashAccountRecord platformCashAccountRecord;
-            if (GoodTypeEnum.PINAO_ROOM.equals(orderDetailVo.getGoodType())) {
+            if (GoodTypeEnum.PINAO_ROOM.equals(orderDetailVo.getGoodType())
+                    || GoodTypeEnum.ACTI_REGIST.equals(orderDetailVo.getGoodType())) {
+                AccountBizTypeEnum bizTypeEnum = AccountBizTypeEnum.valueOf(orderDetailVo.getGoodType().getCode());
                 platformCashAccountRecord = new PlatformCashAccountRecord(orderDetailVo.getUserId(), platformFee,
-                        InOrOutEnum.IN, PostStatusEnum.RECORDED, AccountBizTypeEnum.PIAON_ROOM, orderDetailVo.getBizId(),
+                        InOrOutEnum.IN, PostStatusEnum.RECORDED, bizTypeEnum, orderDetailVo.getBizId(),
                         orderDetailVo.getOrderNo(), accountPeriodTime);
             } else {
                 AccountBizTypeEnum bizTypeEnum = AccountBizTypeEnum.valueOf(orderDetailVo.getGoodType().getCode());