# 2022-02-11

### 1.3.5 开源社区版(会员专业版同步修改):
无
### 0.1.6 会员专业版:
【新增】后台【平台设置-订单管理】增加【佣金计算通道】功能,分为【仅代理】【仅分销】【先代理后分销】【先分销后代理】四种自选模式。
【新增】增加【CoreCmsAgentOrderDetails】表,实现代理佣金订单详情列表功能,精确到具体商品明细。
【新增】增加【CoreCmsDistributionOrderDetails】表,实现三级佣金订单详情列表功能,精确到具体商品明细。
【修复】修复代理商商铺开启按钮错用三级分销商店铺开关功能,增加代理商商铺开启开关。
【修复】修复代理商佣金明细日期选择范围错乱问题。
【优化】uniapp自带progress进度条更换为uview2.x进度条。
【优化】敏感词过滤组件启用废弃的【WordsMatch】方法,启用【StringSearch】方法替代。
This commit is contained in:
JianWeie
2022-02-11 05:28:04 +08:00
parent 05df55d7ec
commit 8f64209d27
45 changed files with 16751 additions and 607 deletions

File diff suppressed because one or more lines are too long

View File

@@ -0,0 +1,70 @@
/*
Navicat Premium Data Transfer
Source Server Type : MySQL
Source Server Version : 50732
Source Schema : coreshop
Target Server Type : MySQL
Target Server Version : 50732
File Encoding : 65001
Date: 11/02/2022 05:22:51
*/
SET NAMES utf8mb4;
SET FOREIGN_KEY_CHECKS = 0;
-- ----------------------------
-- Table structure for CoreCmsAgentOrderDetails
-- ----------------------------
DROP TABLE IF EXISTS `CoreCmsAgentOrderDetails`;
CREATE TABLE `CoreCmsAgentOrderDetails` (
`id` int(11) NOT NULL AUTO_INCREMENT COMMENT '序列',
`agentOrderId` int(11) NULL DEFAULT NULL COMMENT '代理商佣金订单',
`orderId` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '用户订单编号',
`productPrice` decimal(10, 2) NULL DEFAULT NULL COMMENT '货品单价',
`amount` decimal(10, 2) NULL DEFAULT NULL COMMENT '结算佣金',
`goodId` int(11) NULL DEFAULT NULL COMMENT '商品序列',
`name` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '商品名称',
`addon` longtext CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '货品明细序列号存储',
`productId` int(11) NULL DEFAULT NULL COMMENT '货品序列',
`productNums` int(11) NULL DEFAULT NULL COMMENT '货品数量',
`promotionAmount` decimal(10, 2) NULL DEFAULT NULL COMMENT '货品优惠总金额',
`imageUrl` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '图片',
`remark` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '备注',
`createTime` datetime NULL DEFAULT NULL COMMENT '创建时间',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
-- ----------------------------
-- Records of CoreCmsAgentOrderDetails
-- ----------------------------
-- ----------------------------
-- Table structure for CoreCmsDistributionOrderDetails
-- ----------------------------
DROP TABLE IF EXISTS `CoreCmsDistributionOrderDetails`;
CREATE TABLE `CoreCmsDistributionOrderDetails` (
`id` int(11) NOT NULL AUTO_INCREMENT COMMENT '序列',
`distributionOrderId` int(11) NULL DEFAULT NULL COMMENT '代理商佣金订单',
`orderId` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '用户订单编号',
`productPrice` decimal(10, 2) NULL DEFAULT NULL COMMENT '货品单价',
`amount` decimal(10, 2) NULL DEFAULT NULL COMMENT '结算金额',
`goodId` int(11) NULL DEFAULT NULL COMMENT '商品序列',
`name` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '商品名称',
`addon` longtext CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '货品明细序列号存储',
`productId` int(11) NULL DEFAULT NULL COMMENT '货品序列',
`productNums` int(11) NULL DEFAULT NULL COMMENT '货品数量',
`promotionAmount` decimal(10, 2) NULL DEFAULT NULL COMMENT '货品优惠总金额',
`imageUrl` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '图片',
`remark` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '备注',
`createTime` datetime NULL DEFAULT NULL COMMENT '创建时间',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
-- ----------------------------
-- Records of CoreCmsDistributionOrderDetails
-- ----------------------------
SET FOREIGN_KEY_CHECKS = 1;

View File

@@ -1,3 +1,8 @@
2022-02-11
【新增】增加【CoreCmsAgentOrderDetails】表实现代理佣金订单详情列表功能精确到具体商品明细。
【新增】增加【CoreCmsDistributionOrderDetails】表实现三级佣金订单详情列表功能精确到具体商品明细。
2022-01-22
【新增】新增【CoreCmsOrderDistributionModel】表