Merge branch 'dev_v1_1_20220720' of http://git.dayaedu.com/yonge/cooleshow into dev_v1_1_20220720

cooleshow-common/src/main/java/com/yonge/cooleshow/common/enums/PostStatusEnum.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.EnumValue;
 import com.yonge.toolset.base.enums.BaseEnum;
 
 /**
- * 入账状态 WAIT 待入账 FROZEN 冻结入账 RECORDED 已入账 CANCEL 取消
+ * 入账状态 WAIT 待入账 FROZEN 冻结入账 RECORDED 已入账 CANCEL 退费
  *
  * @Author: liweifan
  * @Data: 2022/4/7 15:48
@@ -14,7 +14,7 @@ public enum PostStatusEnum implements BaseEnum<String, PostStatusEnum> {
     WAIT("待入账"),
     FROZEN("冻结入账"),
     RECORDED("已入账"),
-    CANCEL("取消");
+    CANCEL("退费");
 
     @EnumValue
     private String code;

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dto.req.TotalReq;
+import com.yonge.cooleshow.biz.dal.enums.InOrOutEnum;
 import com.yonge.cooleshow.biz.dal.vo.UserAccountVo;
 import com.yonge.cooleshow.biz.dal.vo.res.AccountTotal;
 import com.yonge.toolset.mybatis.support.PageUtil;
@@ -47,6 +48,7 @@ public class UserAccountRecordController extends BaseController {
     @ApiOperation(value = "查询分页", notes = "传入userAccountRecordSearch")
     @PreAuthorize("@pcs.hasPermissions('userAccountRecord/page')")
     public HttpResponseResult<PageInfo<UserAccountRecordVo>> page(@RequestBody UserAccountRecordSearch query) {
+        query.setInOrOut(InOrOutEnum.IN);
 		IPage<UserAccountRecordVo> pages = userAccountRecordService.selectPage(PageUtil.getPage(query), query);
         return succeed(PageUtil.pageInfo(pages));
 	}
@@ -55,6 +57,7 @@ public class UserAccountRecordController extends BaseController {
     @PostMapping("/accountTotal")
     @PreAuthorize("@pcs.hasPermissions('userAccountRecord/accountTotal')")
     public HttpResponseResult<UserAccountVo> accountTotal(@RequestBody UserAccountRecordSearch query) {
+        query.setInOrOut(InOrOutEnum.IN);
         return userAccountRecordService.accountTotal(query);
     }
 

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

@@ -18,6 +18,7 @@ import java.math.BigDecimal;
  */
 @ApiModel(value = "UserAccountRecordDto对象", description = "账户变更传输对象")
 public class UserAccountRecordDto extends UserAccountRecord {
+    public UserAccountRecordDto(){}
     public UserAccountRecordDto(Long accountId, PostStatusEnum postStatus, BigDecimal transAmount, InOrOutEnum inOrOut, AccountBizTypeEnum bizType,
                                 Long bizId, String bizName, String orderNo, Long buyUser) {
         this.setAccountId(accountId);

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

@@ -20,7 +20,7 @@ public class PlatformCashAccountRecordSearch extends QueryInfo {
 	@ApiModelProperty("业务类型：PRACTICE、陪练课 LIVE、直播课 VIDEO、视频课 MUSIC、乐谱")
 	private String bizType;
 	
-	@ApiModelProperty("入账状态 WAIT 待入账 RECORDED 已入账 CANCEL 取消")
+	@ApiModelProperty("入账状态 WAIT 待入账 RECORDED 已入账 CANCEL 退费")
 	private String status;
 	
 	@ApiModelProperty("记录开始时间")

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

@@ -29,7 +29,7 @@ public class UserAccountRecordSearch extends QueryInfo{
 	@ApiModelProperty("收支类型：IN、收入 OUT、支出 ")
 	private InOrOutEnum inOrOut;
 
-	@ApiModelProperty(value = "入账状态 WAIT 待入账 FROZEN 冻结入账 RECORDED 已入账 CANCEL 取消 ")
+	@ApiModelProperty(value = "入账状态 WAIT 待入账 FROZEN 冻结入账 RECORDED 已入账 CANCEL 退费 ")
 	private PostStatusEnum postStatus;
 
 	@ApiModelProperty("业务类型：PRACTICE、陪练课 LIVE、直播课 VIDEO、视频课 MUSIC、乐谱 WITHDRAWAL、提现 LIVE_SHARE、直播课分润 VIDEO_SHARE、视频课分润 MUSIC_SHARE、乐谱分润 VIP_SHARE、会员分润 MALL_SHARE、商品分润 ")

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

@@ -40,7 +40,7 @@ public class PlatformCashAccountRecord implements Serializable {
     private InOrOutEnum inOrOut;
 
     @TableField("post_status_")
-    @ApiModelProperty(value = "入账状态 WAIT 待入账 RECORDED 已入账 CANCEL 取消")
+    @ApiModelProperty(value = "入账状态 WAIT 待入账 RECORDED 已入账 CANCEL 退费")
     private PostStatusEnum postStatus;
 
     @TableField("biz_type_")

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

@@ -39,7 +39,7 @@ public class UserAccountRecord implements Serializable {
     @ApiModelProperty(value = "收支类型：IN、收入 OUT、支出 ",required = true)
     @TableField(value = "in_or_out_")
     private InOrOutEnum inOrOut;
-    @ApiModelProperty(value = "入账状态 WAIT 待入账 FROZEN 冻结入账 RECORDED 已入账 CANCEL 取消 ")
+    @ApiModelProperty(value = "入账状态 WAIT 待入账 FROZEN 冻结入账 RECORDED 已入账 CANCEL 退费 ")
     @TableField(value = "post_status_")
     private PostStatusEnum postStatus;
     @ApiModelProperty(value = "业务类型：PRACTICE、陪练课 LIVE、直播课 VIDEO、视频课 MUSIC、乐谱 WITHDRAWAL、提现 LIVE_SHARE、直播课分润 VIDEO_SHARE、视频课分润 MUSIC_SHARE、乐谱分润 VIP_SHARE、会员分润 MALL_SHARE、商品分润",required = true)

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

@@ -66,7 +66,7 @@ public interface UserAccountService extends IService<UserAccount>  {
      * 入账结算（入账状态变更）
      * @author liweifan
      * @param: recordId     记录id
-     * @param: postStatus   入账状态 RECORDED 已入账 CANCEL 取消
+     * @param: postStatus   入账状态 RECORDED 已入账 CANCEL 退费
      * @updateTime 2022/4/7 16:40
      * @return: java.lang.Integer
      */

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

@@ -141,7 +141,6 @@ public class UserAccountRecordServiceImpl extends ServiceImpl<UserAccountRecordD
 
     @Override
     public List<UserAccountRecord> selectRecordByOrderDetail(UserOrderDetailVo userOrderDetailVo) {
-        //todo 这里需要测试
         //订单类型: 学生端（ VIP、开通会员  PRACTICE、陪练课购买  LIVE、直播课购买 VIDEO、视频课购买 MUSIC、单曲点播 ） 老师端（VIP、开通会员 PINAO_ROOM、琴房时长）
         //获取业务id
         List<Long> bizIds = new ArrayList<>();

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

@@ -73,11 +73,13 @@ public class UserAccountServiceImpl extends ServiceImpl<UserAccountDao, UserAcco
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public HttpResponseResult accountRecord(UserAccountRecordDto accountRecordDto) {
         return accountRecord(Arrays.asList(accountRecordDto));
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public HttpResponseResult accountRecord(List<UserAccountRecordDto> accountRecordDtos) {
         if (CollectionUtils.isEmpty(accountRecordDtos)) {
             return HttpResponseResult.succeed();

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/UserAccountVo.java

@@ -15,7 +15,7 @@ import java.math.BigDecimal;
 public class UserAccountVo extends UserAccount{
 	private static final long serialVersionUID = 1L;
 
-	@ApiModelProperty("待入账金额 ")
+	@ApiModelProperty("未入账金额 ")
 	private BigDecimal amountUnrecorded;
 
 	@ApiModelProperty("已入账金额 ")

toolset/toolset-payment/src/main/java/com/yonge/toolset/payment/util/DistributedLock.java

@@ -71,7 +71,7 @@ public class DistributedLock {
         } catch (BizException e) {
             throw e;
         }  catch (Exception e) {
-            log.error("runIfLockCanGet error lockName : {}", lockName, e);
+            e.printStackTrace();
             throw new RuntimeException("runIfLockCanGet error lockName :" + lockName, e);
         } finally {
             unlock(lock);
@@ -116,7 +116,7 @@ public class DistributedLock {
                 throw new BizException(message);
             }
         } catch (Exception e) {
-            log.error("callIfLockCanGet error lockKey {}", lockName);
+            e.printStackTrace();
             throw new RuntimeException("任务执行异常");
         } finally {
             executor.shutdown();
@@ -148,7 +148,7 @@ public class DistributedLock {
                 return null;
             }
         } catch (Exception e) {
-            log.error("callIfLockCanGet error lockKey {}", lockName);
+            e.printStackTrace();
             throw new RuntimeException("任务执行异常");
         } finally {
             executor.shutdown();
@@ -171,7 +171,7 @@ public class DistributedLock {
      *
      * @param lockName lockKey
      * @param function 需要执行的方法
-     * @return Future 异步任务
+     * @return Future
      */
     public <T, R> R runIfLockToFunction(final String lockName, Function<T, R> function, T param, long waitTime) {
         RLock lock = redissonClient.getLock(lockName);
@@ -189,7 +189,7 @@ public class DistributedLock {
         } catch (BizException e) {
             throw e;
         } catch (Exception e) {
-            log.error("callIfLockCanGet error lockKey {}", lockName);
+            e.printStackTrace();
             throw new RuntimeException("任务执行异常");
         } finally {
             unlock(lock);