Merge branch 'dev_v1_1_20220720'

cooleshow-mall/mall-common/src/main/java/com/yonge/cooleshow/mall/common/api/CommonResult.java

@@ -18,6 +18,8 @@ public class CommonResult<T> {
      */
     private T data;
 
+    private Object err;
+
     protected CommonResult() {
     }
 
@@ -27,6 +29,8 @@ public class CommonResult<T> {
         this.data = data;
     }
 
+
+
     /**
      * 成功返回结果
      *
@@ -130,4 +134,12 @@ public class CommonResult<T> {
     public void setData(T data) {
         this.data = data;
     }
+
+    public Object getErr() {
+        return err;
+    }
+
+    public void setErr(Object err) {
+        this.err = err;
+    }
 }

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

@@ -35,7 +35,6 @@ public class PlatformCashAccountRecordController extends BaseController {
 	@PreAuthorize("@pcs.hasPermissions('platformCashAccountRecord/list')")
 	public HttpResponseResult<PlatformCashAccountPageVo> list(@Valid @RequestBody PlatformCashAccountRecordSearch query) {
 		PlatformCashAccountPageVo model = new PlatformCashAccountPageVo();
-		
 		PageInfo<PlatformCashAccountRecord> pageInfo = PageUtil.pageInfo(platformCashAccountRecordService.queryPage(PageUtil.getPage(query),query));
 		model.setPageInfo(pageInfo);
 		model.setSummary(platformCashAccountRecordService.querySummary(query));

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

@@ -1,5 +1,8 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
+import com.yonge.cooleshow.biz.dal.enums.AccountBizTypeEnum;
+import com.yonge.cooleshow.biz.dal.enums.InOrOutEnum;
+import com.yonge.cooleshow.common.enums.PostStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.Date;
@@ -16,13 +19,13 @@ public class PlatformCashAccountRecordSearch extends QueryInfo {
 	
 	@ApiModelProperty("收支类型（IN-收入  OUT-支出）")
 	private String inOrOut;
-	
-	@ApiModelProperty("业务类型：PRACTICE、陪练课 LIVE、直播课 VIDEO、视频课 MUSIC、乐谱")
-	private String bizType;
-	
-	@ApiModelProperty("入账状态 WAIT 待入账 RECORDED 已入账 CANCEL 退费")
-	private String status;
-	
+
+	@ApiModelProperty("业务类型：PRACTICE、陪练课 LIVE、直播课 VIDEO、视频课 MUSIC、乐谱 WITHDRAWAL、提现 LIVE_SHARE、直播课分润 VIDEO_SHARE、视频课分润 MUSIC_SHARE、乐谱分润 VIP_SHARE、会员分润 MALL_SHARE、商品分润 ")
+	private AccountBizTypeEnum bizType;
+
+	@ApiModelProperty(value = "入账状态 WAIT 待入账 FROZEN 冻结入账 RECORDED 已入账 CANCEL 退费 ")
+	private PostStatusEnum postStatus;
+
 	@ApiModelProperty("记录开始时间")
 	private Date startDate;
 	
@@ -53,20 +56,20 @@ public class PlatformCashAccountRecordSearch extends QueryInfo {
 		this.inOrOut = inOrOut;
 	}
 
-	public String getBizType() {
+	public AccountBizTypeEnum getBizType() {
 		return bizType;
 	}
 
-	public void setBizType(String bizType) {
+	public void setBizType(AccountBizTypeEnum bizType) {
 		this.bizType = bizType;
 	}
 
-	public String getStatus() {
-		return status;
+	public PostStatusEnum getPostStatus() {
+		return postStatus;
 	}
 
-	public void setStatus(String status) {
-		this.status = status;
+	public void setPostStatus(PostStatusEnum postStatus) {
+		this.postStatus = postStatus;
 	}
 
 	public Date getStartDate() {

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

@@ -89,7 +89,6 @@ public class UserOrderPaymentServiceImpl extends ServiceImpl<UserOrderPaymentDao
         return true;
     }
 
-
     @Override
     public Boolean closePaymentAndReqOpen(String orderNo, String reason) {
         UserOrderPayment orderPayment = baseMapper.selectOne(Wrappers.<UserOrderPayment>lambdaQuery().eq(UserOrderPayment::getOrderNo, orderNo).eq(UserOrderPayment::getStatus, TradeStatusEnum.pending));

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

@@ -84,7 +84,6 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
     @Autowired
     private PaymentProperties paymentProperties;
 
-
     //验证订单是否可以下单,获取订单金额信息
     private static final Map<GoodTypeEnum, Function<OrderReq.OrderReqInfo, HttpResponseResult<OrderCreateRes>>> orderCreate = new HashMap<>();
     //插入订单后执行
@@ -111,8 +110,6 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
         orderCreate.put(GoodTypeEnum.PINAO_ROOM, pianoRoomBuyRecordService::orderCreate);
 
         /**********订单生成后******************/
-
-
         //曲目购买
         orderAfter.put(GoodTypeEnum.MUSIC, musicSheetService::orderAfterSheet);
 

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

@@ -84,8 +84,8 @@
 			<if test="param.bizType">
 				and biz_type_ = #{param.bizType}
 			</if>
-			<if test="param.status">
-				and post_status_ = #{param.status}
+			<if test="param.postStatus">
+				and post_status_ = #{param.postStatus}
 			</if>
 			<if test="param.startDate">
 				and update_time_ &gt;= #{param.startDate}
@@ -116,8 +116,8 @@
 			<if test="param.bizType">
 				and biz_type_ = #{param.bizType}
 			</if>
-			<if test="param.status">
-				and post_status_ = #{param.status}
+			<if test="param.postStatus">
+				and post_status_ = #{param.postStatus}
 			</if>
 			<if test="param.startDate">
 				and update_time_ &gt;= #{param.startDate}

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/UserAccountController.java

@@ -68,7 +68,6 @@ public class UserAccountController extends BaseController {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
         query.setUserId(user.getId());
-        query.setInOrOut(InOrOutEnum.IN);
 
         if (StringUtil.isEmpty(query.getSearchDate())) {
             query.setSearchDate(DateUtil.format(new Date(), "yyyy-MM"));