Browse Source

小程序订单统计

zouxuan 1 year ago
parent
commit
116e5fb43d

+ 78 - 0
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/PaymentDivMemberRecord.java

@@ -0,0 +1,78 @@
+package com.yonge.cooleshow.biz.dal.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import lombok.Data;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import java.math.BigDecimal;
+
+/**
+ * 分账子账户记录表
+ * 2023-07-28 15:45:03
+ */
+@Data
+@ApiModel(" PaymentDivMemberRecord-分账子账户记录表")
+@TableName("payment_div_member_record")
+public class PaymentDivMemberRecord implements Serializable {
+
+    @ApiModelProperty("主键") 
+	    @TableId(value = "id_")
+	    private Long id;
+
+    @ApiModelProperty("机构ID") 
+	@TableField(value = "tenant_id_")
+    private Long tenantId;
+
+    @ApiModelProperty("商户ID") 
+	@TableField(value = "app_id_")
+    private String appId;
+
+    @ApiModelProperty("分账用户ID") 
+	@TableField(value = "member_id_")
+    private String memberId;
+
+    @ApiModelProperty("订单编号") 
+	@TableField(value = "order_no_")
+    private String orderNo;
+
+    @ApiModelProperty("三方流水号") 
+	@TableField(value = "trans_no_")
+    private String transNo;
+
+    @ApiModelProperty("分账金额") 
+	@TableField(value = "amount_")
+    private BigDecimal amount;
+
+    @ApiModelProperty("机构到账标记") 
+	@TableField(value = "tenant_enter_flag_")
+    private Boolean tenantEnterFlag;
+
+    @ApiModelProperty("分账状态 ING,SUCCESS,REFUND,CLOSE") 
+	@TableField(value = "status_")
+    private String status;
+
+    @ApiModelProperty("手续费标识") 
+	@TableField(value = "fee_flag_")
+    private String feeFlag;
+
+    @ApiModelProperty("手续费") 
+	@TableField(value = "fee_amt_")
+    private BigDecimal feeAmt;
+
+    @ApiModelProperty("创建时间") 
+	@TableField(value = "create_time_")
+    private Date createTime;
+
+    @ApiModelProperty("更新时间") 
+	@TableField(value = "update_time_")
+    private Date updateTime;
+
+}

+ 33 - 0
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/mapper/PaymentDivMemberRecordMapper.java

@@ -0,0 +1,33 @@
+package com.yonge.cooleshow.biz.dal.mapper;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yonge.cooleshow.biz.dal.wrapper.TenantPersonStatWrapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+import com.yonge.cooleshow.biz.dal.entity.PaymentDivMemberRecord;
+import com.yonge.cooleshow.biz.dal.wrapper.PaymentDivMemberRecordWrapper;
+
+/**
+ * 分账子账户记录表
+ * 2023-07-28 15:45:03
+ */
+@Repository
+public interface PaymentDivMemberRecordMapper extends BaseMapper<PaymentDivMemberRecord> {
+
+	/**
+	 * 分页查询
+	 * @param page IPage<PaymentDivMemberRecordWrapper.PaymentDivMemberRecord>
+	 * @param param PaymentDivMemberRecordWrapper.PaymentDivMemberRecordQuery
+	 * @return List<PaymentDivMemberRecordWrapper.PaymentDivMemberRecord>
+	 */
+	List<PaymentDivMemberRecord> selectPage(@Param("page") IPage<PaymentDivMemberRecord> page, @Param("param") PaymentDivMemberRecordWrapper.PaymentDivMemberRecordQuery param);
+
+    List<PaymentDivMemberRecordWrapper.IndexIncomeQueryDto> queryIncome(@Param("page") IPage<PaymentDivMemberRecordWrapper.IndexIncomeQueryDto> page,
+																		@Param("param") PaymentDivMemberRecordWrapper.IndexIncomeQuery param);
+
+	//小程序首页订单详情
+    PaymentDivMemberRecordWrapper.OrderDetailDto getOrderDetail(@Param("orderNo") String orderNo, @Param("tenantId") Long tenantId);
+}

+ 52 - 0
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/PaymentDivMemberRecordService.java

@@ -0,0 +1,52 @@
+package com.yonge.cooleshow.biz.dal.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yonge.cooleshow.biz.dal.wrapper.PaymentDivMemberRecordWrapper;
+import com.yonge.cooleshow.biz.dal.entity.PaymentDivMemberRecord;
+import com.yonge.cooleshow.biz.dal.wrapper.TenantPersonStatWrapper;
+
+import java.util.List;
+
+/**
+ * 分账子账户记录表
+ * 2023-07-28 15:45:03
+ */
+public interface PaymentDivMemberRecordService extends IService<PaymentDivMemberRecord>  {
+
+	/**
+     * 查询详情
+     * @param id 详情ID
+     * @return PaymentDivMemberRecord
+     */
+	PaymentDivMemberRecord detail(Long id);
+
+    /**
+     * 分页查询
+     * @param page IPage<PaymentDivMemberRecord>
+     * @param query PaymentDivMemberRecordWrapper.PaymentDivMemberRecordQuery
+     * @return IPage<PaymentDivMemberRecord>
+     */
+    IPage<PaymentDivMemberRecord> selectPage(IPage<PaymentDivMemberRecord> page, PaymentDivMemberRecordWrapper.PaymentDivMemberRecordQuery query);
+	
+    /**
+     * 添加
+     * @param paymentDivMemberRecord PaymentDivMemberRecordWrapper.PaymentDivMemberRecord
+     * @return Boolean
+     */
+     Boolean add(PaymentDivMemberRecordWrapper.PaymentDivMemberRecord paymentDivMemberRecord);   
+
+    /**
+     * 更新
+     * @param paymentDivMemberRecord PaymentDivMemberRecordWrapper.PaymentDivMemberRecord
+     * @return Boolean
+     */
+     Boolean update(PaymentDivMemberRecordWrapper.PaymentDivMemberRecord paymentDivMemberRecord);
+
+     //小程序首页收入明细
+    IPage<PaymentDivMemberRecordWrapper.IndexIncomeQueryDto> queryIncome(IPage<PaymentDivMemberRecordWrapper.IndexIncomeQueryDto> page,
+                                                                         PaymentDivMemberRecordWrapper.IndexIncomeQuery query);
+
+    //小程序首页订单详情
+    PaymentDivMemberRecordWrapper.OrderDetailDto getOrderDetail(String orderNo,Long tenantId);
+}

+ 2 - 3
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/SysMusicCompareRecordService.java

@@ -1,14 +1,13 @@
 package com.yonge.cooleshow.biz.dal.service;
 
-import java.util.List;
-import java.util.Map;
-
 import com.yonge.cooleshow.biz.dal.dao.SysMusicCompareRecordDao;
 import com.yonge.cooleshow.biz.dal.entity.SysMusicCompareRecord;
 import com.yonge.cooleshow.biz.dal.queryInfo.SysMusicCompareRecordQueryInfo;
 import com.yonge.toolset.base.page.PageInfo;
 import com.yonge.toolset.mybatis.service.BaseService;
 
+import java.util.Map;
+
 public interface SysMusicCompareRecordService extends BaseService<Long, SysMusicCompareRecord> {
 
     SysMusicCompareRecordDao getDao();

+ 79 - 0
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/PaymentDivMemberRecordServiceImpl.java

@@ -0,0 +1,79 @@
+package com.yonge.cooleshow.biz.dal.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yonge.cooleshow.biz.dal.wrapper.TenantPersonStatWrapper;
+import org.springframework.stereotype.Service;
+import org.springframework.beans.BeanUtils;
+import lombok.extern.slf4j.Slf4j;
+import com.yonge.cooleshow.biz.dal.entity.PaymentDivMemberRecord;
+import com.yonge.cooleshow.biz.dal.wrapper.PaymentDivMemberRecordWrapper;
+import com.yonge.cooleshow.biz.dal.mapper.PaymentDivMemberRecordMapper;
+import com.yonge.cooleshow.biz.dal.service.PaymentDivMemberRecordService;
+
+import java.util.List;
+
+/**
+ * 分账子账户记录表
+ * 2023-07-28 15:45:03
+ */
+@Slf4j
+@Service
+public class PaymentDivMemberRecordServiceImpl extends ServiceImpl<PaymentDivMemberRecordMapper, PaymentDivMemberRecord> implements PaymentDivMemberRecordService {
+
+	/**
+     * 查询详情
+     * @param id 详情ID
+     * @return PaymentDivMemberRecord
+     */
+	@Override
+    public PaymentDivMemberRecord detail(Long id) {
+        
+        return baseMapper.selectById(id);
+    }
+    
+    /**
+     * 分页查询
+     * @param page IPage<PaymentDivMemberRecord>
+     * @param query PaymentDivMemberRecordWrapper.PaymentDivMemberRecordQuery
+     * @return IPage<PaymentDivMemberRecord>
+     */
+    @Override
+    public IPage<PaymentDivMemberRecord> selectPage(IPage<PaymentDivMemberRecord> page, PaymentDivMemberRecordWrapper.PaymentDivMemberRecordQuery query) {
+        
+        return page.setRecords(baseMapper.selectPage(page, query));
+    }
+	
+    /**
+     * 添加
+     * @param paymentDivMemberRecord PaymentDivMemberRecordWrapper.PaymentDivMemberRecord
+     * @return Boolean
+     */
+    @Override
+    public Boolean add(PaymentDivMemberRecordWrapper.PaymentDivMemberRecord paymentDivMemberRecord) {    	
+        
+        return this.save(JSON.parseObject(paymentDivMemberRecord.jsonString(), PaymentDivMemberRecord.class));
+    }
+
+    /**
+     * 更新
+     * @param paymentDivMemberRecord PaymentDivMemberRecordWrapper.PaymentDivMemberRecord
+     * @return Boolean
+     */
+    @Override
+    public Boolean update(PaymentDivMemberRecordWrapper.PaymentDivMemberRecord paymentDivMemberRecord){
+
+        return this.updateById(JSON.parseObject(paymentDivMemberRecord.jsonString(), PaymentDivMemberRecord.class));       
+    }
+
+    @Override
+    public IPage<PaymentDivMemberRecordWrapper.IndexIncomeQueryDto> queryIncome(IPage<PaymentDivMemberRecordWrapper.IndexIncomeQueryDto> page, PaymentDivMemberRecordWrapper.IndexIncomeQuery query) {
+        return page.setRecords(baseMapper.queryIncome(page, query));
+    }
+
+    @Override
+    public PaymentDivMemberRecordWrapper.OrderDetailDto getOrderDetail(String orderNo,Long tenantId) {
+        return baseMapper.getOrderDetail(orderNo,tenantId);
+    }
+}

+ 1 - 11
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/SysMusicCompareRecordServiceImpl.java

@@ -4,10 +4,8 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Lists;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
-import com.yonge.cooleshow.auth.api.entity.SysUserDevice;
 import com.yonge.cooleshow.biz.dal.dao.MusicSheetDao;
 import com.yonge.cooleshow.biz.dal.dao.SysMusicCompareRecordDao;
-import com.yonge.cooleshow.biz.dal.dao.SysMusicCompareWeekDataDao;
 import com.yonge.cooleshow.biz.dal.dto.IndexBaseDto;
 import com.yonge.cooleshow.biz.dal.dto.IndexBaseMonthData;
 import com.yonge.cooleshow.biz.dal.dto.StudentTrainChartDto;
@@ -41,15 +39,7 @@ import java.time.DayOfWeek;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service

+ 154 - 0
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/PaymentDivMemberRecordWrapper.java

@@ -0,0 +1,154 @@
+package com.yonge.cooleshow.biz.dal.wrapper;
+
+import com.alibaba.fastjson.JSON;
+import com.microsvc.toolkit.common.response.paging.QueryInfo;
+import com.yonge.cooleshow.biz.dal.enums.OrderStatusEnum;
+import com.yonge.cooleshow.common.enums.payment.EGoodsType;
+import com.yonge.cooleshow.common.enums.payment.EOrderType;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+import java.util.Optional;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * 分账子账户记录表
+ * 2023-07-28 15:45:03
+ */
+@ApiModel(value = "PaymentDivMemberRecordWrapper对象", description = "分账子账户记录表查询对象")
+public class PaymentDivMemberRecordWrapper {
+
+    @Data
+	@Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @ApiModel(" PaymentDivMemberRecordQuery-分账子账户记录表")
+    public static class PaymentDivMemberRecordQuery implements QueryInfo {
+    
+    	@ApiModelProperty("当前页")
+        private Integer page;
+        
+        @ApiModelProperty("分页行数")
+        private Integer rows;
+        
+        @ApiModelProperty("关键字匹配")
+		private String keyword;
+        
+        public String getKeyword() {
+            return Optional.ofNullable(keyword).filter(StringUtils::isNotBlank).orElse(null);
+        }
+        
+        public String jsonString() {
+            return JSON.toJSONString(this);
+        }
+
+        public static PaymentDivMemberRecordQuery from(String json) {
+            return JSON.parseObject(json, PaymentDivMemberRecordQuery.class);
+        }
+    }
+
+    @Data
+    @ApiModel("首页收入明细查询")
+    public static class IndexIncomeQuery implements QueryInfo {
+
+    	@ApiModelProperty("当前页")
+        private Integer page;
+
+        @ApiModelProperty("分页行数")
+        private Integer rows;
+
+        @ApiModelProperty("关键字匹配")
+		private String keyword;
+
+        @ApiModelProperty("支付时间")
+		private String startTime;
+
+        @ApiModelProperty("支付时间")
+		private String endTime;
+
+        @ApiModelProperty("订单类型")
+        private EOrderType orderType;
+
+        @ApiModelProperty("排序字段")
+        private String sortField = "payTime";
+
+        @ApiModelProperty("排序方式")
+        private String sortType = "DESC";
+
+        private Long tenantId;
+
+        public String getKeyword() {
+            return Optional.ofNullable(keyword).filter(StringUtils::isNotBlank).orElse(null);
+        }
+
+        public String jsonString() {
+            return JSON.toJSONString(this);
+        }
+
+        public static PaymentDivMemberRecordQuery from(String json) {
+            return JSON.parseObject(json, PaymentDivMemberRecordQuery.class);
+        }
+    }
+
+    @Data
+    @ApiModel("首页收入明细查询")
+    public static class IndexIncomeQueryDto{
+
+        @ApiModelProperty("姓名")
+        private String name;
+
+        @ApiModelProperty("头像")
+        private String avatar;
+
+        @ApiModelProperty("电话号码")
+        private String phone;
+
+        @ApiModelProperty("金额")
+        private BigDecimal amount;
+
+        @ApiModelProperty("支付时间")
+        private String payTime;
+
+        @ApiModelProperty("订单编号")
+        private String orderNo;
+
+        @ApiModelProperty("订单类型")
+        private EOrderType orderType;
+    }
+
+    @Data
+    @ApiModel("首页订单详情")
+    public static class OrderDetailDto extends IndexIncomeQueryDto{
+
+        @ApiModelProperty("商品类型")
+        private EGoodsType goodsType;
+
+        @ApiModelProperty("商品图片")
+        private String goodsUrl;
+
+        @ApiModelProperty("商品名称")
+        private String goodsName;
+
+        @ApiModelProperty("商品数量")
+        private Integer goodsNum;
+    }
+
+	@ApiModel(" PaymentDivMemberRecord-分账子账户记录表")
+    public static class PaymentDivMemberRecord {
+        
+        public String jsonString() {
+            return JSON.toJSONString(this);
+        }
+
+        public static PaymentDivMemberRecord from(String json) {
+            return JSON.parseObject(json, PaymentDivMemberRecord.class);
+        }
+	}
+
+}

+ 85 - 0
cooleshow-user/user-biz/src/main/resources/config/mybatis/PaymentDivMemberRecordMapper.xml

@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE  mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.yonge.cooleshow.biz.dal.mapper.PaymentDivMemberRecordMapper">
+
+    <!-- 表字段 -->
+    <sql id="baseColumns">
+         t.id_ AS id
+        , t.tenant_id_ AS tenantId
+        , t.app_id_ AS appId
+        , t.member_id_ AS memberId
+        , t.order_no_ AS orderNo
+        , t.trans_no_ AS transNo
+        , t.amount_ AS amount
+        , t.tenant_enter_flag_ AS tenantEnterFlag
+        , t.status_ AS status
+        , t.fee_flag_ AS feeFlag
+        , t.fee_amt_ AS feeAmt
+        , t.create_time_ AS createTime
+        , t.update_time_ AS updateTime
+        </sql> 
+    
+    <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.entity.PaymentDivMemberRecord">
+		SELECT         
+        	<include refid="baseColumns" />
+		FROM payment_div_member_record t
+	</select>
+    <select id="queryIncome"
+            resultType="com.yonge.cooleshow.biz.dal.wrapper.PaymentDivMemberRecordWrapper$IndexIncomeQueryDto">
+        select
+            pdmr.order_no_ as orderNo,
+            sut.name_ as name,
+            su.avatar_ as avatar,
+            su.phone_ as phone,
+            pdmr.amount_ as amount,
+            uo.pay_time_ as payTime,
+            uo.order_type_ as orderType
+        from
+            payment_div_member_record pdmr
+                left join
+            user_order uo ON uo.order_no_ = pdmr.order_no_
+                left join
+            sys_user_tsign sut ON sut.user_id_ = pdmr.user_id_
+                left join
+            sys_user su ON su.id_ = sut.user_id_
+        where
+            pdmr.status_ = 'SUCCESS' AND pdmr.tenant_id_ = #{param.tenantId}
+          <if test="param.startTime != null and param.startTime != ''">
+              AND uo.pay_time_ BETWEEN #{param.startTime} AND #{param.endTime}
+          </if>
+          <if test="param.orderType != null">
+              AND uo.order_type_ = #{param.orderType}
+          </if>
+          <if test="param.keyword != null and param.keyword != ''">
+              and sut.name_ LIKE CONCAT('%',#{param.keyword},'%')
+          </if>
+           ORDER BY ${param.sortField} ${param.sortType}
+    </select>
+    <select id="getOrderDetail"
+            resultType="com.yonge.cooleshow.biz.dal.wrapper.PaymentDivMemberRecordWrapper$OrderDetailDto">
+        select
+            pdmr.order_no_ as orderNo,
+            sut.name_ as name,
+            su.avatar_ as avatar,
+            su.phone_ as phone,
+            pdmr.amount_ as amount,
+            uo.pay_time_ as payTime,
+            uo.order_type_ as orderType,
+            uod.good_name_ as goodsName,
+            uod.good_num_ as goodsNum,
+            uod.good_type_ as goodsType,
+            uod.good_url_ as goodsUrl
+        from
+            payment_div_member_record pdmr
+                left join
+            user_order uo ON uo.order_no_ = pdmr.order_no_
+                left join
+            sys_user_tsign sut ON sut.user_id_ = pdmr.user_id_
+                left join
+            sys_user su ON su.id_ = sut.user_id_
+                left join
+            user_order_detail uod ON uod.order_id_ = uo.id_
+            WHERE pdmr.order_no_ = #{orderNo} AND pdmr.tenant_id_ = #{tenantId} LIMIT 1
+    </select>
+
+</mapper>

+ 28 - 0
cooleshow-user/user-tenant/src/main/java/com/yonge/cooleshow/tenant/controller/IndexController.java

@@ -1,14 +1,18 @@
 package com.yonge.cooleshow.tenant.controller;
 
+import com.microsvc.toolkit.common.response.paging.QueryInfo;
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.queryInfo.SysMusicCompareRecordQueryInfo;
+import com.yonge.cooleshow.biz.dal.service.PaymentDivMemberRecordService;
 import com.yonge.cooleshow.biz.dal.service.SysMusicCompareRecordService;
 import com.yonge.cooleshow.biz.dal.service.TenantPersonStatService;
+import com.yonge.cooleshow.biz.dal.wrapper.PaymentDivMemberRecordWrapper;
 import com.yonge.cooleshow.biz.dal.wrapper.TenantPersonStatWrapper;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.toolset.base.page.PageInfo;
+import com.yonge.toolset.mybatis.support.PageUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,6 +32,8 @@ public class IndexController extends BaseController {
     private SysMusicCompareRecordService sysMusicCompareRecordService;
     @Autowired
     private TenantPersonStatService tenantPersonStatService;
+    @Autowired
+    private PaymentDivMemberRecordService paymentDivMemberRecordService;
 
 
     @ApiOperation("学员训练数据统计列表")
@@ -70,4 +76,26 @@ public class IndexController extends BaseController {
         query.setTenantId(sysUser.getTenantId());
         return succeed(tenantPersonStatService.indexSum(query));
     }
+
+    @ApiOperation("收入明细列表")
+    @PostMapping("queryIncome")
+    public HttpResponseResult<PageInfo<PaymentDivMemberRecordWrapper.IndexIncomeQueryDto>>
+        queryIncome(@RequestBody PaymentDivMemberRecordWrapper.IndexIncomeQuery query){
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("获取用户信息失败");
+        }
+        query.setTenantId(sysUser.getTenantId());
+        return succeed(PageUtil.pageInfo(paymentDivMemberRecordService.queryIncome(QueryInfo.getPage(query), query)));
+    }
+
+    @ApiOperation("订单详情")
+    @PostMapping("getOrderDetail")
+    public HttpResponseResult<PaymentDivMemberRecordWrapper.OrderDetailDto>getOrderDetail(String orderNo){
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("获取用户信息失败");
+        }
+        return succeed(paymentDivMemberRecordService.getOrderDetail(orderNo,sysUser.getTenantId()));
+    }
 }

+ 76 - 0
cooleshow-user/user-tenant/src/main/java/com/yonge/cooleshow/tenant/controller/PaymentDivMemberRecordController.java

@@ -0,0 +1,76 @@
+package com.yonge.cooleshow.tenant.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.microsvc.toolkit.common.response.paging.PageInfo;
+import com.microsvc.toolkit.common.response.paging.QueryInfo;
+import com.microsvc.toolkit.common.response.template.R;
+import com.yonge.cooleshow.biz.dal.entity.PaymentDivMemberRecord;
+import com.yonge.cooleshow.biz.dal.service.PaymentDivMemberRecordService;
+import com.yonge.cooleshow.biz.dal.wrapper.PaymentDivMemberRecordWrapper;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+@Slf4j
+@Validated
+@RestController
+@RequestMapping("/paymentDivMemberRecord")
+@Api(tags = "分账子账户记录表")
+public class PaymentDivMemberRecordController {
+
+    @Autowired
+    private PaymentDivMemberRecordService paymentDivMemberRecordService;
+
+	@ApiOperation(value = "详情", notes = "分账子账户记录表-根据详情ID查询单条, 传入id")
+    @PreAuthorize("@auditsvc.hasPermissions('paymentDivMemberRecord/detail', {'BACKEND'})")
+    //@GetMapping("/detail/{id}")
+    public R<PaymentDivMemberRecord> detail(@PathVariable("id") Long id) {
+    
+    	PaymentDivMemberRecord wrapper = paymentDivMemberRecordService.detail(id);
+        
+        return R.from(wrapper);
+	}
+    
+    @ApiOperation(value = "查询分页", notes = "分账子账户记录表- 传入 PaymentDivMemberRecordWrapper.PaymentDivMemberRecordQuery") 
+    @PreAuthorize("@auditsvc.hasPermissions('paymentDivMemberRecord/page', {'BACKEND'})") 
+    @PostMapping("/page")
+    public R<PageInfo<PaymentDivMemberRecord>> page(@RequestBody PaymentDivMemberRecordWrapper.PaymentDivMemberRecordQuery query) {
+        
+        IPage<PaymentDivMemberRecord> pages = paymentDivMemberRecordService.selectPage(QueryInfo.getPage(query), query);
+        
+        return R.from(QueryInfo.pageInfo(pages));
+	}
+    
+    @ApiOperation(value = "新增", notes = "分账子账户记录表- 传入 PaymentDivMemberRecordWrapper.PaymentDivMemberRecord")
+    @PreAuthorize("@auditsvc.hasPermissions('paymentDivMemberRecord/save', {'BACKEND'})")
+	//@PostMapping("/save")
+	public R<JSONObject> add(@Validated @RequestBody PaymentDivMemberRecord paymentDivMemberRecord) {
+        
+        // 新增数据
+        paymentDivMemberRecordService.save(paymentDivMemberRecord);
+        
+        return R.defaultR();
+	}
+    
+    @ApiOperation(value = "修改", notes = "分账子账户记录表- 传入 PaymentDivMemberRecordWrapper.PaymentDivMemberRecord")
+    @PreAuthorize("@auditsvc.hasPermissions('paymentDivMemberRecord/update', {'BACKEND'})")
+	public R<JSONObject> update(@Validated @RequestBody PaymentDivMemberRecord paymentDivMemberRecord) {
+        
+        // 更新数据
+        paymentDivMemberRecordService.updateById(paymentDivMemberRecord);
+        
+        return R.defaultR();
+	}
+
+	@ApiOperation(value = "删除", notes = "分账子账户记录表- 传入id")
+    @PreAuthorize("@auditsvc.hasPermissions('paymentDivMemberRecord/remove', {'BACKEND'})")
+	public R<Boolean> remove(@RequestParam Long id) {
+    
+		return R.from(paymentDivMemberRecordService.removeById(id));
+	}
+}