From 1a867fb330d3687756b52cac9d26ea077f763c89 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Wed, 10 Mar 2021 15:29:22 +0800
Subject: [PATCH] 新增分销表
---
zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopRevenueFlowDao.java | 13
zq-erp/src/main/java/com/matrix/system/score/service/ScoreGoodsService.java | 2
zq-erp/pom.xml | 14
zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanOrderDao.xml | 41 ++
zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalemanSettlementDao.java | 13
zq-erp/src/main/java/com/matrix/system/score/dao/ScoreGoodsCategoryDao.java | 2
zq-erp/src/main/java/com/matrix/system/score/service/ScoreShoppingCarService.java | 2
zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanGradeDao.xml | 37 ++
zq-erp/src/main/java/com/matrix/system/score/entity/ScoreOrderItem.java | 2
zq-erp/src/main/java/com/matrix/system/score/service/ScoreGoodsImageService.java | 2
zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanApplyService.java | 20 +
zq-erp/src/main/java/com/matrix/system/score/service/ScoreOrderService.java | 2
zq-erp/src/main/java/com/matrix/system/score/entity/ScoreGoodsNavigation.java | 2
zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalesmanApplyDao.java | 13
zq-erp/src/main/java/com/matrix/system/score/action/ScoreShoppingCarAction.java | 2
zq-erp/src/main/java/com/matrix/system/score/service/ScoreOrderItemService.java | 2
zq-erp/src/main/java/com/matrix/system/score/entity/ScoreUseRecord.java | 2
zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalesmanOrderDao.java | 13
zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalesmanGradeDao.java | 13
zq-erp/src/main/java/com/matrix/system/score/entity/ScoreVipDetail.java | 2
zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalemanSettlementDao.xml | 41 ++
zq-erp/src/main/java/com/matrix/system/score/action/ScoreGoodsAction.java | 2
zq-erp/src/main/java/com/matrix/system/score/action/ScoreGoodsSkuAction.java | 2
zq-erp/src/main/java/com/matrix/system/score/action/ScoreVipDetailAction.java | 2
zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopPageAction.java | 2
zq-erp/src/main/java/com/matrix/system/score/action/ScoreUseRecordAction.java | 2
zq-erp/src/main/java/com/matrix/system/score/action/ScoreGoodsCategoryAction.java | 2
zq-erp/src/main/java/com/matrix/system/score/action/ScoreOrderAction.java | 2
zq-erp/src/main/java/com/matrix/system/score/entity/ScoreGoodsCategory.java | 2
zq-erp/src/main/java/com/matrix/system/score/dao/ScoreOrderItemDao.java | 2
zq-erp/src/main/java/com/matrix/system/score/entity/ScoreGoodsImage.java | 2
zq-erp/src/main/java/com/matrix/system/score/dao/ScoreVipDetailDao.java | 2
zq-erp/src/main/java/com/matrix/system/score/dao/ScoreGoodsDao.java | 2
zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanGradeService.java | 20 +
zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanOrder.java | 82 +++++
zq-erp/src/main/java/com/matrix/system/score/dao/ScoreGoodsSkuDao.java | 2
zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalemanSettlementService.java | 20 +
zq-erp/src/main/java/com/matrix/system/score/dao/ScoreGoodsImageDao.java | 2
zq-erp/src/main/java/com/matrix/system/score/entity/ScoreOrder.java | 2
zq-erp/src/main/java/com/matrix/system/score/service/ScoreVipDetailService.java | 2
zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopPageDao.java | 2
zq-erp/src/main/java/com/matrix/system/score/dao/ScoreOrderDao.java | 2
zq-erp/src/main/java/com/matrix/system/score/entity/ScoreShoppingCar.java | 2
zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopRevenueFlow.java | 61 ++++
zq-erp/src/main/java/com/matrix/system/score/dao/ScoreShoppingCarDao.java | 2
zq-erp/src/main/java/com/matrix/system/score/service/ScoreGoodsCategoryService.java | 2
zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanGrade.java | 68 ++++
zq-erp/src/main/java/com/matrix/system/score/action/ScoreGoodsNavigationAction.java | 2
zq-erp/src/main/java/com/matrix/system/score/entity/ScoreGoods.java | 2
zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanApply.java | 68 ++++
zq-erp/src/main/java/com/matrix/system/score/action/ScoreGoodsImageAction.java | 2
zq-erp/src/main/java/com/matrix/system/score/dao/ScoreGoodsNavigationDao.java | 2
zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopShareQrcordDao.java | 2
zq-erp/src/main/java/com/matrix/system/score/service/ScoreGoodsSkuService.java | 2
zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopRevenueFlowService.java | 20 +
zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalemanSettlement.java | 82 +++++
zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopQrcordVisitorDao.java | 2
zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopPage.java | 2
zq-erp/src/main/java/com/matrix/system/score/service/ScoreGoodsNavigationService.java | 2
zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanOrderService.java | 20 +
zq-erp/src/main/java/com/matrix/system/score/action/ScoreOrderItemAction.java | 2
zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopRevenueFlowDao.xml | 35 ++
zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopDeliveryDetailDao.java | 2
zq-erp/src/main/java/com/matrix/system/score/entity/ScoreGoodsSku.java | 2
zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopDeliveryDetail.java | 2
zq-erp/src/main/java/com/matrix/system/score/service/ScoreUseRecordService.java | 2
zq-erp/src/main/java/com/matrix/system/score/dao/ScoreUseRecordDao.java | 2
zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml | 37 ++
68 files changed, 770 insertions(+), 55 deletions(-)
diff --git a/zq-erp/pom.xml b/zq-erp/pom.xml
index 0646994..62b1268 100644
--- a/zq-erp/pom.xml
+++ b/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>
--->
+ -->
diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopRevenueFlowDao.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopRevenueFlowDao.java
new file mode 100644
index 0000000..b01b42f
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopRevenueFlowDao.java
@@ -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> {
+
+}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalemanSettlementDao.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalemanSettlementDao.java
new file mode 100644
index 0000000..d032047
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalemanSettlementDao.java
@@ -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> {
+
+}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalesmanApplyDao.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalesmanApplyDao.java
new file mode 100644
index 0000000..1e6c074
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalesmanApplyDao.java
@@ -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> {
+
+}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalesmanGradeDao.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalesmanGradeDao.java
new file mode 100644
index 0000000..52a7bb6
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalesmanGradeDao.java
@@ -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> {
+
+}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalesmanOrderDao.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalesmanOrderDao.java
new file mode 100644
index 0000000..f7c8818
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalesmanOrderDao.java
@@ -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> {
+
+}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopRevenueFlow.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopRevenueFlow.java
new file mode 100644
index 0000000..4c16a54
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopRevenueFlow.java
@@ -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;
+
+
+
+
+}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalemanSettlement.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalemanSettlement.java
new file mode 100644
index 0000000..3a653ca
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalemanSettlement.java
@@ -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;
+
+
+
+
+}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanApply.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanApply.java
new file mode 100644
index 0000000..f40a697
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanApply.java
@@ -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;
+
+
+
+
+}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanGrade.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanGrade.java
new file mode 100644
index 0000000..f0a28b7
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanGrade.java
@@ -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;
+
+
+
+
+}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanOrder.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanOrder.java
new file mode 100644
index 0000000..ab03488
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanOrder.java
@@ -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;
+
+
+
+
+}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopRevenueFlowService.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopRevenueFlowService.java
new file mode 100644
index 0000000..ef3e100
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopRevenueFlowService.java
@@ -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>{
+
+
+
+
+
+}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalemanSettlementService.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalemanSettlementService.java
new file mode 100644
index 0000000..b49178e
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalemanSettlementService.java
@@ -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>{
+
+
+
+
+
+}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanApplyService.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanApplyService.java
new file mode 100644
index 0000000..62614de
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanApplyService.java
@@ -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>{
+
+
+
+
+
+}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanGradeService.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanGradeService.java
new file mode 100644
index 0000000..663bc50
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanGradeService.java
@@ -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>{
+
+
+
+
+
+}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanOrderService.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanOrderService.java
new file mode 100644
index 0000000..8a6ca27
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanOrderService.java
@@ -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>{
+
+
+
+
+
+}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/score/action/ScoreGoodsAction.java b/zq-erp/src/main/java/com/matrix/system/score/action/ScoreGoodsAction.java
index 090d996..df8dbff 100644
--- a/zq-erp/src/main/java/com/matrix/system/score/action/ScoreGoodsAction.java
+++ b/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
diff --git a/zq-erp/src/main/java/com/matrix/system/score/action/ScoreGoodsCategoryAction.java b/zq-erp/src/main/java/com/matrix/system/score/action/ScoreGoodsCategoryAction.java
index 93b8c35..a3873f1 100644
--- a/zq-erp/src/main/java/com/matrix/system/score/action/ScoreGoodsCategoryAction.java
+++ b/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
diff --git a/zq-erp/src/main/java/com/matrix/system/score/action/ScoreGoodsImageAction.java b/zq-erp/src/main/java/com/matrix/system/score/action/ScoreGoodsImageAction.java
index 17adc55..6b8bff1 100644
--- a/zq-erp/src/main/java/com/matrix/system/score/action/ScoreGoodsImageAction.java
+++ b/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
diff --git a/zq-erp/src/main/java/com/matrix/system/score/action/ScoreGoodsNavigationAction.java b/zq-erp/src/main/java/com/matrix/system/score/action/ScoreGoodsNavigationAction.java
index 618e4a4..5afc7de 100644
--- a/zq-erp/src/main/java/com/matrix/system/score/action/ScoreGoodsNavigationAction.java
+++ b/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
diff --git a/zq-erp/src/main/java/com/matrix/system/score/action/ScoreGoodsSkuAction.java b/zq-erp/src/main/java/com/matrix/system/score/action/ScoreGoodsSkuAction.java
index 36beb91..4e43ee7 100644
--- a/zq-erp/src/main/java/com/matrix/system/score/action/ScoreGoodsSkuAction.java
+++ b/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
diff --git a/zq-erp/src/main/java/com/matrix/system/score/action/ScoreOrderAction.java b/zq-erp/src/main/java/com/matrix/system/score/action/ScoreOrderAction.java
index bf18432..8598609 100644
--- a/zq-erp/src/main/java/com/matrix/system/score/action/ScoreOrderAction.java
+++ b/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
diff --git a/zq-erp/src/main/java/com/matrix/system/score/action/ScoreOrderItemAction.java b/zq-erp/src/main/java/com/matrix/system/score/action/ScoreOrderItemAction.java
index 1a7857d..fd2a113 100644
--- a/zq-erp/src/main/java/com/matrix/system/score/action/ScoreOrderItemAction.java
+++ b/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
diff --git a/zq-erp/src/main/java/com/matrix/system/score/action/ScoreShoppingCarAction.java b/zq-erp/src/main/java/com/matrix/system/score/action/ScoreShoppingCarAction.java
index ae07316..0dc30e3 100644
--- a/zq-erp/src/main/java/com/matrix/system/score/action/ScoreShoppingCarAction.java
+++ b/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
diff --git a/zq-erp/src/main/java/com/matrix/system/score/action/ScoreUseRecordAction.java b/zq-erp/src/main/java/com/matrix/system/score/action/ScoreUseRecordAction.java
index 29570eb..b7664be 100644
--- a/zq-erp/src/main/java/com/matrix/system/score/action/ScoreUseRecordAction.java
+++ b/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
diff --git a/zq-erp/src/main/java/com/matrix/system/score/action/ScoreVipDetailAction.java b/zq-erp/src/main/java/com/matrix/system/score/action/ScoreVipDetailAction.java
index 944719e..29550c4 100644
--- a/zq-erp/src/main/java/com/matrix/system/score/action/ScoreVipDetailAction.java
+++ b/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
diff --git a/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreGoodsCategoryDao.java b/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreGoodsCategoryDao.java
index ca488c3..43b8124 100644
--- a/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreGoodsCategoryDao.java
+++ b/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> {
diff --git a/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreGoodsDao.java b/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreGoodsDao.java
index 09ba2d6..38f0712 100644
--- a/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreGoodsDao.java
+++ b/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> {
diff --git a/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreGoodsImageDao.java b/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreGoodsImageDao.java
index 563b81a..f0e3bf7 100644
--- a/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreGoodsImageDao.java
+++ b/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> {
diff --git a/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreGoodsNavigationDao.java b/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreGoodsNavigationDao.java
index 066d0a0..a30d9e6 100644
--- a/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreGoodsNavigationDao.java
+++ b/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> {
diff --git a/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreGoodsSkuDao.java b/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreGoodsSkuDao.java
index bad2f10..7a1a30f 100644
--- a/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreGoodsSkuDao.java
+++ b/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> {
diff --git a/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreOrderDao.java b/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreOrderDao.java
index 3ed1af5..447f7ab 100644
--- a/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreOrderDao.java
+++ b/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> {
diff --git a/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreOrderItemDao.java b/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreOrderItemDao.java
index dff6179..0ed7675 100644
--- a/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreOrderItemDao.java
+++ b/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> {
diff --git a/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreShoppingCarDao.java b/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreShoppingCarDao.java
index 9ee8b89..03ccc9d 100644
--- a/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreShoppingCarDao.java
+++ b/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> {
diff --git a/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreUseRecordDao.java b/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreUseRecordDao.java
index 148e98e..2162dc5 100644
--- a/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreUseRecordDao.java
+++ b/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> {
diff --git a/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreVipDetailDao.java b/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreVipDetailDao.java
index cd7b100..dc820d5 100644
--- a/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreVipDetailDao.java
+++ b/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> {
diff --git a/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreGoods.java b/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreGoods.java
index e6fe507..d2c6b58 100644
--- a/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreGoods.java
+++ b/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
diff --git a/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreGoodsCategory.java b/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreGoodsCategory.java
index 557b112..f58ca14 100644
--- a/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreGoodsCategory.java
+++ b/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
diff --git a/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreGoodsImage.java b/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreGoodsImage.java
index d31b5b5..ceb7546 100644
--- a/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreGoodsImage.java
+++ b/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
diff --git a/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreGoodsNavigation.java b/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreGoodsNavigation.java
index a430eff..9ab24c0 100644
--- a/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreGoodsNavigation.java
+++ b/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
diff --git a/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreGoodsSku.java b/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreGoodsSku.java
index abf01b3..294bb83 100644
--- a/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreGoodsSku.java
+++ b/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
diff --git a/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreOrder.java b/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreOrder.java
index 82472b7..04d3fc7 100644
--- a/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreOrder.java
+++ b/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
diff --git a/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreOrderItem.java b/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreOrderItem.java
index aaa990f..dc5ca2f 100644
--- a/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreOrderItem.java
+++ b/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
diff --git a/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreShoppingCar.java b/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreShoppingCar.java
index dca1e08..4e098b9 100644
--- a/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreShoppingCar.java
+++ b/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
diff --git a/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreUseRecord.java b/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreUseRecord.java
index 4d6a630..a95ffec 100644
--- a/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreUseRecord.java
+++ b/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
diff --git a/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreVipDetail.java b/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreVipDetail.java
index aa2f2c8..2526ee5 100644
--- a/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreVipDetail.java
+++ b/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
diff --git a/zq-erp/src/main/java/com/matrix/system/score/service/ScoreGoodsCategoryService.java b/zq-erp/src/main/java/com/matrix/system/score/service/ScoreGoodsCategoryService.java
index ccfe942..6132c60 100644
--- a/zq-erp/src/main/java/com/matrix/system/score/service/ScoreGoodsCategoryService.java
+++ b/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
diff --git a/zq-erp/src/main/java/com/matrix/system/score/service/ScoreGoodsImageService.java b/zq-erp/src/main/java/com/matrix/system/score/service/ScoreGoodsImageService.java
index 087463e..333f719 100644
--- a/zq-erp/src/main/java/com/matrix/system/score/service/ScoreGoodsImageService.java
+++ b/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
diff --git a/zq-erp/src/main/java/com/matrix/system/score/service/ScoreGoodsNavigationService.java b/zq-erp/src/main/java/com/matrix/system/score/service/ScoreGoodsNavigationService.java
index f15e41d..d1bc4ea 100644
--- a/zq-erp/src/main/java/com/matrix/system/score/service/ScoreGoodsNavigationService.java
+++ b/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
diff --git a/zq-erp/src/main/java/com/matrix/system/score/service/ScoreGoodsService.java b/zq-erp/src/main/java/com/matrix/system/score/service/ScoreGoodsService.java
index 55f3f99..24f39ed 100644
--- a/zq-erp/src/main/java/com/matrix/system/score/service/ScoreGoodsService.java
+++ b/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
diff --git a/zq-erp/src/main/java/com/matrix/system/score/service/ScoreGoodsSkuService.java b/zq-erp/src/main/java/com/matrix/system/score/service/ScoreGoodsSkuService.java
index 487971c..dc60614 100644
--- a/zq-erp/src/main/java/com/matrix/system/score/service/ScoreGoodsSkuService.java
+++ b/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
diff --git a/zq-erp/src/main/java/com/matrix/system/score/service/ScoreOrderItemService.java b/zq-erp/src/main/java/com/matrix/system/score/service/ScoreOrderItemService.java
index a0abb54..c4e4a92 100644
--- a/zq-erp/src/main/java/com/matrix/system/score/service/ScoreOrderItemService.java
+++ b/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
diff --git a/zq-erp/src/main/java/com/matrix/system/score/service/ScoreOrderService.java b/zq-erp/src/main/java/com/matrix/system/score/service/ScoreOrderService.java
index 6a105fb..d45ff36 100644
--- a/zq-erp/src/main/java/com/matrix/system/score/service/ScoreOrderService.java
+++ b/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
diff --git a/zq-erp/src/main/java/com/matrix/system/score/service/ScoreShoppingCarService.java b/zq-erp/src/main/java/com/matrix/system/score/service/ScoreShoppingCarService.java
index ebedf83..bec88a3 100644
--- a/zq-erp/src/main/java/com/matrix/system/score/service/ScoreShoppingCarService.java
+++ b/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
diff --git a/zq-erp/src/main/java/com/matrix/system/score/service/ScoreUseRecordService.java b/zq-erp/src/main/java/com/matrix/system/score/service/ScoreUseRecordService.java
index 5c283a4..06687d3 100644
--- a/zq-erp/src/main/java/com/matrix/system/score/service/ScoreUseRecordService.java
+++ b/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
diff --git a/zq-erp/src/main/java/com/matrix/system/score/service/ScoreVipDetailService.java b/zq-erp/src/main/java/com/matrix/system/score/service/ScoreVipDetailService.java
index 44ea832..807819d 100644
--- a/zq-erp/src/main/java/com/matrix/system/score/service/ScoreVipDetailService.java
+++ b/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
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopPageAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopPageAction.java
index 6de4994..b85d30b 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopPageAction.java
+++ b/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
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopDeliveryDetail.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopDeliveryDetail.java
index 08b9e4c..707e272 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopDeliveryDetail.java
+++ b/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{
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopPage.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopPage.java
index 1491fe8..fec783a 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopPage.java
+++ b/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{
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopDeliveryDetailDao.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopDeliveryDetailDao.java
index d9860f1..96bed1a 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopDeliveryDetailDao.java
+++ b/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{
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopPageDao.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopPageDao.java
index af81228..62a630e 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopPageDao.java
+++ b/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{
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopQrcordVisitorDao.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopQrcordVisitorDao.java
index 2248fd1..52b5a34 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopQrcordVisitorDao.java
+++ b/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{
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopShareQrcordDao.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopShareQrcordDao.java
index 70f5611..785fc05 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopShareQrcordDao.java
+++ b/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{
diff --git a/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopRevenueFlowDao.xml b/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopRevenueFlowDao.xml
new file mode 100644
index 0000000..1f301ea
--- /dev/null
+++ b/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopRevenueFlowDao.xml
@@ -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>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalemanSettlementDao.xml b/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalemanSettlementDao.xml
new file mode 100644
index 0000000..d414a05
--- /dev/null
+++ b/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalemanSettlementDao.xml
@@ -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>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml b/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml
new file mode 100644
index 0000000..93c86e2
--- /dev/null
+++ b/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml
@@ -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>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanGradeDao.xml b/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanGradeDao.xml
new file mode 100644
index 0000000..9cf76e9
--- /dev/null
+++ b/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanGradeDao.xml
@@ -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>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanOrderDao.xml b/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanOrderDao.xml
new file mode 100644
index 0000000..1eba144
--- /dev/null
+++ b/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanOrderDao.xml
@@ -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>
\ No newline at end of file
--
Gitblit v1.9.1