Merge branch 'feature/0721-tenant' of http://git.dayaedu.com/yonge/cooleshow into feature/0721-tenant

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

@@ -197,6 +197,7 @@ public class TenantActivationCodeServiceImpl extends ServiceImpl<TenantActivatio
                 .set(TenantActivationCode::getActivationUserId, student.getUserId())
                 .set(TenantActivationCode::getActivationTime, new Date())
                 .set(TenantActivationCode::getActivationPhone, sysUser.getPhone())
+                .set(TenantActivationCode::getSendStatus, EActivationCode.SEND)
                 .eq(TenantActivationCode::getId, code.getId())
                 .eq(TenantActivationCode::getActivationStatus, false)
                 .update();

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

@@ -271,7 +271,7 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
 
             // 设置recordId
             userOrderDetailVos.forEach(o -> {
-                if (o.getGoodType().equals(GoodTypeEnum.TENANT_ALBUM)) {
+                if (o.getGoodType().equals(GoodTypeEnum.TENANT_ALBUM) && userOrderVo.getOrderClient().equals(ClientEnum.TENANT)) {
                     TenantAlbumPurchase albumPurchase = tenantAlbumPurchaseService.getByOrderNo(userOrderVo.getOrderNo());
                     o.getBizInfo().setRecordId(albumPurchase.getId());
                 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/TenantAccountRecordWrapper.java

@@ -1,5 +1,7 @@
 package com.yonge.cooleshow.biz.dal.wrapper;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -120,6 +122,7 @@ public class TenantAccountRecordWrapper {
 	}
 
 
+
     @Data
     @ApiModel(" TenantAccountRecordStat-机构流水表")
     public static class TenantAccountRecordStat {
@@ -132,4 +135,66 @@ public class TenantAccountRecordWrapper {
 
     }
 
-    }
+
+    @Data
+    @ApiModel(" TenantAccountRecordExport-机构收入导出")
+    public static class TenantAccountRecordExport {
+
+        @ApiModelProperty("id")
+        @ExcelProperty("流水记录编号")
+        private Long id;
+
+        @ApiModelProperty("机构id")
+        @ExcelProperty("机构编号")
+        private Long tenantId;
+
+        @ApiModelProperty("机构名称")
+        @ExcelProperty("机构名称")
+        private String tenantName;
+
+        @ApiModelProperty("交易金额")
+        @ExcelProperty("交易金额")
+        private BigDecimal transAmount;
+
+        @ApiModelProperty("收支类型：IN、收入 OUT、支出")
+        @ExcelIgnore
+        private String inOrOut;
+
+        @ApiModelProperty("入账状态 WAIT 待入账 FROZEN 冻结入账 RECORDED 已入账 CANCEL 取消")
+        @ExcelIgnore
+        private String postStatus;
+
+        @ApiModelProperty("业务类型：PRACTICE、陪练课 LIVE、直播课 VIDEO、视频课 MUSIC、乐谱 WITHDRAWAL、提现 LIVE_SHARE、直播课分润 VIDEO_SHARE、视频课分润 MUSIC_SHARE、乐谱分润 VIP_SHARE、会员分润 MALL_SHARE、商品分润")
+        @ExcelProperty("收入类型")
+        private String bizType;
+
+        @ApiModelProperty("业务id")
+        @ExcelIgnore
+        private Long bizId;
+
+        @ApiModelProperty("业务名称")
+        @ExcelIgnore
+        private String bizName;
+
+        @ApiModelProperty("订单号")
+        @ExcelProperty("订单号")
+        private String orderNo;
+
+        @ApiModelProperty("更新时间")
+        @ExcelProperty("更新时间")
+        private Date updateTime;
+
+//        @ApiModelProperty("是否结算")
+//        @ExcelProperty("是否结算")
+//
+//        private String ;
+
+        public String jsonString() {
+            return JSON.toJSONString(this);
+        }
+
+        public static TenantAccountRecord from(String json) {
+            return JSON.parseObject(json, TenantAccountRecord.class);
+        }
+    }
+}

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

@@ -14,7 +14,7 @@
         </sql> 
     
     <select id="init" resultType="com.yonge.cooleshow.biz.dal.entity.TenantPersonStat">
-        select ti.id_ tenantId,COUNT(s.user_id_) studentNum,COUNT(t.user_id_) teacherNum from tenant_info ti
+        select ti.id_ tenantId,COUNT(distinct s.user_id_) studentNum,COUNT(distinct t.user_id_) teacherNum from tenant_info ti
         left join student s ON s.tenant_id_ = ti.id_ AND s.lock_flag_ = 0
         left join teacher t ON t.tenant_id_ = ti.id_ AND t.lock_flag_ = 0
         group by ti.id_