新增分销表

jyy

2021-03-10 1a867fb330d3687756b52cac9d26ea077f763c89

新增分销表

 zq-erp/pom.xml

@@ -371,17 +371,15 @@
            <artifactId>mapstruct</artifactId>
            <version>1.3.0.Final</version>
        </dependency>

        <dependency>
            <groupId>com.baomidou</groupId>
            <artifactId>mybatis-plus-boot-starter</artifactId>
            <version>3.4.2</version>
        </dependency>
        <dependency>
            <groupId>cn.hutool</groupId>
            <artifactId>hutool-all</artifactId>
            <version>5.3.1</version>
        </dependency>

        <dependency>
            <groupId>com.baomidou</groupId>
            <artifactId>mybatis-plus-boot-starter</artifactId>
            <version>3.2.0</version>
        </dependency>
    </dependencies>
    <build>
@@ -400,7 +398,7 @@
                    <exclude>config/config.json</exclude>
                    <exclude>config/application.properties</exclude>
                    <exclude>config/system.properties</exclude>
-->
                    -->




 zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopRevenueFlowDao.java

New file
@@ -0,0 +1,13 @@
package com.matrix.system.fenxiao.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.matrix.system.fenxiao.entity.ShopRevenueFlow;

/**
 * @description 收益流水
 * @author jyy
 * @date 2021-03-10 15:22
 */
public interface ShopRevenueFlowDao extends BaseMapper<ShopRevenueFlow> {

}

 zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalemanSettlementDao.java

New file
@@ -0,0 +1,13 @@
package com.matrix.system.fenxiao.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.matrix.system.fenxiao.entity.ShopSalemanSettlement;

/**
 * @description 订单结算记录
 * @author jyy
 * @date 2021-03-10 15:22
 */
public interface ShopSalemanSettlementDao extends BaseMapper<ShopSalemanSettlement> {

}

 zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalesmanApplyDao.java

New file
@@ -0,0 +1,13 @@
package com.matrix.system.fenxiao.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.matrix.system.fenxiao.entity.ShopSalesmanApply;

/**
 * @description 推广员申请记录
 * @author jyy
 * @date 2021-03-10 15:22
 */
public interface ShopSalesmanApplyDao extends BaseMapper<ShopSalesmanApply> {

}

 zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalesmanGradeDao.java

New file
@@ -0,0 +1,13 @@
package com.matrix.system.fenxiao.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.matrix.system.fenxiao.entity.ShopSalesmanGrade;

/**
 * @description 推广员等级
 * @author jyy
 * @date 2021-03-10 15:22
 */
public interface ShopSalesmanGradeDao extends BaseMapper<ShopSalesmanGrade> {

}

 zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalesmanOrderDao.java

New file
@@ -0,0 +1,13 @@
package com.matrix.system.fenxiao.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.matrix.system.fenxiao.entity.ShopSalesmanOrder;

/**
 * @description 分销订单
 * @author jyy
 * @date 2021-03-10 15:22
 */
public interface ShopSalesmanOrderDao extends BaseMapper<ShopSalesmanOrder> {

}

 zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopRevenueFlow.java

New file
@@ -0,0 +1,61 @@
package com.matrix.system.fenxiao.entity;

import com.baomidou.mybatisplus.annotation.TableName;
import com.matrix.core.anotations.Extend;
import com.matrix.system.score.entity.BaseEntity;
import lombok.Data;

/**
 * @description 收益流水
 * @author jyy
 * @date 2021-03-10 15:22
 */
@Data
@TableName("shop_revenue_flow")
public class ShopRevenueFlow  extends BaseEntity {
    @Extend
    private static final long serialVersionUID = 1L; 

	


	
    /**
     * 用户id
     */


    private Long  userId;
	
    /**
     * 收益说明
     */


    private String  revenueContent;
	
    /**
     * 收益金额
     */


    private Double  amount;
	
    /**
     * 原始订单ID
     */


    private Long  businessId;
	
    /**
     * 公司ID
     */


    private Long  companyId;



  
}

 zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalemanSettlement.java

New file
@@ -0,0 +1,82 @@
package com.matrix.system.fenxiao.entity;

import com.baomidou.mybatisplus.annotation.TableName;
import com.matrix.core.anotations.Extend;
import com.matrix.system.score.entity.BaseEntity;
import lombok.Data;

/**
 * @description 订单结算记录
 * @author jyy
 * @date 2021-03-10 15:22
 */
@Data
@TableName("shop_saleman_settlement")
public class ShopSalemanSettlement  extends BaseEntity {
    @Extend
    private static final long serialVersionUID = 1L; 

	


	
    /**
     * 结算编号
     */


    private String  orderNo;
	
    /**
     * 结算方式1，线下结算，2余额结算
     */


    private Integer  settlementWay;
	
    /**
     * 结算人数
     */


    private Integer  manCount;
	
    /**
     * 结算单数
     */


    private Integer  orderCount;
	
    /**
     * 结算金额
     */


    private Double  amount;
	
    /**
     * 结算人
     */


    private Integer  userId;
	
    /**
     * 备注
     */


    private String  remark;
	
    /**
     * 公司ID
     */


    private Long  companyId;



  
}

 zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanApply.java

New file
@@ -0,0 +1,68 @@
package com.matrix.system.fenxiao.entity;

import com.baomidou.mybatisplus.annotation.TableName;
import com.matrix.core.anotations.Extend;
import com.matrix.system.score.entity.BaseEntity;
import lombok.Data;

/**
 * @description 推广员申请记录
 * @author jyy
 * @date 2021-03-10 15:22
 */
@Data
@TableName("shop_salesman_apply")
public class ShopSalesmanApply  extends BaseEntity {
    @Extend
    private static final long serialVersionUID = 1L; 

	


	
    /**
     * 申请方式1、自主申请，2、自动添加，3上级邀请，4、手动添加
     */


    private Integer  applyWay;
	
    /**
     * 申请用户id
     */


    private Long  userId;
	
    /**
     * 邀请用户ID
     */


    private Long  parentUserId;
	
    /**
     * 申请状态1、待审核，2通过，3未通过
     */


    private Integer  applyStatus;
	
    /**
     * 备注
     */


    private String  remark;
	
    /**
     * 公司ID
     */


    private Long  companyId;



  
}

 zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanGrade.java

New file
@@ -0,0 +1,68 @@
package com.matrix.system.fenxiao.entity;

import com.baomidou.mybatisplus.annotation.TableName;
import com.matrix.core.anotations.Extend;
import com.matrix.system.score.entity.BaseEntity;
import lombok.Data;

/**
 * @description 推广员等级
 * @author jyy
 * @date 2021-03-10 15:22
 */
@Data
@TableName("shop_salesman_grade")
public class ShopSalesmanGrade  extends BaseEntity {
    @Extend
    private static final long serialVersionUID = 1L; 

	


	
    /**
     * 等级名称
     */


    private String  name;
	
    /**
     * 推广提成%
     */


    private Double  sealesCommission;
	
    /**
     * 邀请提成 %
     */


    private Double  invitationCommission;
	
    /**
     * 等级条件（推广金额额）
     */


    private Double  condition;
	
    /**
     * 默认等级1是，2不是
     */


    private Integer  isDefault;
	
    /**
     * 公司ID
     */


    private Long  companyId;



  
}

 zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanOrder.java

New file
@@ -0,0 +1,82 @@
package com.matrix.system.fenxiao.entity;

import com.baomidou.mybatisplus.annotation.TableName;
import com.matrix.core.anotations.Extend;
import com.matrix.system.score.entity.BaseEntity;
import lombok.Data;

/**
 * @description 分销订单
 * @author jyy
 * @date 2021-03-10 15:22
 */
@Data
@TableName("shop_salesman_order")
public class ShopSalesmanOrder  extends BaseEntity {
    @Extend
    private static final long serialVersionUID = 1L; 

	


	
    /**
     * 订单id
     */


    private Long  orderId ;
	
    /**
     * 用户id
     */


    private Long  userId;
	
    /**
     * 收益人id
     */


    private Long  salesUserId;
	
    /**
     * 收益类型1，推广收益，2邀请收益
     */


    private Integer  revenueType;
	
    /**
     * 收益金额
     */


    private Double  amount;
	
    /**
     * 结算状态
     */


    private Integer  orderStatus;
	
    /**
     * 结算单ID
     */


    private Long  settlementId;
	
    /**
     * 公司ID
     */


    private Long  companyId;



  
}

 zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopRevenueFlowService.java

New file
@@ -0,0 +1,20 @@
package com.matrix.system.fenxiao.service;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.matrix.system.fenxiao.dao.ShopRevenueFlowDao;
import com.matrix.system.fenxiao.entity.ShopRevenueFlow;
import org.springframework.stereotype.Service;

/**
 * @description 收益流水
 * @author jyy
 * @date 2021-03-10 15:22
 */
@Service
public class ShopRevenueFlowService  extends ServiceImpl<ShopRevenueFlowDao, ShopRevenueFlow>{




  
}

 zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalemanSettlementService.java

New file
@@ -0,0 +1,20 @@
package com.matrix.system.fenxiao.service;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.matrix.system.fenxiao.dao.ShopSalemanSettlementDao;
import com.matrix.system.fenxiao.entity.ShopSalemanSettlement;
import org.springframework.stereotype.Service;

/**
 * @description 订单结算记录
 * @author jyy
 * @date 2021-03-10 15:22
 */
@Service
public class ShopSalemanSettlementService  extends ServiceImpl<ShopSalemanSettlementDao, ShopSalemanSettlement>{




  
}

 zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanApplyService.java

New file
@@ -0,0 +1,20 @@
package com.matrix.system.fenxiao.service;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.matrix.system.fenxiao.dao.ShopSalesmanApplyDao;
import com.matrix.system.fenxiao.entity.ShopSalesmanApply;
import org.springframework.stereotype.Service;

/**
 * @description 推广员申请记录
 * @author jyy
 * @date 2021-03-10 15:22
 */
@Service
public class ShopSalesmanApplyService  extends ServiceImpl<ShopSalesmanApplyDao, ShopSalesmanApply>{




  
}

 zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanGradeService.java

New file
@@ -0,0 +1,20 @@
package com.matrix.system.fenxiao.service;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.matrix.system.fenxiao.dao.ShopSalesmanGradeDao;
import com.matrix.system.fenxiao.entity.ShopSalesmanGrade;
import org.springframework.stereotype.Service;

/**
 * @description 推广员等级
 * @author jyy
 * @date 2021-03-10 15:22
 */
@Service
public class ShopSalesmanGradeService  extends ServiceImpl<ShopSalesmanGradeDao, ShopSalesmanGrade>{




  
}

 zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanOrderService.java

New file
@@ -0,0 +1,20 @@
package com.matrix.system.fenxiao.service;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.matrix.system.fenxiao.dao.ShopSalesmanOrderDao;
import com.matrix.system.fenxiao.entity.ShopSalesmanOrder;
import org.springframework.stereotype.Service;

/**
 * @description 分销订单
 * @author jyy
 * @date 2021-03-10 15:22
 */
@Service
public class ShopSalesmanOrderService  extends ServiceImpl<ShopSalesmanOrderDao, ShopSalesmanOrder>{




  
}

 zq-erp/src/main/java/com/matrix/system/score/action/ScoreGoodsAction.java

@@ -7,7 +7,7 @@

/**
 * @description 商品表
 * @author yourName
 * @author jyy
 * @date 2021-02-26 15:26
 */
@RestController

 zq-erp/src/main/java/com/matrix/system/score/action/ScoreGoodsCategoryAction.java

@@ -7,7 +7,7 @@

/**
 * @description 商品分类表
 * @author yourName
 * @author jyy
 * @date 2021-02-26 15:26
 */
@RestController

 zq-erp/src/main/java/com/matrix/system/score/action/ScoreGoodsImageAction.java

@@ -7,7 +7,7 @@

/**
 * @description 商品图片表
 * @author yourName
 * @author jyy
 * @date 2021-02-26 15:26
 */
@RestController

 zq-erp/src/main/java/com/matrix/system/score/action/ScoreGoodsNavigationAction.java

@@ -7,7 +7,7 @@

/**
 * @description 商品栏目表
 * @author yourName
 * @author jyy
 * @date 2021-02-26 15:26
 */
@RestController

 zq-erp/src/main/java/com/matrix/system/score/action/ScoreGoodsSkuAction.java

@@ -7,7 +7,7 @@

/**
 * @description 商品规格表
 * @author yourName
 * @author jyy
 * @date 2021-02-26 15:26
 */
@RestController

 zq-erp/src/main/java/com/matrix/system/score/action/ScoreOrderAction.java

@@ -7,7 +7,7 @@

/**
 * @description 订单表
 * @author yourName
 * @author jyy
 * @date 2021-02-26 15:26
 */
@RestController

 zq-erp/src/main/java/com/matrix/system/score/action/ScoreOrderItemAction.java

@@ -7,7 +7,7 @@

/**
 * @description 订单详情表
 * @author yourName
 * @author jyy
 * @date 2021-02-26 15:26
 */
@RestController

 zq-erp/src/main/java/com/matrix/system/score/action/ScoreShoppingCarAction.java

@@ -7,7 +7,7 @@

/**
 * @description 购物车
 * @author yourName
 * @author jyy
 * @date 2021-02-26 15:26
 */
@RestController

 zq-erp/src/main/java/com/matrix/system/score/action/ScoreUseRecordAction.java

@@ -7,7 +7,7 @@

/**
 * @description 积分记录表
 * @author yourName
 * @author jyy
 * @date 2021-02-26 15:26
 */
@RestController

 zq-erp/src/main/java/com/matrix/system/score/action/ScoreVipDetailAction.java

@@ -7,7 +7,7 @@

/**
 * @description 客户积分余额
 * @author yourName
 * @author jyy
 * @date 2021-02-26 15:26
 */
@RestController

 zq-erp/src/main/java/com/matrix/system/score/dao/ScoreGoodsCategoryDao.java

@@ -5,7 +5,7 @@

/**
 * @description 商品分类表
 * @author yourName
 * @author jyy
 * @date 2021-02-26 15:26
 */
public interface ScoreGoodsCategoryDao extends BaseMapper<ScoreGoodsCategory> {

 zq-erp/src/main/java/com/matrix/system/score/dao/ScoreGoodsDao.java

@@ -9,7 +9,7 @@

/**
 * @description 商品表
 * @author yourName
 * @author jyy
 * @date 2021-02-26 15:26
 */
public interface ScoreGoodsDao extends BaseMapper<ScoreGoods> {

 zq-erp/src/main/java/com/matrix/system/score/dao/ScoreGoodsImageDao.java

@@ -9,7 +9,7 @@

/**
 * @description 商品图片表
 * @author yourName
 * @author jyy
 * @date 2021-02-26 15:26
 */
public interface ScoreGoodsImageDao extends BaseMapper<ScoreGoodsImage> {

 zq-erp/src/main/java/com/matrix/system/score/dao/ScoreGoodsNavigationDao.java

@@ -9,7 +9,7 @@

/**
 * @description 商品栏目表
 * @author yourName
 * @author jyy
 * @date 2021-02-26 15:26
 */
public interface ScoreGoodsNavigationDao extends BaseMapper<ScoreGoodsNavigation> {

 zq-erp/src/main/java/com/matrix/system/score/dao/ScoreGoodsSkuDao.java

@@ -9,7 +9,7 @@

/**
 * @description 商品规格表
 * @author yourName
 * @author jyy
 * @date 2021-02-26 15:26
 */
public interface ScoreGoodsSkuDao extends BaseMapper<ScoreGoodsSku> {

 zq-erp/src/main/java/com/matrix/system/score/dao/ScoreOrderDao.java

@@ -9,7 +9,7 @@

/**
 * @description 订单表
 * @author yourName
 * @author jyy
 * @date 2021-02-26 15:26
 */
public interface ScoreOrderDao extends BaseMapper<ScoreOrder> {

 zq-erp/src/main/java/com/matrix/system/score/dao/ScoreOrderItemDao.java

@@ -9,7 +9,7 @@

/**
 * @description 订单详情表
 * @author yourName
 * @author jyy
 * @date 2021-02-26 15:26
 */
public interface ScoreOrderItemDao extends BaseMapper<ScoreOrderItem> {

 zq-erp/src/main/java/com/matrix/system/score/dao/ScoreShoppingCarDao.java

@@ -9,7 +9,7 @@

/**
 * @description 购物车
 * @author yourName
 * @author jyy
 * @date 2021-02-26 15:26
 */
public interface ScoreShoppingCarDao extends BaseMapper<ScoreShoppingCar> {

 zq-erp/src/main/java/com/matrix/system/score/dao/ScoreUseRecordDao.java

@@ -9,7 +9,7 @@

/**
 * @description 积分记录表
 * @author yourName
 * @author jyy
 * @date 2021-02-26 15:26
 */
public interface ScoreUseRecordDao extends BaseMapper<ScoreUseRecord> {

 zq-erp/src/main/java/com/matrix/system/score/dao/ScoreVipDetailDao.java

@@ -9,7 +9,7 @@

/**
 * @description 客户积分余额
 * @author yourName
 * @author jyy
 * @date 2021-02-26 15:26
 */
public interface ScoreVipDetailDao extends BaseMapper<ScoreVipDetail> {

 zq-erp/src/main/java/com/matrix/system/score/entity/ScoreGoods.java

@@ -7,7 +7,7 @@

/**
 * @description 商品表
 * @author yourName
 * @author jyy
 * @date 2021-02-26 15:26
 */
@Data

 zq-erp/src/main/java/com/matrix/system/score/entity/ScoreGoodsCategory.java

@@ -7,7 +7,7 @@

/**
 * @description 商品分类表
 * @author yourName
 * @author jyy
 * @date 2021-02-26 15:26
 */
@Data

 zq-erp/src/main/java/com/matrix/system/score/entity/ScoreGoodsImage.java

@@ -7,7 +7,7 @@

/**
 * @description 商品图片表
 * @author yourName
 * @author jyy
 * @date 2021-02-26 15:26
 */
@Data

 zq-erp/src/main/java/com/matrix/system/score/entity/ScoreGoodsNavigation.java

@@ -7,7 +7,7 @@

/**
 * @description 商品栏目表
 * @author yourName
 * @author jyy
 * @date 2021-02-26 15:26
 */
@Data

 zq-erp/src/main/java/com/matrix/system/score/entity/ScoreGoodsSku.java

@@ -7,7 +7,7 @@

/**
 * @description 商品规格表
 * @author yourName
 * @author jyy
 * @date 2021-02-26 15:26
 */
@Data

 zq-erp/src/main/java/com/matrix/system/score/entity/ScoreOrder.java

@@ -9,7 +9,7 @@

/**
 * @description 订单表
 * @author yourName
 * @author jyy
 * @date 2021-02-26 15:26
 */
@Data

 zq-erp/src/main/java/com/matrix/system/score/entity/ScoreOrderItem.java

@@ -7,7 +7,7 @@

/**
 * @description 订单详情表
 * @author yourName
 * @author jyy
 * @date 2021-02-26 15:26
 */
@Data

 zq-erp/src/main/java/com/matrix/system/score/entity/ScoreShoppingCar.java

@@ -7,7 +7,7 @@

/**
 * @description 购物车
 * @author yourName
 * @author jyy
 * @date 2021-02-26 15:26
 */
@Data

 zq-erp/src/main/java/com/matrix/system/score/entity/ScoreUseRecord.java

@@ -7,7 +7,7 @@

/**
 * @description 积分记录表
 * @author yourName
 * @author jyy
 * @date 2021-02-26 15:26
 */
@Data

 zq-erp/src/main/java/com/matrix/system/score/entity/ScoreVipDetail.java

@@ -9,7 +9,7 @@

/**
 * @description 客户积分余额
 * @author yourName
 * @author jyy
 * @date 2021-02-26 15:26
 */
@Data

 zq-erp/src/main/java/com/matrix/system/score/service/ScoreGoodsCategoryService.java

@@ -7,7 +7,7 @@

/**
 * @description 商品分类表
 * @author yourName
 * @author jyy
 * @date 2021-02-26 15:26
 */
@Service

 zq-erp/src/main/java/com/matrix/system/score/service/ScoreGoodsImageService.java

@@ -7,7 +7,7 @@

/**
 * @description 商品图片表
 * @author yourName
 * @author jyy
 * @date 2021-02-26 15:26
 */
@Service

 zq-erp/src/main/java/com/matrix/system/score/service/ScoreGoodsNavigationService.java

@@ -7,7 +7,7 @@

/**
 * @description 商品栏目表
 * @author yourName
 * @author jyy
 * @date 2021-02-26 15:26
 */
@Service

 zq-erp/src/main/java/com/matrix/system/score/service/ScoreGoodsService.java

@@ -7,7 +7,7 @@

/**
 * @description 商品表
 * @author yourName
 * @author jyy
 * @date 2021-02-26 15:26
 */
@Service

 zq-erp/src/main/java/com/matrix/system/score/service/ScoreGoodsSkuService.java

@@ -7,7 +7,7 @@

/**
 * @description 商品规格表
 * @author yourName
 * @author jyy
 * @date 2021-02-26 15:26
 */
@Service

 zq-erp/src/main/java/com/matrix/system/score/service/ScoreOrderItemService.java

@@ -7,7 +7,7 @@

/**
 * @description 订单详情表
 * @author yourName
 * @author jyy
 * @date 2021-02-26 15:26
 */
@Service

 zq-erp/src/main/java/com/matrix/system/score/service/ScoreOrderService.java

@@ -7,7 +7,7 @@

/**
 * @description 订单表
 * @author yourName
 * @author jyy
 * @date 2021-02-26 15:26
 */
@Service

 zq-erp/src/main/java/com/matrix/system/score/service/ScoreShoppingCarService.java

@@ -7,7 +7,7 @@

/**
 * @description 购物车
 * @author yourName
 * @author jyy
 * @date 2021-02-26 15:26
 */
@Service

 zq-erp/src/main/java/com/matrix/system/score/service/ScoreUseRecordService.java

@@ -7,7 +7,7 @@

/**
 * @description 积分记录表
 * @author yourName
 * @author jyy
 * @date 2021-02-26 15:26
 */
@Service

 zq-erp/src/main/java/com/matrix/system/score/service/ScoreVipDetailService.java

@@ -7,7 +7,7 @@

/**
 * @description 客户积分余额
 * @author yourName
 * @author jyy
 * @date 2021-02-26 15:26
 */
@Service

 zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopPageAction.java

@@ -28,7 +28,7 @@

/**
 * @description 小程序页面
 * @author yourName
 * @author jyy
 * @date 2020-04-03 14:56
 */
@Controller

 zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopDeliveryDetail.java

@@ -5,7 +5,7 @@

/**
 * @description 发货明细
 * @author yourName
 * @author jyy
 * @date 2019-10-21 15:02
 */
public class ShopDeliveryDetail  extends EntityDTO{

 zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopPage.java

@@ -6,7 +6,7 @@

/**
 * @description 小程序页面
 * @author yourName
 * @author jyy
 * @date 2020-04-03 14:56
 */
public class ShopPage  extends EntityDTO{

 zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopDeliveryDetailDao.java

@@ -8,7 +8,7 @@

/**
 * @description 发货明细
 * @author yourName
 * @author jyy
 * @date 2019-10-21 15:02
 */
public interface ShopDeliveryDetailDao{

 zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopPageDao.java

@@ -8,7 +8,7 @@

/**
 * @description 小程序页面
 * @author yourName
 * @author jyy
 * @date 2020-04-03 14:56
 */
public interface ShopPageDao{

 zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopQrcordVisitorDao.java

@@ -8,7 +8,7 @@

/**
 * @description 二维码访问记录
 * @author yourName
 * @author jyy
 * @date 2019-09-18 09:42
 */
public interface ShopQrcordVisitorDao{

 zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopShareQrcordDao.java

@@ -9,7 +9,7 @@

/**
 * @description 分享二维码
 * @author yourName
 * @author jyy
 * @date 2019-09-18 09:42
 */
public interface ShopShareQrcordDao{

 zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopRevenueFlowDao.xml

New file
@@ -0,0 +1,35 @@
<?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.matrix.system.fenxiao.dao.ShopRevenueFlowDao">
    <!-- 定义ShopRevenueFlow 的复杂关联map -->
    <resultMap type="com.matrix.system.fenxiao.entity.ShopRevenueFlow" id="ShopRevenueFlowMap">
        <id property="id" column="id" />
        <result property="createBy" column="create_by" />
        <result property="createTime" column="create_time" />
        <result property="updateBy" column="update_by" />
        <result property="updateTime" column="update_time" />
            <result property="userId" column="user_id" />
            <result property="revenueContent" column="revenue_content" />
            <result property="amount" column="amount" />
            <result property="businessId" column="business_id" />
            <result property="companyId" column="company_id" />
    </resultMap>
	
	
    <!-- 定义ShopRevenueFlow 的简单map  ，本map不添加其他的关联属性 -->
    <resultMap type="com.matrix.system.fenxiao.entity.ShopRevenueFlow" id="ShopRevenueFlowSimpleMap">
        <id property="id" column="id" />
        <result property="createBy" column="create_by" />
        <result property="createTime" column="create_time" />
        <result property="updateBy" column="update_by" />
        <result property="updateTime" column="update_time" />
            <result property="userId" column="user_id" />
            <result property="revenueContent" column="revenue_content" />
            <result property="amount" column="amount" />
            <result property="businessId" column="business_id" />
            <result property="companyId" column="company_id" />
    </resultMap>

</mapper>

 zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalemanSettlementDao.xml

New file
@@ -0,0 +1,41 @@
<?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.matrix.system.fenxiao.dao.ShopSalemanSettlementDao">
    <!-- 定义ShopSalemanSettlement 的复杂关联map -->
    <resultMap type="com.matrix.system.fenxiao.entity.ShopSalemanSettlement" id="ShopSalemanSettlementMap">
        <id property="id" column="id" />
        <result property="createBy" column="create_by" />
        <result property="createTime" column="create_time" />
        <result property="updateBy" column="update_by" />
        <result property="updateTime" column="update_time" />
            <result property="orderNo" column="order_no" />
            <result property="settlementWay" column="settlement_way" />
            <result property="manCount" column="man_count" />
            <result property="orderCount" column="order_count" />
            <result property="amount" column="amount" />
            <result property="userId" column="user_id" />
            <result property="remark" column="remark" />
            <result property="companyId" column="company_id" />
    </resultMap>
	
	
    <!-- 定义ShopSalemanSettlement 的简单map  ，本map不添加其他的关联属性 -->
    <resultMap type="com.matrix.system.fenxiao.entity.ShopSalemanSettlement" id="ShopSalemanSettlementSimpleMap">
        <id property="id" column="id" />
        <result property="createBy" column="create_by" />
        <result property="createTime" column="create_time" />
        <result property="updateBy" column="update_by" />
        <result property="updateTime" column="update_time" />
            <result property="orderNo" column="order_no" />
            <result property="settlementWay" column="settlement_way" />
            <result property="manCount" column="man_count" />
            <result property="orderCount" column="order_count" />
            <result property="amount" column="amount" />
            <result property="userId" column="user_id" />
            <result property="remark" column="remark" />
            <result property="companyId" column="company_id" />
    </resultMap>

</mapper>

 zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml

New file
@@ -0,0 +1,37 @@
<?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.matrix.system.fenxiao.dao.ShopSalesmanApplyDao">
    <!-- 定义ShopSalesmanApply 的复杂关联map -->
    <resultMap type="com.matrix.system.fenxiao.entity.ShopSalesmanApply" id="ShopSalesmanApplyMap">
        <id property="id" column="id" />
        <result property="createBy" column="create_by" />
        <result property="createTime" column="create_time" />
        <result property="updateBy" column="update_by" />
        <result property="updateTime" column="update_time" />
            <result property="applyWay" column="apply_way" />
            <result property="userId" column="user_id" />
            <result property="parentUserId" column="parent_user_id" />
            <result property="applyStatus" column="apply_status" />
            <result property="remark" column="remark" />
            <result property="companyId" column="company_id" />
    </resultMap>
	
	
    <!-- 定义ShopSalesmanApply 的简单map  ，本map不添加其他的关联属性 -->
    <resultMap type="com.matrix.system.fenxiao.entity.ShopSalesmanApply" id="ShopSalesmanApplySimpleMap">
        <id property="id" column="id" />
        <result property="createBy" column="create_by" />
        <result property="createTime" column="create_time" />
        <result property="updateBy" column="update_by" />
        <result property="updateTime" column="update_time" />
            <result property="applyWay" column="apply_way" />
            <result property="userId" column="user_id" />
            <result property="parentUserId" column="parent_user_id" />
            <result property="applyStatus" column="apply_status" />
            <result property="remark" column="remark" />
            <result property="companyId" column="company_id" />
    </resultMap>

</mapper>

 zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanGradeDao.xml

New file
@@ -0,0 +1,37 @@
<?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.matrix.system.fenxiao.dao.ShopSalesmanGradeDao">
    <!-- 定义ShopSalesmanGrade 的复杂关联map -->
    <resultMap type="com.matrix.system.fenxiao.entity.ShopSalesmanGrade" id="ShopSalesmanGradeMap">
        <id property="id" column="id" />
        <result property="createBy" column="create_by" />
        <result property="createTime" column="create_time" />
        <result property="updateBy" column="update_by" />
        <result property="updateTime" column="update_time" />
            <result property="name" column="name" />
            <result property="sealesCommission" column="seales_commission" />
            <result property="invitationCommission" column="invitation_commission" />
            <result property="condition" column="condition" />
            <result property="isDefault" column="is_default" />
            <result property="companyId" column="company_id" />
    </resultMap>
	
	
    <!-- 定义ShopSalesmanGrade 的简单map  ，本map不添加其他的关联属性 -->
    <resultMap type="com.matrix.system.fenxiao.entity.ShopSalesmanGrade" id="ShopSalesmanGradeSimpleMap">
        <id property="id" column="id" />
        <result property="createBy" column="create_by" />
        <result property="createTime" column="create_time" />
        <result property="updateBy" column="update_by" />
        <result property="updateTime" column="update_time" />
            <result property="name" column="name" />
            <result property="sealesCommission" column="seales_commission" />
            <result property="invitationCommission" column="invitation_commission" />
            <result property="condition" column="condition" />
            <result property="isDefault" column="is_default" />
            <result property="companyId" column="company_id" />
    </resultMap>

</mapper>

 zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanOrderDao.xml

New file
@@ -0,0 +1,41 @@
<?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.matrix.system.fenxiao.dao.ShopSalesmanOrderDao">
    <!-- 定义ShopSalesmanOrder 的复杂关联map -->
    <resultMap type="com.matrix.system.fenxiao.entity.ShopSalesmanOrder" id="ShopSalesmanOrderMap">
        <id property="id" column="id" />
        <result property="createBy" column="create_by" />
        <result property="createTime" column="create_time" />
        <result property="updateBy" column="update_by" />
        <result property="updateTime" column="update_time" />
            <result property="orderId " column="order_id " />
            <result property="userId" column="user_id" />
            <result property="salesUserId" column="sales_user_id" />
            <result property="revenueType" column="revenue_type" />
            <result property="amount" column="amount" />
            <result property="orderStatus" column="order_status" />
            <result property="settlementId" column="settlement_id" />
            <result property="companyId" column="company_id" />
    </resultMap>
	
	
    <!-- 定义ShopSalesmanOrder 的简单map  ，本map不添加其他的关联属性 -->
    <resultMap type="com.matrix.system.fenxiao.entity.ShopSalesmanOrder" id="ShopSalesmanOrderSimpleMap">
        <id property="id" column="id" />
        <result property="createBy" column="create_by" />
        <result property="createTime" column="create_time" />
        <result property="updateBy" column="update_by" />
        <result property="updateTime" column="update_time" />
            <result property="orderId " column="order_id " />
            <result property="userId" column="user_id" />
            <result property="salesUserId" column="sales_user_id" />
            <result property="revenueType" column="revenue_type" />
            <result property="amount" column="amount" />
            <result property="orderStatus" column="order_status" />
            <result property="settlementId" column="settlement_id" />
            <result property="companyId" column="company_id" />
    </resultMap>

</mapper>