小程序订单统计

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

@@ -5,6 +5,7 @@ import com.yonge.cooleshow.common.enums.EPaymentVersion;
 import com.yonge.toolset.base.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.time.LocalDateTime;
 
@@ -12,129 +13,47 @@ import java.time.LocalDateTime;
  * @Author: liweifan
  * @Data: 2022-03-30 13:53:51
  */
+@Data
 @ApiModel(value = "OrderSearch对象", description = "平台订单表查询对象")
 public class OrderSearch extends QueryInfo{
     @ApiModelProperty("交易流水号/订单号")
 	private String searchNo;
+
 	@ApiModelProperty("下单应用：STUDENT 学生端 TEACHER 老师端")
 	private String orderClient;
+
 	@ApiModelProperty("交易类型:  VIP、开通会员  PRACTICE、陪练课购买  LIVE、直播课购买 VIDEO、视频课购买 MUSIC、单曲点播 ACTI_REGIST、活动报名（多选用,分割）")
 	private String orderType;
+
 	@ApiModelProperty("订单状态 WAIT_PAY 待支付 PAYING 支付中  PAID 已付款 CLOSE 已关闭 FAIL 支付失败 （多选用,分割）")
 	private String status;
+
 	@ApiModelProperty(value = "交易开始时间")
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
 	private LocalDateTime startTime;
+
 	@ApiModelProperty(value = "交易结束时间")
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
 	private LocalDateTime endTime;
+
 	@ApiModelProperty("买家id")
 	private Long userId;
+
 	@ApiModelProperty("卖家id")
 	private Long merchId;
+
+	@ApiModelProperty("机构编号")
+	private Long tenantId;
+
 	@ApiModelProperty("查询时间（yyyy-mm） ")
 	private String searchDate;
+
 	@ApiModelProperty(hidden = true)
 	private String goodType;
+
 	@ApiModelProperty(hidden = true)
 	private Long bizId;
 
     @ApiModelProperty(value = "版本",hidden = true)
     private EPaymentVersion paymentVersion;
-
-    public EPaymentVersion getPaymentVersion() {
-        return paymentVersion;
-    }
-
-    public void setPaymentVersion(EPaymentVersion paymentVersion) {
-        this.paymentVersion = paymentVersion;
-    }
-
-    public String getSearchNo() {
-		return searchNo;
-	}
-
-	public void setSearchNo(String searchNo) {
-		this.searchNo = searchNo;
-	}
-
-	public String getOrderType() {
-		return orderType;
-	}
-
-	public void setOrderType(String orderType) {
-		this.orderType = orderType;
-	}
-
-	public String getStatus() {
-		return status;
-	}
-
-	public void setStatus(String status) {
-		this.status = status;
-	}
-
-	public LocalDateTime getStartTime() {
-		return startTime;
-	}
-
-	public void setStartTime(LocalDateTime startTime) {
-		this.startTime = startTime;
-	}
-
-	public LocalDateTime getEndTime() {
-		return endTime;
-	}
-
-	public void setEndTime(LocalDateTime endTime) {
-		this.endTime = endTime;
-	}
-
-	public Long getUserId() {
-		return userId;
-	}
-
-	public void setUserId(Long userId) {
-		this.userId = userId;
-	}
-
-	public Long getMerchId() {
-		return merchId;
-	}
-
-	public void setMerchId(Long merchId) {
-		this.merchId = merchId;
-	}
-
-	public String getSearchDate() {
-		return searchDate;
-	}
-
-	public void setSearchDate(String searchDate) {
-		this.searchDate = searchDate;
-	}
-
-	public String getGoodType() {
-		return goodType;
-	}
-
-	public void setGoodType(String goodType) {
-		this.goodType = goodType;
-	}
-
-	public Long getBizId() {
-		return bizId;
-	}
-
-	public void setBizId(Long bizId) {
-		this.bizId = bizId;
-	}
-
-	public String getOrderClient() {
-		return orderClient;
-	}
-
-	public void setOrderClient(String orderClient) {
-		this.orderClient = orderClient;
-	}
 }

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

@@ -8,7 +8,9 @@ import io.swagger.annotations.ApiModelProperty;
 import java.util.Date;
 
 import com.yonge.toolset.base.page.QueryInfo;
+import lombok.Data;
 
+@Data
 public class PlatformCashAccountRecordSearch extends QueryInfo {
 
 	@ApiModelProperty("关联订单号")
@@ -33,59 +35,6 @@ public class PlatformCashAccountRecordSearch extends QueryInfo {
 	@ApiModelProperty("记录结束时间")
 	private Date endDate;
 
-	public String getOrderNo() {
-		return orderNo;
-	}
-
-	public void setOrderNo(String orderNo) {
-		this.orderNo = orderNo;
-	}
-
-	public Long getBizId() {
-		return bizId;
-	}
-
-	public void setBizId(Long bizId) {
-		this.bizId = bizId;
-	}
-
-	public String getInOrOut() {
-		return inOrOut;
-	}
-
-	public void setInOrOut(String inOrOut) {
-		this.inOrOut = inOrOut;
-	}
-
-	public AccountBizTypeEnum getBizType() {
-		return bizType;
-	}
-
-	public void setBizType(AccountBizTypeEnum bizType) {
-		this.bizType = bizType;
-	}
-
-	public PostStatusEnum getPostStatus() {
-		return postStatus;
-	}
-
-	public void setPostStatus(PostStatusEnum postStatus) {
-		this.postStatus = postStatus;
-	}
-
-	public Date getStartDate() {
-		return startDate;
-	}
-
-	public void setStartDate(Date startDate) {
-		this.startDate = startDate;
-	}
-
-	public Date getEndDate() {
-		return endDate;
-	}
-
-	public void setEndDate(Date endDate) {
-		this.endDate = endDate;
-	}
+	@ApiModelProperty("机构编号")
+	private Long tenantId;
 }

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

@@ -7,6 +7,7 @@ import com.yonge.toolset.base.page.QueryInfo;
 import com.yonge.toolset.payment.base.enums.TradeStatusEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.time.LocalDateTime;
 
@@ -14,6 +15,7 @@ import java.time.LocalDateTime;
  * @Author: liweifan
  * @Data: 2022-03-30 13:53:51
  */
+@Data
 @ApiModel(value = "TeacherWithdrawalSearch对象", description = "老师账户结算表查询对象")
 public class TeacherWithdrawalSearch extends QueryInfo{
 	private static final long serialVersionUID = 1L;
@@ -42,83 +44,5 @@ public class TeacherWithdrawalSearch extends QueryInfo{
 
 	private Long userId;
 
-	public String getTransNo() {
-		return transNo;
-	}
-
-	public void setTransNo(String transNo) {
-		this.transNo = transNo;
-	}
-
-	public String getUsername() {
-		return username;
-	}
-
-	public void setUsername(String username) {
-		this.username = username;
-	}
-
-	public TradeStatusEnum getTradeStatus() {
-		return tradeStatus;
-	}
-
-	public void setTradeStatus(TradeStatusEnum tradeStatus) {
-		this.tradeStatus = tradeStatus;
-	}
-
-	public LocalDateTime getStartTime() {
-		return startTime;
-	}
-
-	public void setStartTime(LocalDateTime startTime) {
-		this.startTime = startTime;
-	}
-
-	public LocalDateTime getEndTime() {
-		return endTime;
-	}
-
-	public void setEndTime(LocalDateTime endTime) {
-		this.endTime = endTime;
-	}
-
-	public String getSearchDate() {
-		return searchDate;
-	}
-
-	public void setSearchDate(String searchDate) {
-		this.searchDate = searchDate;
-	}
-
-	public Long getUserId() {
-		return userId;
-	}
-
-	public void setUserId(Long userId) {
-		this.userId = userId;
-	}
-
-	public AuthStatusEnum getAuthStatus() {
-		return authStatus;
-	}
-
-	public void setAuthStatus(AuthStatusEnum authStatus) {
-		this.authStatus = authStatus;
-	}
-
-	public String getVerifyUser() {
-		return verifyUser;
-	}
-
-	public void setVerifyUser(String verifyUser) {
-		this.verifyUser = verifyUser;
-	}
-
-	public String getStatus() {
-		return status;
-	}
-
-	public void setStatus(String status) {
-		this.status = status;
-	}
+	private Long tenantId;
 }

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

@@ -80,6 +80,9 @@
 	<sql id="selectSql">
 		select * from platform_cash_account_record
 		<where>
+			<if test="param.tenantId">
+				and tenant_id_ = #{param.tenantId}
+			</if>
 			<if test="param.orderNo">
 				and order_no_ = #{param.orderNo}
 			</if>
@@ -119,6 +122,9 @@
 			sum(case when in_or_out_ = 'OUT' and post_status_ = 'RECORDED' then trans_amount_ else 0 end) settledPayment
 		from platform_cash_account_record
 		<where>
+			<if test="param.tenantId">
+				and tenant_id_ = #{param.tenantId}
+			</if>
 			<if test="param.orderNo">
 				and order_no_ = #{param.orderNo}
 			</if>

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

@@ -124,6 +124,9 @@
             <if test="null != param.orderClient and '' != param.orderClient">
                 AND t.order_client_ = #{param.orderClient}
             </if>
+            <if test="param.tenantId != null">
+                and t.tenant_id_ = #{param.tenantId}
+            </if>
             <if test="param.paymentVersion != null">
                 and t.payment_version_ = #{param.paymentVersion}
             </if>

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

@@ -92,6 +92,9 @@
             left join sys_user au on t.auth_user_id_ = au.id_
         <where>
             u.del_flag_ = 0
+            <if test="param.tenantId !=null">
+                AND t.tenant_id_ = #{param.tenantId}
+            </if>
             <if test="param.userId !=null">
                 AND t.user_id_ = #{param.userId}
             </if>