商品SKU功能优化

document/sql/mall.sql

@@ -10,7 +10,7 @@ Target Server Type    : MYSQL
 Target Server Version : 50719
 File Encoding         : 65001
 
-Date: 2020-02-14 16:55:11
+Date: 2020-02-26 10:34:13
 */
 
 SET FOREIGN_KEY_CHECKS=0;
@@ -199,7 +199,7 @@ CREATE TABLE `cms_subject_product_relation` (
   `subject_id` bigint(20) DEFAULT NULL,
   `product_id` bigint(20) DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=41 DEFAULT CHARSET=utf8 COMMENT='专题商品关系表';
+) ENGINE=InnoDB AUTO_INCREMENT=44 DEFAULT CHARSET=utf8 COMMENT='专题商品关系表';
 
 -- ----------------------------
 -- Records of cms_subject_product_relation
@@ -214,9 +214,9 @@ INSERT INTO `cms_subject_product_relation` VALUES ('7', '1', '22');
 INSERT INTO `cms_subject_product_relation` VALUES ('29', '1', '23');
 INSERT INTO `cms_subject_product_relation` VALUES ('30', '4', '23');
 INSERT INTO `cms_subject_product_relation` VALUES ('31', '5', '23');
-INSERT INTO `cms_subject_product_relation` VALUES ('38', '2', '26');
-INSERT INTO `cms_subject_product_relation` VALUES ('39', '3', '26');
-INSERT INTO `cms_subject_product_relation` VALUES ('40', '6', '26');
+INSERT INTO `cms_subject_product_relation` VALUES ('41', '2', '26');
+INSERT INTO `cms_subject_product_relation` VALUES ('42', '3', '26');
+INSERT INTO `cms_subject_product_relation` VALUES ('43', '6', '26');
 
 -- ----------------------------
 -- Table structure for cms_topic
@@ -290,9 +290,6 @@ CREATE TABLE `oms_cart_item` (
   `member_id` bigint(20) DEFAULT NULL,
   `quantity` int(11) DEFAULT NULL COMMENT '购买数量',
   `price` decimal(10,2) DEFAULT NULL COMMENT '添加到购物车的价格',
-  `sp1` varchar(200) DEFAULT NULL COMMENT '销售属性1',
-  `sp2` varchar(200) DEFAULT NULL COMMENT '销售属性2',
-  `sp3` varchar(200) DEFAULT NULL COMMENT '销售属性3',
   `product_pic` varchar(1000) DEFAULT NULL COMMENT '商品主图',
   `product_name` varchar(500) DEFAULT NULL COMMENT '商品名称',
   `product_sub_title` varchar(500) DEFAULT NULL COMMENT '商品副标题（卖点）',
@@ -306,18 +303,19 @@ CREATE TABLE `oms_cart_item` (
   `product_sn` varchar(200) DEFAULT NULL,
   `product_attr` varchar(500) DEFAULT NULL COMMENT '商品销售属性:[{"key":"颜色","value":"颜色"},{"key":"容量","value":"4G"}]',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=19 DEFAULT CHARSET=utf8 COMMENT='购物车表';
+) ENGINE=InnoDB AUTO_INCREMENT=22 DEFAULT CHARSET=utf8 COMMENT='购物车表';
 
 -- ----------------------------
 -- Records of oms_cart_item
 -- ----------------------------
-INSERT INTO `oms_cart_item` VALUES ('12', '26', '90', '1', '1', '3788.00', '金色', '16G', null, null, '华为 HUAWEI P20', 'AI智慧全面屏 6GB +64GB 亮黑色 全网通版 移动联通电信4G手机 双卡双待手机 双卡双待', '201806070026001', 'windir', '2018-08-27 16:53:44', null, '1', '19', null, null, null);
-INSERT INTO `oms_cart_item` VALUES ('13', '27', '98', '1', '3', '2699.00', '黑色', '32G', null, null, '小米8', '骁龙845处理器，红外人脸解锁，AI变焦双摄，AI语音助手小米6X低至1299，点击抢购', '201808270027001', 'windir', '2018-08-27 17:11:53', null, '1', '19', null, null, null);
-INSERT INTO `oms_cart_item` VALUES ('14', '28', '102', '1', '1', '649.00', '金色', '16G', null, null, '红米5A', '8天超长待机，137g轻巧机身，高通骁龙处理器小米6X低至1299，点击抢购', '201808270028001', 'windir', '2018-08-27 17:18:02', null, '1', '19', null, null, null);
-INSERT INTO `oms_cart_item` VALUES ('15', '28', '103', '1', '1', '699.00', '金色', '32G', null, null, '红米5A', '8天超长待机，137g轻巧机身，高通骁龙处理器小米6X低至1299，点击抢购', '201808270028001', 'windir', '2018-08-28 10:22:45', null, '1', '19', null, null, null);
-INSERT INTO `oms_cart_item` VALUES ('16', '29', '106', '1', '1', '5499.00', '金色', '32G', null, null, 'Apple iPhone 8 Plus', '【限时限量抢购】Apple产品年中狂欢节，好物尽享，美在智慧！速来 >> 勾选[保障服务][原厂保2年]，获得AppleCare+全方位服务计划，原厂延保售后无忧。', '201808270029001', 'windir', '2018-08-28 10:50:50', null, '1', '19', null, null, null);
-INSERT INTO `oms_cart_item` VALUES ('17', '32', '0', '1', '1', '68.00', 'string', 'string', 'string', 'string', 'HLA海澜之家短袖T恤男基础款', 'string', 'HNTBJ2E153A', 'windir', '2019-04-27 22:00:29', '2019-04-22 17:15:57', '1', '0', 'string', 'string', 'string');
-INSERT INTO `oms_cart_item` VALUES ('18', '32', '0', '1', '1', '68.00', 'string', 'string', 'string', 'string', 'HLA海澜之家短袖T恤男基础款', 'string', 'HNTBJ2E153A', 'windir', '2019-04-27 22:00:52', '2019-04-22 17:15:57', '0', '0', 'string', 'string', 'string');
+INSERT INTO `oms_cart_item` VALUES ('12', '26', '90', '1', '1', '3788.00', null, '华为 HUAWEI P20', 'AI智慧全面屏 6GB +64GB 亮黑色 全网通版 移动联通电信4G手机 双卡双待手机 双卡双待', '201806070026001', 'windir', '2018-08-27 16:53:44', null, '1', '19', null, null, null);
+INSERT INTO `oms_cart_item` VALUES ('13', '27', '98', '1', '3', '2699.00', null, '小米8', '骁龙845处理器，红外人脸解锁，AI变焦双摄，AI语音助手小米6X低至1299，点击抢购', '201808270027001', 'windir', '2018-08-27 17:11:53', null, '1', '19', null, null, null);
+INSERT INTO `oms_cart_item` VALUES ('14', '28', '102', '1', '1', '649.00', null, '红米5A', '8天超长待机，137g轻巧机身，高通骁龙处理器小米6X低至1299，点击抢购', '201808270028001', 'windir', '2018-08-27 17:18:02', null, '1', '19', null, null, null);
+INSERT INTO `oms_cart_item` VALUES ('15', '28', '103', '1', '1', '699.00', null, '红米5A', '8天超长待机，137g轻巧机身，高通骁龙处理器小米6X低至1299，点击抢购', '201808270028001', 'windir', '2018-08-28 10:22:45', null, '1', '19', null, null, null);
+INSERT INTO `oms_cart_item` VALUES ('16', '29', '106', '1', '1', '5499.00', null, 'Apple iPhone 8 Plus', '【限时限量抢购】Apple产品年中狂欢节，好物尽享，美在智慧！速来 >> 勾选[保障服务][原厂保2年]，获得AppleCare+全方位服务计划，原厂延保售后无忧。', '201808270029001', 'windir', '2018-08-28 10:50:50', null, '1', '19', null, null, null);
+INSERT INTO `oms_cart_item` VALUES ('19', '36', '163', '1', '3', '100.00', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/5b19403eN9f0b3cb8.jpg', '耐克NIKE 男子 气垫 休闲鞋 AIR MAX 90 ESSENTIAL 运动鞋 AJ1285-101白色41码', '耐克NIKE 男子 气垫 休闲鞋 AIR MAX 90 ESSENTIAL 运动鞋 AJ1285-101白色41码', '202002210036001', 'windir', '2020-02-25 15:51:59', null, '1', '29', 'NIKE', '6799345', '[{\"key\":\"颜色\",\"value\":\"红色\"},{\"key\":\"尺寸\",\"value\":\"38\"},{\"key\":\"风格\",\"value\":\"秋季\"}]');
+INSERT INTO `oms_cart_item` VALUES ('20', '36', '164', '1', '2', '120.00', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/5b19403eN9f0b3cb8.jpg', '耐克NIKE 男子 气垫 休闲鞋 AIR MAX 90 ESSENTIAL 运动鞋 AJ1285-101白色41码', '耐克NIKE 男子 气垫 休闲鞋 AIR MAX 90 ESSENTIAL 运动鞋 AJ1285-101白色41码', '202002210036001', 'windir', '2020-02-25 15:54:23', null, '1', '29', 'NIKE', '6799345', '[{\"key\":\"颜色\",\"value\":\"红色\"},{\"key\":\"尺寸\",\"value\":\"38\"},{\"key\":\"风格\",\"value\":\"夏季\"}]');
+INSERT INTO `oms_cart_item` VALUES ('21', '36', '164', '1', '2', '120.00', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/5b19403eN9f0b3cb8.jpg', '耐克NIKE 男子 气垫 休闲鞋 AIR MAX 90 ESSENTIAL 运动鞋 AJ1285-101白色41码', '耐克NIKE 男子 气垫 休闲鞋 AIR MAX 90 ESSENTIAL 运动鞋 AJ1285-101白色41码', '202002210036001', 'windir', '2020-02-25 16:49:53', null, '1', '29', 'NIKE', '6799345', '[{\"key\":\"颜色\",\"value\":\"红色\"},{\"key\":\"尺寸\",\"value\":\"38\"},{\"key\":\"风格\",\"value\":\"夏季\"}]');
 
 -- ----------------------------
 -- Table structure for oms_company_address
@@ -394,7 +392,7 @@ CREATE TABLE `oms_order` (
   `comment_time` datetime DEFAULT NULL COMMENT '评价时间',
   `modify_time` datetime DEFAULT NULL COMMENT '修改时间',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=27 DEFAULT CHARSET=utf8 COMMENT='订单表';
+) ENGINE=InnoDB AUTO_INCREMENT=31 DEFAULT CHARSET=utf8 COMMENT='订单表';
 
 -- ----------------------------
 -- Records of oms_order
@@ -414,6 +412,10 @@ INSERT INTO `oms_order` VALUES ('23', '1', '2', '201809150102000006', '2018-09-1
 INSERT INTO `oms_order` VALUES ('24', '1', '2', '201809130101000005', '2018-09-13 16:57:40', 'test', '18732.00', '16377.75', '0.00', '2344.25', '0.00', '10.00', '0.00', '2', '1', '2', '0', null, null, '15', '18682', '18682', '单品促销,打折优惠：满3件，打7.50折,满减优惠：满1000.00元，减120.00元,满减优惠：满1000.00元，减120.00元,无优惠', null, null, null, null, null, '大梨', '18033441849', '518000', '广东省', '深圳市', '福田区', '东晓街道', null, '0', '0', null, null, null, null, null, null);
 INSERT INTO `oms_order` VALUES ('25', '1', '2', '201809130102000006', '2018-09-13 17:03:00', 'test', '18732.00', '16377.75', '10.00', '2344.25', '0.00', '10.00', '5.00', '1', '1', '4', '0', null, null, '15', '18682', '18682', '单品促销,打折优惠：满3件，打7.50折,满减优惠：满1000.00元，减120.00元,满减优惠：满1000.00元，减120.00元,无优惠', null, null, null, null, null, '大梨22', '18033441849', '518000', '北京市', '北京城区', '东城区', '东城街道', 'xxx', '0', '0', null, null, null, null, null, '2018-10-30 15:08:31');
 INSERT INTO `oms_order` VALUES ('26', '1', '2', '201809140101000003', '2018-09-14 16:16:16', 'test', '18732.00', '16377.75', '0.00', '2344.25', '0.00', '10.00', '0.00', '2', '1', '4', '0', null, null, '15', '18682', '18682', '单品促销,打折优惠：满3件，打7.50折,满减优惠：满1000.00元，减120.00元,满减优惠：满1000.00元，减120.00元,无优惠', null, null, null, null, null, '大梨', '18033441849', '518000', '广东省', '深圳市', '福田区', '东晓街道', null, '0', '1', null, null, null, null, null, null);
+INSERT INTO `oms_order` VALUES ('27', '1', null, '202002250100000001', '2020-02-25 15:59:20', 'test', '540.00', '540.00', '0.00', '0.00', '0.00', '0.00', '0.00', '0', '1', '0', '0', null, null, null, '0', '0', '无优惠,无优惠', null, null, null, null, null, '大梨', '18033441849', '518000', '广东省', '深圳市', '南山区', '科兴科学园', null, '0', '1', null, null, null, null, null, null);
+INSERT INTO `oms_order` VALUES ('28', '1', null, '202002250100000002', '2020-02-25 16:05:47', 'test', '540.00', '540.00', '0.00', '0.00', '0.00', '0.00', '0.00', '0', '1', '0', '0', null, null, null, '0', '0', '无优惠,无优惠', null, null, null, null, null, '大梨', '18033441849', '518000', '广东省', '深圳市', '南山区', '科兴科学园', null, '0', '1', null, null, null, null, null, null);
+INSERT INTO `oms_order` VALUES ('29', '1', null, '202002250100000003', '2020-02-25 16:07:58', 'test', '540.00', '540.00', '0.00', '0.00', '0.00', '0.00', '0.00', '0', '1', '0', '0', null, null, null, '0', '0', '无优惠,无优惠', null, null, null, null, null, '大梨', '18033441849', '518000', '广东省', '深圳市', '南山区', '科兴科学园', null, '0', '0', null, null, null, null, null, null);
+INSERT INTO `oms_order` VALUES ('30', '1', null, '202002250100000004', '2020-02-25 16:50:13', 'test', '240.00', '240.00', '20.00', '0.00', '0.00', '0.00', '10.00', '0', '1', '2', '0', '顺丰快递', '12333333', null, '0', '0', '无优惠', null, null, null, null, null, '大梨', '18033441849', '518000', '广东省', '深圳市', '南山区', '科兴科学园', null, '0', '0', null, '2020-02-25 16:53:29', '2020-02-25 16:54:03', null, null, '2020-02-25 16:52:51');
 
 -- ----------------------------
 -- Table structure for oms_order_item
@@ -433,9 +435,6 @@ CREATE TABLE `oms_order_item` (
   `product_sku_id` bigint(20) DEFAULT NULL COMMENT '商品sku编号',
   `product_sku_code` varchar(50) DEFAULT NULL COMMENT '商品sku条码',
   `product_category_id` bigint(20) DEFAULT NULL COMMENT '商品分类id',
-  `sp1` varchar(100) DEFAULT NULL COMMENT '商品的销售属性',
-  `sp2` varchar(100) DEFAULT NULL,
-  `sp3` varchar(100) DEFAULT NULL,
   `promotion_name` varchar(200) DEFAULT NULL COMMENT '商品促销名称',
   `promotion_amount` decimal(10,2) DEFAULT NULL COMMENT '商品促销分解金额',
   `coupon_amount` decimal(10,2) DEFAULT NULL COMMENT '优惠券优惠分解金额',
@@ -445,36 +444,43 @@ CREATE TABLE `oms_order_item` (
   `gift_growth` int(11) DEFAULT '0',
   `product_attr` varchar(500) DEFAULT NULL COMMENT '商品销售属性:[{"key":"颜色","value":"颜色"},{"key":"容量","value":"4G"}]',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=46 DEFAULT CHARSET=utf8 COMMENT='订单中所包含的商品';
+) ENGINE=InnoDB AUTO_INCREMENT=53 DEFAULT CHARSET=utf8 COMMENT='订单中所包含的商品';
 
 -- ----------------------------
 -- Records of oms_order_item
 -- ----------------------------
-INSERT INTO `oms_order_item` VALUES ('21', '12', '201809150101000001', '26', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180607/5ac1bf58Ndefaac16.jpg', '华为 HUAWEI P20', '华为', '6946605', '3788.00', '1', '90', '201806070026001', '19', null, null, null, '单品促销', '200.00', '2.02', '0.00', '3585.98', '3788', '3788', '[{\"key\":\"颜色\",\"value\":\"金色\"},{\"key\":\"容量\",\"value\":\"16G\"}]');
-INSERT INTO `oms_order_item` VALUES ('22', '12', '201809150101000001', '27', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/xiaomi.jpg', '小米8', '小米', '7437788', '2699.00', '3', '98', '201808270027001', '19', null, null, null, '打折优惠：满3件，打7.50折', '674.75', '1.44', '0.00', '2022.81', '2699', '2699', '[{\"key\":\"颜色\",\"value\":\"黑色\"},{\"key\":\"容量\",\"value\":\"32G\"}]');
-INSERT INTO `oms_order_item` VALUES ('23', '12', '201809150101000001', '28', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/5a9d248cN071f4959.jpg', '红米5A', '小米', '7437789', '649.00', '1', '102', '201808270028001', '19', null, null, null, '满减优惠：满1000.00元，减120.00元', '57.60', '0.35', '0.00', '591.05', '649', '649', '[{\"key\":\"颜色\",\"value\":\"金色\"},{\"key\":\"容量\",\"value\":\"16G\"}]');
-INSERT INTO `oms_order_item` VALUES ('24', '12', '201809150101000001', '28', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/5a9d248cN071f4959.jpg', '红米5A', '小米', '7437789', '699.00', '1', '103', '201808270028001', '19', null, null, null, '满减优惠：满1000.00元，减120.00元', '62.40', '0.37', '0.00', '636.23', '649', '649', '[{\"key\":\"颜色\",\"value\":\"金色\"},{\"key\":\"容量\",\"value\":\"32G\"}]');
-INSERT INTO `oms_order_item` VALUES ('25', '12', '201809150101000001', '29', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/5acc5248N6a5f81cd.jpg', 'Apple iPhone 8 Plus', '苹果', '7437799', '5499.00', '1', '106', '201808270029001', '19', null, null, null, '无优惠', '0.00', '2.94', '0.00', '5496.06', '5499', '5499', '[{\"key\":\"颜色\",\"value\":\"金色\"},{\"key\":\"容量\",\"value\":\"32G\"}]');
-INSERT INTO `oms_order_item` VALUES ('26', '13', '201809150102000002', '26', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180607/5ac1bf58Ndefaac16.jpg', '华为 HUAWEI P20', '华为', '6946605', '3788.00', '1', '90', '201806070026001', '19', null, null, null, '单品促销', '200.00', '2.02', '0.00', '3585.98', '3788', '3788', '[{\"key\":\"颜色\",\"value\":\"金色\"},{\"key\":\"容量\",\"value\":\"16G\"}]');
-INSERT INTO `oms_order_item` VALUES ('27', '13', '201809150102000002', '27', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/xiaomi.jpg', '小米8', '小米', '7437788', '2699.00', '3', '98', '201808270027001', '19', null, null, null, '打折优惠：满3件，打7.50折', '674.75', '1.44', '0.00', '2022.81', '2699', '2699', '[{\"key\":\"颜色\",\"value\":\"黑色\"},{\"key\":\"容量\",\"value\":\"32G\"}]');
-INSERT INTO `oms_order_item` VALUES ('28', '13', '201809150102000002', '28', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/5a9d248cN071f4959.jpg', '红米5A', '小米', '7437789', '649.00', '1', '102', '201808270028001', '19', null, null, null, '满减优惠：满1000.00元，减120.00元', '57.60', '0.35', '0.00', '591.05', '649', '649', '[{\"key\":\"颜色\",\"value\":\"金色\"},{\"key\":\"容量\",\"value\":\"16G\"}]');
-INSERT INTO `oms_order_item` VALUES ('29', '13', '201809150102000002', '28', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/5a9d248cN071f4959.jpg', '红米5A', '小米', '7437789', '699.00', '1', '103', '201808270028001', '19', null, null, null, '满减优惠：满1000.00元，减120.00元', '62.40', '0.37', '0.00', '636.23', '649', '649', '[{\"key\":\"颜色\",\"value\":\"金色\"},{\"key\":\"容量\",\"value\":\"32G\"}]');
-INSERT INTO `oms_order_item` VALUES ('30', '13', '201809150102000002', '29', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/5acc5248N6a5f81cd.jpg', 'Apple iPhone 8 Plus', '苹果', '7437799', '5499.00', '1', '106', '201808270029001', '19', null, null, null, '无优惠', '0.00', '2.94', '0.00', '5496.06', '5499', '5499', '[{\"key\":\"颜色\",\"value\":\"金色\"},{\"key\":\"容量\",\"value\":\"32G\"}]');
-INSERT INTO `oms_order_item` VALUES ('31', '14', '201809130101000001', '26', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180607/5ac1bf58Ndefaac16.jpg', '华为 HUAWEI P20', '华为', '6946605', '3788.00', '1', '90', '201806070026001', '19', null, null, null, '单品促销', '200.00', '2.02', '0.00', '3585.98', '3788', '3788', '[{\"key\":\"颜色\",\"value\":\"金色\"},{\"key\":\"容量\",\"value\":\"16G\"}]');
-INSERT INTO `oms_order_item` VALUES ('32', '14', '201809130101000001', '27', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/xiaomi.jpg', '小米8', '小米', '7437788', '2699.00', '3', '98', '201808270027001', '19', null, null, null, '打折优惠：满3件，打7.50折', '674.75', '1.44', '0.00', '2022.81', '2699', '2699', '[{\"key\":\"颜色\",\"value\":\"黑色\"},{\"key\":\"容量\",\"value\":\"32G\"}]');
-INSERT INTO `oms_order_item` VALUES ('33', '14', '201809130101000001', '28', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/5a9d248cN071f4959.jpg', '红米5A', '小米', '7437789', '649.00', '1', '102', '201808270028001', '19', null, null, null, '满减优惠：满1000.00元，减120.00元', '57.60', '0.35', '0.00', '591.05', '649', '649', '[{\"key\":\"颜色\",\"value\":\"金色\"},{\"key\":\"容量\",\"value\":\"16G\"}]');
-INSERT INTO `oms_order_item` VALUES ('34', '14', '201809130101000001', '28', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/5a9d248cN071f4959.jpg', '红米5A', '小米', '7437789', '699.00', '1', '103', '201808270028001', '19', null, null, null, '满减优惠：满1000.00元，减120.00元', '62.40', '0.37', '0.00', '636.23', '649', '649', '[{\"key\":\"颜色\",\"value\":\"金色\"},{\"key\":\"容量\",\"value\":\"32G\"}]');
-INSERT INTO `oms_order_item` VALUES ('35', '14', '201809130101000001', '29', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/5acc5248N6a5f81cd.jpg', 'Apple iPhone 8 Plus', '苹果', '7437799', '5499.00', '1', '106', '201808270029001', '19', null, null, null, '无优惠', '0.00', '2.94', '0.00', '5496.06', '5499', '5499', '[{\"key\":\"颜色\",\"value\":\"金色\"},{\"key\":\"容量\",\"value\":\"32G\"}]');
-INSERT INTO `oms_order_item` VALUES ('36', '15', '201809130101000001', '26', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180607/5ac1bf58Ndefaac16.jpg', '华为 HUAWEI P20', '华为', '6946605', '3788.00', '1', '90', '201806070026001', '19', null, null, null, '单品促销', '200.00', '2.02', '0.00', '3585.98', '3788', '3788', '[{\"key\":\"颜色\",\"value\":\"金色\"},{\"key\":\"容量\",\"value\":\"16G\"}]');
-INSERT INTO `oms_order_item` VALUES ('37', '15', '201809130101000001', '27', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/xiaomi.jpg', '小米8', '小米', '7437788', '2699.00', '3', '98', '201808270027001', '19', null, null, null, '打折优惠：满3件，打7.50折', '674.75', '1.44', '0.00', '2022.81', '2699', '2699', '[{\"key\":\"颜色\",\"value\":\"黑色\"},{\"key\":\"容量\",\"value\":\"32G\"}]');
-INSERT INTO `oms_order_item` VALUES ('38', '15', '201809130101000001', '28', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/5a9d248cN071f4959.jpg', '红米5A', '小米', '7437789', '649.00', '1', '102', '201808270028001', '19', null, null, null, '满减优惠：满1000.00元，减120.00元', '57.60', '0.35', '0.00', '591.05', '649', '649', '[{\"key\":\"颜色\",\"value\":\"金色\"},{\"key\":\"容量\",\"value\":\"16G\"}]');
-INSERT INTO `oms_order_item` VALUES ('39', '15', '201809130101000001', '28', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/5a9d248cN071f4959.jpg', '红米5A', '小米', '7437789', '699.00', '1', '103', '201808270028001', '19', null, null, null, '满减优惠：满1000.00元，减120.00元', '62.40', '0.37', '0.00', '636.23', '649', '649', '[{\"key\":\"颜色\",\"value\":\"金色\"},{\"key\":\"容量\",\"value\":\"32G\"}]');
-INSERT INTO `oms_order_item` VALUES ('40', '15', '201809130101000001', '29', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/5acc5248N6a5f81cd.jpg', 'Apple iPhone 8 Plus', '苹果', '7437799', '5499.00', '1', '106', '201808270029001', '19', null, null, null, '无优惠', '0.00', '2.94', '0.00', '5496.06', '5499', '5499', '[{\"key\":\"颜色\",\"value\":\"金色\"},{\"key\":\"容量\",\"value\":\"32G\"}]');
-INSERT INTO `oms_order_item` VALUES ('41', '16', '201809140101000001', '26', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180607/5ac1bf58Ndefaac16.jpg', '华为 HUAWEI P20', '华为', '6946605', '3788.00', '1', '90', '201806070026001', '19', null, null, null, '单品促销', '200.00', '2.02', '0.00', '3585.98', '3788', '3788', '[{\"key\":\"颜色\",\"value\":\"金色\"},{\"key\":\"容量\",\"value\":\"16G\"}]');
-INSERT INTO `oms_order_item` VALUES ('42', '16', '201809140101000001', '27', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/xiaomi.jpg', '小米8', '小米', '7437788', '2699.00', '3', '98', '201808270027001', '19', null, null, null, '打折优惠：满3件，打7.50折', '674.75', '1.44', '0.00', '2022.81', '2699', '2699', '[{\"key\":\"颜色\",\"value\":\"黑色\"},{\"key\":\"容量\",\"value\":\"32G\"}]');
-INSERT INTO `oms_order_item` VALUES ('43', '16', '201809140101000001', '28', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/5a9d248cN071f4959.jpg', '红米5A', '小米', '7437789', '649.00', '1', '102', '201808270028001', '19', null, null, null, '满减优惠：满1000.00元，减120.00元', '57.60', '0.35', '0.00', '591.05', '649', '649', '[{\"key\":\"颜色\",\"value\":\"金色\"},{\"key\":\"容量\",\"value\":\"16G\"}]');
-INSERT INTO `oms_order_item` VALUES ('44', '16', '201809140101000001', '28', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/5a9d248cN071f4959.jpg', '红米5A', '小米', '7437789', '699.00', '1', '103', '201808270028001', '19', null, null, null, '满减优惠：满1000.00元，减120.00元', '62.40', '0.37', '0.00', '636.23', '649', '649', '[{\"key\":\"颜色\",\"value\":\"金色\"},{\"key\":\"容量\",\"value\":\"32G\"}]');
-INSERT INTO `oms_order_item` VALUES ('45', '16', '201809140101000001', '29', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/5acc5248N6a5f81cd.jpg', 'Apple iPhone 8 Plus', '苹果', '7437799', '5499.00', '1', '106', '201808270029001', '19', null, null, null, '无优惠', '0.00', '2.94', '0.00', '5496.06', '5499', '5499', '[{\"key\":\"颜色\",\"value\":\"金色\"},{\"key\":\"容量\",\"value\":\"32G\"}]');
+INSERT INTO `oms_order_item` VALUES ('21', '12', '201809150101000001', '26', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180607/5ac1bf58Ndefaac16.jpg', '华为 HUAWEI P20', '华为', '6946605', '3788.00', '1', '90', '201806070026001', '19', '单品促销', '200.00', '2.02', '0.00', '3585.98', '3788', '3788', '[{\"key\":\"颜色\",\"value\":\"金色\"},{\"key\":\"容量\",\"value\":\"16G\"}]');
+INSERT INTO `oms_order_item` VALUES ('22', '12', '201809150101000001', '27', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/xiaomi.jpg', '小米8', '小米', '7437788', '2699.00', '3', '98', '201808270027001', '19', '打折优惠：满3件，打7.50折', '674.75', '1.44', '0.00', '2022.81', '2699', '2699', '[{\"key\":\"颜色\",\"value\":\"黑色\"},{\"key\":\"容量\",\"value\":\"32G\"}]');
+INSERT INTO `oms_order_item` VALUES ('23', '12', '201809150101000001', '28', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/5a9d248cN071f4959.jpg', '红米5A', '小米', '7437789', '649.00', '1', '102', '201808270028001', '19', '满减优惠：满1000.00元，减120.00元', '57.60', '0.35', '0.00', '591.05', '649', '649', '[{\"key\":\"颜色\",\"value\":\"金色\"},{\"key\":\"容量\",\"value\":\"16G\"}]');
+INSERT INTO `oms_order_item` VALUES ('24', '12', '201809150101000001', '28', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/5a9d248cN071f4959.jpg', '红米5A', '小米', '7437789', '699.00', '1', '103', '201808270028001', '19', '满减优惠：满1000.00元，减120.00元', '62.40', '0.37', '0.00', '636.23', '649', '649', '[{\"key\":\"颜色\",\"value\":\"金色\"},{\"key\":\"容量\",\"value\":\"32G\"}]');
+INSERT INTO `oms_order_item` VALUES ('25', '12', '201809150101000001', '29', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/5acc5248N6a5f81cd.jpg', 'Apple iPhone 8 Plus', '苹果', '7437799', '5499.00', '1', '106', '201808270029001', '19', '无优惠', '0.00', '2.94', '0.00', '5496.06', '5499', '5499', '[{\"key\":\"颜色\",\"value\":\"金色\"},{\"key\":\"容量\",\"value\":\"32G\"}]');
+INSERT INTO `oms_order_item` VALUES ('26', '13', '201809150102000002', '26', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180607/5ac1bf58Ndefaac16.jpg', '华为 HUAWEI P20', '华为', '6946605', '3788.00', '1', '90', '201806070026001', '19', '单品促销', '200.00', '2.02', '0.00', '3585.98', '3788', '3788', '[{\"key\":\"颜色\",\"value\":\"金色\"},{\"key\":\"容量\",\"value\":\"16G\"}]');
+INSERT INTO `oms_order_item` VALUES ('27', '13', '201809150102000002', '27', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/xiaomi.jpg', '小米8', '小米', '7437788', '2699.00', '3', '98', '201808270027001', '19', '打折优惠：满3件，打7.50折', '674.75', '1.44', '0.00', '2022.81', '2699', '2699', '[{\"key\":\"颜色\",\"value\":\"黑色\"},{\"key\":\"容量\",\"value\":\"32G\"}]');
+INSERT INTO `oms_order_item` VALUES ('28', '13', '201809150102000002', '28', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/5a9d248cN071f4959.jpg', '红米5A', '小米', '7437789', '649.00', '1', '102', '201808270028001', '19', '满减优惠：满1000.00元，减120.00元', '57.60', '0.35', '0.00', '591.05', '649', '649', '[{\"key\":\"颜色\",\"value\":\"金色\"},{\"key\":\"容量\",\"value\":\"16G\"}]');
+INSERT INTO `oms_order_item` VALUES ('29', '13', '201809150102000002', '28', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/5a9d248cN071f4959.jpg', '红米5A', '小米', '7437789', '699.00', '1', '103', '201808270028001', '19', '满减优惠：满1000.00元，减120.00元', '62.40', '0.37', '0.00', '636.23', '649', '649', '[{\"key\":\"颜色\",\"value\":\"金色\"},{\"key\":\"容量\",\"value\":\"32G\"}]');
+INSERT INTO `oms_order_item` VALUES ('30', '13', '201809150102000002', '29', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/5acc5248N6a5f81cd.jpg', 'Apple iPhone 8 Plus', '苹果', '7437799', '5499.00', '1', '106', '201808270029001', '19', '无优惠', '0.00', '2.94', '0.00', '5496.06', '5499', '5499', '[{\"key\":\"颜色\",\"value\":\"金色\"},{\"key\":\"容量\",\"value\":\"32G\"}]');
+INSERT INTO `oms_order_item` VALUES ('31', '14', '201809130101000001', '26', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180607/5ac1bf58Ndefaac16.jpg', '华为 HUAWEI P20', '华为', '6946605', '3788.00', '1', '90', '201806070026001', '19', '单品促销', '200.00', '2.02', '0.00', '3585.98', '3788', '3788', '[{\"key\":\"颜色\",\"value\":\"金色\"},{\"key\":\"容量\",\"value\":\"16G\"}]');
+INSERT INTO `oms_order_item` VALUES ('32', '14', '201809130101000001', '27', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/xiaomi.jpg', '小米8', '小米', '7437788', '2699.00', '3', '98', '201808270027001', '19', '打折优惠：满3件，打7.50折', '674.75', '1.44', '0.00', '2022.81', '2699', '2699', '[{\"key\":\"颜色\",\"value\":\"黑色\"},{\"key\":\"容量\",\"value\":\"32G\"}]');
+INSERT INTO `oms_order_item` VALUES ('33', '14', '201809130101000001', '28', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/5a9d248cN071f4959.jpg', '红米5A', '小米', '7437789', '649.00', '1', '102', '201808270028001', '19', '满减优惠：满1000.00元，减120.00元', '57.60', '0.35', '0.00', '591.05', '649', '649', '[{\"key\":\"颜色\",\"value\":\"金色\"},{\"key\":\"容量\",\"value\":\"16G\"}]');
+INSERT INTO `oms_order_item` VALUES ('34', '14', '201809130101000001', '28', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/5a9d248cN071f4959.jpg', '红米5A', '小米', '7437789', '699.00', '1', '103', '201808270028001', '19', '满减优惠：满1000.00元，减120.00元', '62.40', '0.37', '0.00', '636.23', '649', '649', '[{\"key\":\"颜色\",\"value\":\"金色\"},{\"key\":\"容量\",\"value\":\"32G\"}]');
+INSERT INTO `oms_order_item` VALUES ('35', '14', '201809130101000001', '29', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/5acc5248N6a5f81cd.jpg', 'Apple iPhone 8 Plus', '苹果', '7437799', '5499.00', '1', '106', '201808270029001', '19', '无优惠', '0.00', '2.94', '0.00', '5496.06', '5499', '5499', '[{\"key\":\"颜色\",\"value\":\"金色\"},{\"key\":\"容量\",\"value\":\"32G\"}]');
+INSERT INTO `oms_order_item` VALUES ('36', '15', '201809130101000001', '26', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180607/5ac1bf58Ndefaac16.jpg', '华为 HUAWEI P20', '华为', '6946605', '3788.00', '1', '90', '201806070026001', '19', '单品促销', '200.00', '2.02', '0.00', '3585.98', '3788', '3788', '[{\"key\":\"颜色\",\"value\":\"金色\"},{\"key\":\"容量\",\"value\":\"16G\"}]');
+INSERT INTO `oms_order_item` VALUES ('37', '15', '201809130101000001', '27', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/xiaomi.jpg', '小米8', '小米', '7437788', '2699.00', '3', '98', '201808270027001', '19', '打折优惠：满3件，打7.50折', '674.75', '1.44', '0.00', '2022.81', '2699', '2699', '[{\"key\":\"颜色\",\"value\":\"黑色\"},{\"key\":\"容量\",\"value\":\"32G\"}]');
+INSERT INTO `oms_order_item` VALUES ('38', '15', '201809130101000001', '28', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/5a9d248cN071f4959.jpg', '红米5A', '小米', '7437789', '649.00', '1', '102', '201808270028001', '19', '满减优惠：满1000.00元，减120.00元', '57.60', '0.35', '0.00', '591.05', '649', '649', '[{\"key\":\"颜色\",\"value\":\"金色\"},{\"key\":\"容量\",\"value\":\"16G\"}]');
+INSERT INTO `oms_order_item` VALUES ('39', '15', '201809130101000001', '28', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/5a9d248cN071f4959.jpg', '红米5A', '小米', '7437789', '699.00', '1', '103', '201808270028001', '19', '满减优惠：满1000.00元，减120.00元', '62.40', '0.37', '0.00', '636.23', '649', '649', '[{\"key\":\"颜色\",\"value\":\"金色\"},{\"key\":\"容量\",\"value\":\"32G\"}]');
+INSERT INTO `oms_order_item` VALUES ('40', '15', '201809130101000001', '29', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/5acc5248N6a5f81cd.jpg', 'Apple iPhone 8 Plus', '苹果', '7437799', '5499.00', '1', '106', '201808270029001', '19', '无优惠', '0.00', '2.94', '0.00', '5496.06', '5499', '5499', '[{\"key\":\"颜色\",\"value\":\"金色\"},{\"key\":\"容量\",\"value\":\"32G\"}]');
+INSERT INTO `oms_order_item` VALUES ('41', '16', '201809140101000001', '26', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180607/5ac1bf58Ndefaac16.jpg', '华为 HUAWEI P20', '华为', '6946605', '3788.00', '1', '90', '201806070026001', '19', '单品促销', '200.00', '2.02', '0.00', '3585.98', '3788', '3788', '[{\"key\":\"颜色\",\"value\":\"金色\"},{\"key\":\"容量\",\"value\":\"16G\"}]');
+INSERT INTO `oms_order_item` VALUES ('42', '16', '201809140101000001', '27', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/xiaomi.jpg', '小米8', '小米', '7437788', '2699.00', '3', '98', '201808270027001', '19', '打折优惠：满3件，打7.50折', '674.75', '1.44', '0.00', '2022.81', '2699', '2699', '[{\"key\":\"颜色\",\"value\":\"黑色\"},{\"key\":\"容量\",\"value\":\"32G\"}]');
+INSERT INTO `oms_order_item` VALUES ('43', '16', '201809140101000001', '28', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/5a9d248cN071f4959.jpg', '红米5A', '小米', '7437789', '649.00', '1', '102', '201808270028001', '19', '满减优惠：满1000.00元，减120.00元', '57.60', '0.35', '0.00', '591.05', '649', '649', '[{\"key\":\"颜色\",\"value\":\"金色\"},{\"key\":\"容量\",\"value\":\"16G\"}]');
+INSERT INTO `oms_order_item` VALUES ('44', '16', '201809140101000001', '28', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/5a9d248cN071f4959.jpg', '红米5A', '小米', '7437789', '699.00', '1', '103', '201808270028001', '19', '满减优惠：满1000.00元，减120.00元', '62.40', '0.37', '0.00', '636.23', '649', '649', '[{\"key\":\"颜色\",\"value\":\"金色\"},{\"key\":\"容量\",\"value\":\"32G\"}]');
+INSERT INTO `oms_order_item` VALUES ('45', '16', '201809140101000001', '29', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/5acc5248N6a5f81cd.jpg', 'Apple iPhone 8 Plus', '苹果', '7437799', '5499.00', '1', '106', '201808270029001', '19', '无优惠', '0.00', '2.94', '0.00', '5496.06', '5499', '5499', '[{\"key\":\"颜色\",\"value\":\"金色\"},{\"key\":\"容量\",\"value\":\"32G\"}]');
+INSERT INTO `oms_order_item` VALUES ('46', '27', '202002250100000001', '36', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/5b19403eN9f0b3cb8.jpg', '耐克NIKE 男子 气垫 休闲鞋 AIR MAX 90 ESSENTIAL 运动鞋 AJ1285-101白色41码', 'NIKE', '6799345', '100.00', '3', '163', '202002210036001', '29', '无优惠', '0.00', '0.00', '0.00', '100.00', '0', '0', null);
+INSERT INTO `oms_order_item` VALUES ('47', '27', '202002250100000001', '36', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/5b19403eN9f0b3cb8.jpg', '耐克NIKE 男子 气垫 休闲鞋 AIR MAX 90 ESSENTIAL 运动鞋 AJ1285-101白色41码', 'NIKE', '6799345', '120.00', '2', '164', '202002210036001', '29', '无优惠', '0.00', '0.00', '0.00', '120.00', '0', '0', null);
+INSERT INTO `oms_order_item` VALUES ('48', '28', '202002250100000002', '36', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/5b19403eN9f0b3cb8.jpg', '耐克NIKE 男子 气垫 休闲鞋 AIR MAX 90 ESSENTIAL 运动鞋 AJ1285-101白色41码', 'NIKE', '6799345', '100.00', '3', '163', '202002210036001', '29', '无优惠', '0.00', '0.00', '0.00', '100.00', '0', '0', null);
+INSERT INTO `oms_order_item` VALUES ('49', '28', '202002250100000002', '36', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/5b19403eN9f0b3cb8.jpg', '耐克NIKE 男子 气垫 休闲鞋 AIR MAX 90 ESSENTIAL 运动鞋 AJ1285-101白色41码', 'NIKE', '6799345', '120.00', '2', '164', '202002210036001', '29', '无优惠', '0.00', '0.00', '0.00', '120.00', '0', '0', null);
+INSERT INTO `oms_order_item` VALUES ('50', '29', '202002250100000003', '36', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/5b19403eN9f0b3cb8.jpg', '耐克NIKE 男子 气垫 休闲鞋 AIR MAX 90 ESSENTIAL 运动鞋 AJ1285-101白色41码', 'NIKE', '6799345', '100.00', '3', '163', '202002210036001', '29', '无优惠', '0.00', '0.00', '0.00', '100.00', '0', '0', '[{\"key\":\"颜色\",\"value\":\"红色\"},{\"key\":\"尺寸\",\"value\":\"38\"},{\"key\":\"风格\",\"value\":\"秋季\"}]');
+INSERT INTO `oms_order_item` VALUES ('51', '29', '202002250100000003', '36', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/5b19403eN9f0b3cb8.jpg', '耐克NIKE 男子 气垫 休闲鞋 AIR MAX 90 ESSENTIAL 运动鞋 AJ1285-101白色41码', 'NIKE', '6799345', '120.00', '2', '164', '202002210036001', '29', '无优惠', '0.00', '0.00', '0.00', '120.00', '0', '0', '[{\"key\":\"颜色\",\"value\":\"红色\"},{\"key\":\"尺寸\",\"value\":\"38\"},{\"key\":\"风格\",\"value\":\"夏季\"}]');
+INSERT INTO `oms_order_item` VALUES ('52', '30', '202002250100000004', '36', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/5b19403eN9f0b3cb8.jpg', '耐克NIKE 男子 气垫 休闲鞋 AIR MAX 90 ESSENTIAL 运动鞋 AJ1285-101白色41码', 'NIKE', '6799345', '120.00', '2', '164', '202002210036001', '29', '无优惠', '0.00', '0.00', '0.00', '120.00', '0', '0', '[{\"key\":\"颜色\",\"value\":\"红色\"},{\"key\":\"尺寸\",\"value\":\"38\"},{\"key\":\"风格\",\"value\":\"夏季\"}]');
 
 -- ----------------------------
 -- Table structure for oms_order_operate_history
@@ -488,7 +494,7 @@ CREATE TABLE `oms_order_operate_history` (
   `order_status` int(1) DEFAULT NULL COMMENT '订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单',
   `note` varchar(500) DEFAULT NULL COMMENT '备注',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=24 DEFAULT CHARSET=utf8 COMMENT='订单操作历史记录';
+) ENGINE=InnoDB AUTO_INCREMENT=27 DEFAULT CHARSET=utf8 COMMENT='订单操作历史记录';
 
 -- ----------------------------
 -- Records of oms_order_operate_history
@@ -512,6 +518,9 @@ INSERT INTO `oms_order_operate_history` VALUES ('20', '25', '后台管理员', '
 INSERT INTO `oms_order_operate_history` VALUES ('21', '25', '后台管理员', '2018-10-30 15:08:31', '0', '修改备注信息：xxx');
 INSERT INTO `oms_order_operate_history` VALUES ('22', '25', '后台管理员', '2018-10-30 15:08:39', '4', '订单关闭:2222');
 INSERT INTO `oms_order_operate_history` VALUES ('23', '12', '后台管理员', '2019-11-09 16:50:28', '4', '修改备注信息：111');
+INSERT INTO `oms_order_operate_history` VALUES ('24', '30', '后台管理员', '2020-02-25 16:52:37', '0', '修改费用信息');
+INSERT INTO `oms_order_operate_history` VALUES ('25', '30', '后台管理员', '2020-02-25 16:52:51', '0', '修改费用信息');
+INSERT INTO `oms_order_operate_history` VALUES ('26', '30', '后台管理员', '2020-02-25 16:54:03', '2', '完成发货');
 
 -- ----------------------------
 -- Table structure for oms_order_return_apply
@@ -762,7 +771,7 @@ CREATE TABLE `pms_member_price` (
   `member_price` decimal(10,2) DEFAULT NULL COMMENT '会员价格',
   `member_level_name` varchar(100) DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=201 DEFAULT CHARSET=utf8 COMMENT='商品会员价格表';
+) ENGINE=InnoDB AUTO_INCREMENT=252 DEFAULT CHARSET=utf8 COMMENT='商品会员价格表';
 
 -- ----------------------------
 -- Records of pms_member_price
@@ -796,21 +805,12 @@ INSERT INTO `pms_member_price` VALUES ('150', '32', '3', null, '钻石会员');
 INSERT INTO `pms_member_price` VALUES ('154', '33', '1', null, '黄金会员');
 INSERT INTO `pms_member_price` VALUES ('155', '33', '2', null, '白金会员');
 INSERT INTO `pms_member_price` VALUES ('156', '33', '3', null, '钻石会员');
-INSERT INTO `pms_member_price` VALUES ('169', '36', '1', null, '黄金会员');
-INSERT INTO `pms_member_price` VALUES ('170', '36', '2', null, '白金会员');
-INSERT INTO `pms_member_price` VALUES ('171', '36', '3', null, '钻石会员');
-INSERT INTO `pms_member_price` VALUES ('172', '35', '1', null, '黄金会员');
-INSERT INTO `pms_member_price` VALUES ('173', '35', '2', null, '白金会员');
-INSERT INTO `pms_member_price` VALUES ('174', '35', '3', null, '钻石会员');
 INSERT INTO `pms_member_price` VALUES ('175', '34', '1', null, '黄金会员');
 INSERT INTO `pms_member_price` VALUES ('176', '34', '2', null, '白金会员');
 INSERT INTO `pms_member_price` VALUES ('177', '34', '3', null, '钻石会员');
 INSERT INTO `pms_member_price` VALUES ('178', '30', '1', null, '黄金会员');
 INSERT INTO `pms_member_price` VALUES ('179', '30', '2', null, '白金会员');
 INSERT INTO `pms_member_price` VALUES ('180', '30', '3', null, '钻石会员');
-INSERT INTO `pms_member_price` VALUES ('186', '26', '1', null, '黄金会员');
-INSERT INTO `pms_member_price` VALUES ('187', '26', '2', null, '白金会员');
-INSERT INTO `pms_member_price` VALUES ('188', '26', '3', null, '钻石会员');
 INSERT INTO `pms_member_price` VALUES ('192', '27', '1', null, '黄金会员');
 INSERT INTO `pms_member_price` VALUES ('193', '27', '2', null, '白金会员');
 INSERT INTO `pms_member_price` VALUES ('194', '27', '3', null, '钻石会员');
@@ -820,6 +820,15 @@ INSERT INTO `pms_member_price` VALUES ('197', '28', '3', null, '钻石会员');
 INSERT INTO `pms_member_price` VALUES ('198', '29', '1', null, '黄金会员');
 INSERT INTO `pms_member_price` VALUES ('199', '29', '2', null, '白金会员');
 INSERT INTO `pms_member_price` VALUES ('200', '29', '3', null, '钻石会员');
+INSERT INTO `pms_member_price` VALUES ('201', '26', '1', null, '黄金会员');
+INSERT INTO `pms_member_price` VALUES ('202', '26', '2', null, '白金会员');
+INSERT INTO `pms_member_price` VALUES ('203', '26', '3', null, '钻石会员');
+INSERT INTO `pms_member_price` VALUES ('246', '36', '1', null, '黄金会员');
+INSERT INTO `pms_member_price` VALUES ('247', '36', '2', null, '白金会员');
+INSERT INTO `pms_member_price` VALUES ('248', '36', '3', null, '钻石会员');
+INSERT INTO `pms_member_price` VALUES ('249', '35', '1', null, '黄金会员');
+INSERT INTO `pms_member_price` VALUES ('250', '35', '2', null, '白金会员');
+INSERT INTO `pms_member_price` VALUES ('251', '35', '3', null, '钻石会员');
 
 -- ----------------------------
 -- Table structure for pms_product
@@ -892,7 +901,7 @@ INSERT INTO `pms_product` VALUES ('18', '1', '7', '0', '1', '女式超柔软拉
 INSERT INTO `pms_product` VALUES ('22', '6', '7', '0', '1', 'test', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180604/1522738681.jpg', '', '1', '1', '0', '0', '0', '0', '0', '0.00', null, '0', '0', '0', 'test', '', '0.00', '100', '0', '', '0.00', '1', '1,2', '', '', '', '', '', '', '', null, null, '0', '0', '小米', '外套');
 INSERT INTO `pms_product` VALUES ('23', '6', '19', '0', '1', '毛衫测试', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180604/1522738681.jpg', 'NO.1098', '1', '1', '1', '1', '0', '0', '0', '99.00', null, '99', '99', '1000', '毛衫测试11', 'xxx', '109.00', '100', '0', '件', '1000.00', '1', '1,2,3', '毛衫测试', '毛衫测试', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180604/1522738681.jpg,http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180604/1522738681.jpg', '毛衫测试', '毛衫测试', '<p><img class=\"wscnph\" src=\"http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180604/155x54.bmp\" /><img class=\"wscnph\" src=\"http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180604/APP登录bg1080.jpg\" width=\"500\" height=\"500\" /><img class=\"wscnph\" src=\"http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180604/APP登录界面.jpg\" width=\"500\" height=\"500\" /></p>', '', null, null, '0', '2', '小米', '手机数码');
 INSERT INTO `pms_product` VALUES ('24', '6', '7', '0', null, 'xxx', '', '', '1', '0', '0', '0', '0', '0', '0', '0.00', null, '0', '0', '0', 'xxx', '', '0.00', '100', '0', '', '0.00', '0', '', '', '', '', '', '', '', '', null, null, '0', '0', '小米', '外套');
-INSERT INTO `pms_product` VALUES ('26', '3', '19', '0', '3', '华为 HUAWEI P20 ', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180607/5ac1bf58Ndefaac16.jpg', '6946605', '0', '1', '1', '1', '0', '100', '0', '3788.00', null, '3788', '3788', '0', 'AI智慧全面屏 6GB +64GB 亮黑色 全网通版 移动联通电信4G手机 双卡双待手机 双卡双待', '', '4288.00', '1000', '0', '件', '0.00', '1', '2,3,1', '', '', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180607/5ab46a3cN616bdc41.jpg,http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180607/5ac1bf5fN2522b9dc.jpg', '', '', '<p><img class=\"wscnph\" src=\"http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180607/5ad44f1cNf51f3bb0.jpg\" /><img class=\"wscnph\" src=\"http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180607/5ad44fa8Nfcf71c10.jpg\" /><img class=\"wscnph\" src=\"http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180607/5ad44fa9N40e78ee0.jpg\" /><img class=\"wscnph\" src=\"http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180607/5ad457f4N1c94bdda.jpg\" /><img class=\"wscnph\" src=\"http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180607/5ad457f5Nd30de41d.jpg\" /><img class=\"wscnph\" src=\"http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180607/5b10fb0eN0eb053fb.jpg\" /></p>', '', null, null, '0', '1', '华为', '手机数码');
+INSERT INTO `pms_product` VALUES ('26', '3', '19', '0', '3', '华为 HUAWEI P20 ', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180607/5ac1bf58Ndefaac16.jpg', '6946605', '0', '1', '1', '1', '0', '100', '0', '3788.00', null, '3788', '3788', '0', 'AI智慧全面屏 6GB +64GB 亮黑色 全网通版 移动联通电信4G手机 双卡双待手机 双卡双待', '', '4288.00', '1000', '0', '件', '0.00', '1', '2,3,1', '', '', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180607/5ab46a3cN616bdc41.jpg,http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180607/5ac1bf5fN2522b9dc.jpg', '', '', '<p><img class=\"wscnph\" src=\"http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180607/5ad44f1cNf51f3bb0.jpg\" /><img class=\"wscnph\" src=\"http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180607/5ad44fa8Nfcf71c10.jpg\" /><img class=\"wscnph\" src=\"http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180607/5ad44fa9N40e78ee0.jpg\" /><img class=\"wscnph\" src=\"http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180607/5ad457f4N1c94bdda.jpg\" /><img class=\"wscnph\" src=\"http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180607/5ad457f5Nd30de41d.jpg\" /><img class=\"wscnph\" src=\"http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180607/5b10fb0eN0eb053fb.jpg\" /></p>', '', null, null, '0', '1', '华为', '手机通讯');
 INSERT INTO `pms_product` VALUES ('27', '6', '19', '0', '3', '小米8 全面屏游戏智能手机 6GB+64GB 黑色 全网通4G 双卡双待', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/xiaomi.jpg', '7437788', '0', '1', '1', '1', '0', '0', '0', '2699.00', null, '2699', '2699', '0', '骁龙845处理器，红外人脸解锁，AI变焦双摄，AI语音助手小米6X低至1299，点击抢购', '小米8 全面屏游戏智能手机 6GB+64GB 黑色 全网通4G 双卡双待', '2699.00', '100', '0', '', '0.00', '0', '', '', '', '', '', '', '<p><img class=\"wscnph\" src=\"http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/5b2254e8N414e6d3a.jpg\" width=\"500\" /></p>', '', null, null, '0', '3', '小米', '手机数码');
 INSERT INTO `pms_product` VALUES ('28', '6', '19', '0', '3', '小米 红米5A 全网通版 3GB+32GB 香槟金 移动联通电信4G手机 双卡双待', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/5a9d248cN071f4959.jpg', '7437789', '0', '1', '1', '1', '0', '0', '0', '649.00', null, '649', '649', '0', '8天超长待机，137g轻巧机身，高通骁龙处理器小米6X低至1299，点击抢购', '', '649.00', '100', '0', '', '0.00', '0', '', '', '', '', '', '', '', '', null, null, '0', '4', '小米', '手机数码');
 INSERT INTO `pms_product` VALUES ('29', '51', '19', '0', '3', 'Apple iPhone 8 Plus 64GB 红色特别版 移动联通电信4G手机', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/5acc5248N6a5f81cd.jpg', '7437799', '0', '1', '1', '1', '0', '0', '0', '5499.00', null, '5499', '5499', '0', '【限时限量抢购】Apple产品年中狂欢节，好物尽享，美在智慧！速来 >> 勾选[保障服务][原厂保2年]，获得AppleCare+全方位服务计划，原厂延保售后无忧。', '', '5499.00', '100', '0', '', '0.00', '0', '', '', '', '', '', '', '', '', null, null, '0', '0', '苹果', '手机数码');
@@ -901,8 +910,8 @@ INSERT INTO `pms_product` VALUES ('31', '50', '8', '0', '1', 'HLA海澜之家蓝
 INSERT INTO `pms_product` VALUES ('32', '50', '8', '0', null, 'HLA海澜之家短袖T恤男基础款', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/5a51eb88Na4797877.jpg', 'HNTBJ2E153A', '0', '1', '0', '0', '0', '0', '0', '68.00', null, '0', '0', '0', 'HLA海澜之家短袖T恤男基础款简约圆领HNTBJ2E153A藏青(F3)175/92A(50)', '', '68.00', '100', '0', '', '0.00', '0', '', '', '', '', '', '', '', '', null, null, '0', '0', '海澜之家', 'T恤');
 INSERT INTO `pms_product` VALUES ('33', '6', '35', '0', null, '小米（MI）小米电视4A ', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/5b02804dN66004d73.jpg', '4609652', '0', '1', '0', '0', '0', '0', '0', '2499.00', null, '0', '0', '0', '小米（MI）小米电视4A 55英寸 L55M5-AZ/L55M5-AD 2GB+8GB HDR 4K超高清 人工智能网络液晶平板电视', '', '2499.00', '100', '0', '', '0.00', '0', '', '', '', '', '', '', '', '', null, null, '0', '0', '小米', '手机数码');
 INSERT INTO `pms_product` VALUES ('34', '6', '35', '0', null, '小米（MI）小米电视4A 65英寸', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/5b028530N51eee7d4.jpg', '4609660', '0', '1', '0', '0', '0', '0', '0', '3999.00', null, '0', '0', '0', ' L65M5-AZ/L65M5-AD 2GB+8GB HDR 4K超高清 人工智能网络液晶平板电视', '', '3999.00', '100', '0', '', '0.00', '0', '', '', '', '', '', '', '', '', null, null, '0', '0', '小米', '手机数码');
-INSERT INTO `pms_product` VALUES ('35', '58', '29', '0', null, '耐克NIKE 男子 休闲鞋 ROSHE RUN 运动鞋 511881-010黑色41码', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/5b235bb9Nf606460b.jpg', '6799342', '0', '1', '0', '0', '0', '0', '0', '369.00', null, '0', '0', '0', '耐克NIKE 男子 休闲鞋 ROSHE RUN 运动鞋 511881-010黑色41码', '', '369.00', '100', '0', '', '0.00', '0', '', '', '', '', '', '', '', '', null, null, '0', '0', 'NIKE', '男鞋');
-INSERT INTO `pms_product` VALUES ('36', '58', '29', '0', null, '耐克NIKE 男子 气垫 休闲鞋 AIR MAX 90 ESSENTIAL 运动鞋 AJ1285-101白色41码', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/5b19403eN9f0b3cb8.jpg', '6799345', '0', '1', '1', '1', '0', '0', '0', '499.00', null, '0', '0', '0', '耐克NIKE 男子 气垫 休闲鞋 AIR MAX 90 ESSENTIAL 运动鞋 AJ1285-101白色41码', '', '499.00', '100', '0', '', '0.00', '0', '', '', '', '', '', '', '', '', null, null, '0', '0', 'NIKE', '男鞋');
+INSERT INTO `pms_product` VALUES ('35', '58', '29', '0', '11', '耐克NIKE 男子 休闲鞋 ROSHE RUN 运动鞋 511881-010黑色41码', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/5b235bb9Nf606460b.jpg', '6799342', '0', '1', '0', '0', '0', '0', '0', '369.00', null, '0', '0', '0', '耐克NIKE 男子 休闲鞋 ROSHE RUN 运动鞋 511881-010黑色41码', '', '369.00', '100', '0', '', '0.00', '0', '', '', '', '', '', '', '', '', null, null, '0', '0', 'NIKE', '男鞋');
+INSERT INTO `pms_product` VALUES ('36', '58', '29', '0', '11', '耐克NIKE 男子 气垫 休闲鞋 AIR MAX 90 ESSENTIAL 运动鞋 AJ1285-101白色41码', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/5b19403eN9f0b3cb8.jpg', '6799345', '0', '1', '1', '1', '0', '0', '0', '499.00', null, '0', '0', '0', '耐克NIKE 男子 气垫 休闲鞋 AIR MAX 90 ESSENTIAL 运动鞋 AJ1285-101白色41码', '', '499.00', '100', '0', '', '0.00', '0', '', '', '', '', '', '', '', '', null, null, '0', '0', 'NIKE', '男鞋');
 
 -- ----------------------------
 -- Table structure for pms_product_attribute
@@ -922,7 +931,7 @@ CREATE TABLE `pms_product_attribute` (
   `hand_add_status` int(1) DEFAULT NULL COMMENT '是否支持手动新增；0->不支持；1->支持',
   `type` int(1) DEFAULT NULL COMMENT '属性的类型；0->规格；1->参数',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=49 DEFAULT CHARSET=utf8 COMMENT='商品属性参数表';
+) ENGINE=InnoDB AUTO_INCREMENT=52 DEFAULT CHARSET=utf8 COMMENT='商品属性参数表';
 
 -- ----------------------------
 -- Records of pms_product_attribute
@@ -955,6 +964,9 @@ INSERT INTO `pms_product_attribute` VALUES ('45', '3', '屏幕尺寸', '0', '0',
 INSERT INTO `pms_product_attribute` VALUES ('46', '3', '网络', '0', '1', '3G,4G', '0', '0', '0', '0', '0', '1');
 INSERT INTO `pms_product_attribute` VALUES ('47', '3', '系统', '0', '1', 'Android,IOS', '0', '0', '0', '0', '0', '1');
 INSERT INTO `pms_product_attribute` VALUES ('48', '3', '电池容量', '0', '0', '', '0', '0', '0', '0', '0', '1');
+INSERT INTO `pms_product_attribute` VALUES ('49', '11', '颜色', '0', '1', '红色,蓝色,绿色', '0', '1', '0', '0', '0', '0');
+INSERT INTO `pms_product_attribute` VALUES ('50', '11', '尺寸', '0', '1', '38,39,40', '0', '0', '0', '0', '0', '0');
+INSERT INTO `pms_product_attribute` VALUES ('51', '11', '风格', '0', '1', '夏季,秋季', '0', '0', '0', '0', '0', '0');
 
 -- ----------------------------
 -- Table structure for pms_product_attribute_category
@@ -966,7 +978,7 @@ CREATE TABLE `pms_product_attribute_category` (
   `attribute_count` int(11) DEFAULT '0' COMMENT '属性数量',
   `param_count` int(11) DEFAULT '0' COMMENT '参数数量',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8 COMMENT='产品属性分类表';
+) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8 COMMENT='产品属性分类表';
 
 -- ----------------------------
 -- Records of pms_product_attribute_category
@@ -978,6 +990,7 @@ INSERT INTO `pms_product_attribute_category` VALUES ('4', '配件', '0', '0');
 INSERT INTO `pms_product_attribute_category` VALUES ('5', '居家', '0', '0');
 INSERT INTO `pms_product_attribute_category` VALUES ('6', '洗护', '0', '0');
 INSERT INTO `pms_product_attribute_category` VALUES ('10', '测试分类', '0', '0');
+INSERT INTO `pms_product_attribute_category` VALUES ('11', '服装-鞋帽', '3', '0');
 
 -- ----------------------------
 -- Table structure for pms_product_attribute_value
@@ -989,7 +1002,7 @@ CREATE TABLE `pms_product_attribute_value` (
   `product_attribute_id` bigint(20) DEFAULT NULL,
   `value` varchar(64) DEFAULT NULL COMMENT '手动添加规格或参数的值，参数单值，规格有多个时以逗号隔开',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=228 DEFAULT CHARSET=utf8 COMMENT='存储产品参数信息的表';
+) ENGINE=InnoDB AUTO_INCREMENT=275 DEFAULT CHARSET=utf8 COMMENT='存储产品参数信息的表';
 
 -- ----------------------------
 -- Records of pms_product_attribute_value
@@ -1044,11 +1057,6 @@ INSERT INTO `pms_product_attribute_value` VALUES ('199', '30', '25', '夏季');
 INSERT INTO `pms_product_attribute_value` VALUES ('200', '30', '37', '青年');
 INSERT INTO `pms_product_attribute_value` VALUES ('201', '30', '38', '2018年夏');
 INSERT INTO `pms_product_attribute_value` VALUES ('202', '30', '39', '短袖');
-INSERT INTO `pms_product_attribute_value` VALUES ('203', '26', '43', '金色,银色');
-INSERT INTO `pms_product_attribute_value` VALUES ('204', '26', '45', '5.0');
-INSERT INTO `pms_product_attribute_value` VALUES ('205', '26', '46', '4G');
-INSERT INTO `pms_product_attribute_value` VALUES ('206', '26', '47', 'Android');
-INSERT INTO `pms_product_attribute_value` VALUES ('207', '26', '48', '3000');
 INSERT INTO `pms_product_attribute_value` VALUES ('213', '27', '43', '黑色,蓝色');
 INSERT INTO `pms_product_attribute_value` VALUES ('214', '27', '45', '5.8');
 INSERT INTO `pms_product_attribute_value` VALUES ('215', '27', '46', '4G');
@@ -1064,6 +1072,11 @@ INSERT INTO `pms_product_attribute_value` VALUES ('224', '29', '45', '4.7');
 INSERT INTO `pms_product_attribute_value` VALUES ('225', '29', '46', '4G');
 INSERT INTO `pms_product_attribute_value` VALUES ('226', '29', '47', 'IOS');
 INSERT INTO `pms_product_attribute_value` VALUES ('227', '29', '48', '1960ml');
+INSERT INTO `pms_product_attribute_value` VALUES ('228', '26', '43', '金色,银色');
+INSERT INTO `pms_product_attribute_value` VALUES ('229', '26', '45', '5.0');
+INSERT INTO `pms_product_attribute_value` VALUES ('230', '26', '46', '4G');
+INSERT INTO `pms_product_attribute_value` VALUES ('231', '26', '47', 'Android');
+INSERT INTO `pms_product_attribute_value` VALUES ('232', '26', '48', '3000');
 
 -- ----------------------------
 -- Table structure for pms_product_category
@@ -1083,7 +1096,7 @@ CREATE TABLE `pms_product_category` (
   `keywords` varchar(255) DEFAULT NULL,
   `description` text COMMENT '描述',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=52 DEFAULT CHARSET=utf8 COMMENT='产品分类';
+) ENGINE=InnoDB AUTO_INCREMENT=53 DEFAULT CHARSET=utf8 COMMENT='产品分类';
 
 -- ----------------------------
 -- Records of pms_product_category
@@ -1155,7 +1168,7 @@ CREATE TABLE `pms_product_full_reduction` (
   `full_price` decimal(10,2) DEFAULT NULL,
   `reduce_price` decimal(10,2) DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=63 DEFAULT CHARSET=utf8 COMMENT='产品满减表(只针对同商品)';
+) ENGINE=InnoDB AUTO_INCREMENT=80 DEFAULT CHARSET=utf8 COMMENT='产品满减表(只针对同商品)';
 
 -- ----------------------------
 -- Records of pms_product_full_reduction
@@ -1177,15 +1190,15 @@ INSERT INTO `pms_product_full_reduction` VALUES ('34', '23', '0.00', '0.00');
 INSERT INTO `pms_product_full_reduction` VALUES ('44', '31', '0.00', '0.00');
 INSERT INTO `pms_product_full_reduction` VALUES ('46', '32', '0.00', '0.00');
 INSERT INTO `pms_product_full_reduction` VALUES ('48', '33', '0.00', '0.00');
-INSERT INTO `pms_product_full_reduction` VALUES ('53', '36', '0.00', '0.00');
-INSERT INTO `pms_product_full_reduction` VALUES ('54', '35', '0.00', '0.00');
 INSERT INTO `pms_product_full_reduction` VALUES ('55', '34', '0.00', '0.00');
 INSERT INTO `pms_product_full_reduction` VALUES ('56', '30', '0.00', '0.00');
-INSERT INTO `pms_product_full_reduction` VALUES ('57', '26', '0.00', '0.00');
 INSERT INTO `pms_product_full_reduction` VALUES ('59', '27', '0.00', '0.00');
 INSERT INTO `pms_product_full_reduction` VALUES ('60', '28', '500.00', '50.00');
 INSERT INTO `pms_product_full_reduction` VALUES ('61', '28', '1000.00', '120.00');
 INSERT INTO `pms_product_full_reduction` VALUES ('62', '29', '0.00', '0.00');
+INSERT INTO `pms_product_full_reduction` VALUES ('63', '26', '0.00', '0.00');
+INSERT INTO `pms_product_full_reduction` VALUES ('78', '36', '0.00', '0.00');
+INSERT INTO `pms_product_full_reduction` VALUES ('79', '35', '0.00', '0.00');
 
 -- ----------------------------
 -- Table structure for pms_product_ladder
@@ -1198,7 +1211,7 @@ CREATE TABLE `pms_product_ladder` (
   `discount` decimal(10,2) DEFAULT NULL COMMENT '折扣',
   `price` decimal(10,2) DEFAULT NULL COMMENT '折后价格',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=68 DEFAULT CHARSET=utf8 COMMENT='产品阶梯价格表(只针对同商品)';
+) ENGINE=InnoDB AUTO_INCREMENT=85 DEFAULT CHARSET=utf8 COMMENT='产品阶梯价格表(只针对同商品)';
 
 -- ----------------------------
 -- Records of pms_product_ladder
@@ -1220,15 +1233,15 @@ INSERT INTO `pms_product_ladder` VALUES ('38', '23', '0', '0.00', '0.00');
 INSERT INTO `pms_product_ladder` VALUES ('48', '31', '0', '0.00', '0.00');
 INSERT INTO `pms_product_ladder` VALUES ('50', '32', '0', '0.00', '0.00');
 INSERT INTO `pms_product_ladder` VALUES ('52', '33', '0', '0.00', '0.00');
-INSERT INTO `pms_product_ladder` VALUES ('57', '36', '0', '0.00', '0.00');
-INSERT INTO `pms_product_ladder` VALUES ('58', '35', '0', '0.00', '0.00');
 INSERT INTO `pms_product_ladder` VALUES ('59', '34', '0', '0.00', '0.00');
 INSERT INTO `pms_product_ladder` VALUES ('60', '30', '0', '0.00', '0.00');
-INSERT INTO `pms_product_ladder` VALUES ('61', '26', '0', '0.00', '0.00');
 INSERT INTO `pms_product_ladder` VALUES ('64', '27', '2', '0.80', '0.00');
 INSERT INTO `pms_product_ladder` VALUES ('65', '27', '3', '0.75', '0.00');
 INSERT INTO `pms_product_ladder` VALUES ('66', '28', '0', '0.00', '0.00');
 INSERT INTO `pms_product_ladder` VALUES ('67', '29', '0', '0.00', '0.00');
+INSERT INTO `pms_product_ladder` VALUES ('68', '26', '0', '0.00', '0.00');
+INSERT INTO `pms_product_ladder` VALUES ('83', '36', '0', '0.00', '0.00');
+INSERT INTO `pms_product_ladder` VALUES ('84', '35', '0', '0.00', '0.00');
 
 -- ----------------------------
 -- Table structure for pms_product_operate_log
@@ -1285,52 +1298,49 @@ CREATE TABLE `pms_sku_stock` (
   `price` decimal(10,2) DEFAULT NULL,
   `stock` int(11) DEFAULT '0' COMMENT '库存',
   `low_stock` int(11) DEFAULT NULL COMMENT '预警库存',
-  `sp1` varchar(64) DEFAULT NULL COMMENT '销售属性1',
-  `sp2` varchar(64) DEFAULT NULL,
-  `sp3` varchar(64) DEFAULT NULL,
   `pic` varchar(255) DEFAULT NULL COMMENT '展示图片',
   `sale` int(11) DEFAULT NULL COMMENT '销量',
   `promotion_price` decimal(10,2) DEFAULT NULL COMMENT '单品促销价格',
   `lock_stock` int(11) DEFAULT '0' COMMENT '锁定库存',
+  `sp_data` varchar(500) DEFAULT NULL COMMENT '商品销售属性，json格式',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=110 DEFAULT CHARSET=utf8 COMMENT='sku的库存';
+) ENGINE=InnoDB AUTO_INCREMENT=179 DEFAULT CHARSET=utf8 COMMENT='sku的库存';
 
 -- ----------------------------
 -- Records of pms_sku_stock
 -- ----------------------------
-INSERT INTO `pms_sku_stock` VALUES ('1', '7', 'string', '100.00', '0', '5', 'string', 'string', 'string', 'string', '0', null, '0');
-INSERT INTO `pms_sku_stock` VALUES ('2', '8', 'string', '100.00', '0', '5', 'string', 'string', 'string', 'string', '0', null, '0');
-INSERT INTO `pms_sku_stock` VALUES ('3', '9', 'string', '100.00', '0', '5', 'string', 'string', 'string', 'string', '0', null, '0');
-INSERT INTO `pms_sku_stock` VALUES ('4', '10', 'string', '100.00', '0', '5', 'string', 'string', 'string', 'string', '0', null, '0');
-INSERT INTO `pms_sku_stock` VALUES ('5', '11', 'string', '100.00', '0', '5', 'string', 'string', 'string', 'string', '0', null, '0');
-INSERT INTO `pms_sku_stock` VALUES ('6', '12', 'string', '100.00', '0', '5', 'string', 'string', 'string', 'string', '0', null, '0');
-INSERT INTO `pms_sku_stock` VALUES ('7', '13', 'string', '100.00', '0', '5', 'string', 'string', 'string', 'string', '0', null, '0');
-INSERT INTO `pms_sku_stock` VALUES ('8', '14', 'string', '100.00', '0', '5', 'string', 'string', 'string', 'string', '0', null, '0');
-INSERT INTO `pms_sku_stock` VALUES ('9', '18', 'string', '100.00', '0', '5', 'string', 'string', 'string', 'string', '0', null, '0');
-INSERT INTO `pms_sku_stock` VALUES ('10', '7', 'string', '0.00', '0', '0', 'string', 'string', 'sp3', 'string', '0', null, '0');
-INSERT INTO `pms_sku_stock` VALUES ('11', '7', 'string', '0.00', '0', '0', 'string', 'string', 'sp33', 'string', '0', null, '0');
-INSERT INTO `pms_sku_stock` VALUES ('12', '22', '111', '99.00', '0', null, 'x', 'M', null, 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180604/1522738681.jpg', null, null, '0');
-INSERT INTO `pms_sku_stock` VALUES ('13', '22', '112', '99.00', '0', null, 'xx', 'M', null, 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180604/2018032614134591_20180326141345650 (4).png', null, null, '0');
-INSERT INTO `pms_sku_stock` VALUES ('78', '23', '201806070023001', '99.00', '0', null, '米白色', 'M', null, 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180604/1522738681.jpg', null, null, '0');
-INSERT INTO `pms_sku_stock` VALUES ('79', '23', '201806070023002', '99.00', '0', null, '米白色', 'X', null, 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180604/1522738681.jpg', null, null, '0');
-INSERT INTO `pms_sku_stock` VALUES ('80', '23', '201806070023003', '99.00', '0', null, '浅黄色', 'M', null, 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180604/2017091716493787_20170917164937650 (1).png', null, null, '0');
-INSERT INTO `pms_sku_stock` VALUES ('81', '23', '201806070023004', '99.00', '0', null, '浅黄色', 'X', null, 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180604/2017091716493787_20170917164937650 (1).png', null, null, '0');
-INSERT INTO `pms_sku_stock` VALUES ('90', '26', '201806070026001', '3788.00', '499', null, '金色', '16G', null, null, null, '3588.00', '-8');
-INSERT INTO `pms_sku_stock` VALUES ('91', '26', '201806070026002', '3999.00', '500', null, '金色', '32G', null, null, null, '3799.00', '0');
-INSERT INTO `pms_sku_stock` VALUES ('92', '26', '201806070026003', '3788.00', '500', null, '银色', '16G', null, null, null, '3588.00', '0');
-INSERT INTO `pms_sku_stock` VALUES ('93', '26', '201806070026004', '3999.00', '500', null, '银色', '32G', null, null, null, '3799.00', '0');
-INSERT INTO `pms_sku_stock` VALUES ('98', '27', '201808270027001', '2699.00', '97', null, '黑色', '32G', null, null, null, null, '-24');
-INSERT INTO `pms_sku_stock` VALUES ('99', '27', '201808270027002', '2999.00', '100', null, '黑色', '64G', null, null, null, null, '0');
-INSERT INTO `pms_sku_stock` VALUES ('100', '27', '201808270027003', '2699.00', '100', null, '蓝色', '32G', null, null, null, null, '0');
-INSERT INTO `pms_sku_stock` VALUES ('101', '27', '201808270027004', '2999.00', '100', null, '蓝色', '64G', null, null, null, null, '0');
-INSERT INTO `pms_sku_stock` VALUES ('102', '28', '201808270028001', '649.00', '99', null, '金色', '16G', null, null, null, null, '-8');
-INSERT INTO `pms_sku_stock` VALUES ('103', '28', '201808270028002', '699.00', '99', null, '金色', '32G', null, null, null, null, '-8');
-INSERT INTO `pms_sku_stock` VALUES ('104', '28', '201808270028003', '649.00', '100', null, '银色', '16G', null, null, null, null, '0');
-INSERT INTO `pms_sku_stock` VALUES ('105', '28', '201808270028004', '699.00', '100', null, '银色', '32G', null, null, null, null, '0');
-INSERT INTO `pms_sku_stock` VALUES ('106', '29', '201808270029001', '5499.00', '99', null, '金色', '32G', null, null, null, null, '-8');
-INSERT INTO `pms_sku_stock` VALUES ('107', '29', '201808270029002', '6299.00', '100', null, '金色', '64G', null, null, null, null, '0');
-INSERT INTO `pms_sku_stock` VALUES ('108', '29', '201808270029003', '5499.00', '100', null, '银色', '32G', null, null, null, null, '0');
-INSERT INTO `pms_sku_stock` VALUES ('109', '29', '201808270029004', '6299.00', '100', null, '银色', '64G', null, null, null, null, '0');
+INSERT INTO `pms_sku_stock` VALUES ('98', '27', '201808270027001', '2699.00', '97', null, null, null, null, '-24', '[{\"key\":\"颜色\",\"value\":\"黑色\"},{\"key\":\"容量\",\"value\":\"32G\"}]');
+INSERT INTO `pms_sku_stock` VALUES ('99', '27', '201808270027002', '2999.00', '100', null, null, null, null, '0', '[{\"key\":\"颜色\",\"value\":\"黑色\"},{\"key\":\"容量\",\"value\":\"64G\"}]');
+INSERT INTO `pms_sku_stock` VALUES ('100', '27', '201808270027003', '2699.00', '100', null, null, null, null, '0', '[{\"key\":\"颜色\",\"value\":\"蓝色\"},{\"key\":\"容量\",\"value\":\"32G\"}]');
+INSERT INTO `pms_sku_stock` VALUES ('101', '27', '201808270027004', '2999.00', '100', null, null, null, null, '0', '[{\"key\":\"颜色\",\"value\":\"蓝色\"},{\"key\":\"容量\",\"value\":\"64G\"}]');
+INSERT INTO `pms_sku_stock` VALUES ('102', '28', '201808270028001', '649.00', '99', null, null, null, null, '-8', '[{\"key\":\"颜色\",\"value\":\"金色\"},{\"key\":\"容量\",\"value\":\"16G\"}]');
+INSERT INTO `pms_sku_stock` VALUES ('103', '28', '201808270028002', '699.00', '99', null, null, null, null, '-8', '[{\"key\":\"颜色\",\"value\":\"金色\"},{\"key\":\"容量\",\"value\":\"32G\"}]');
+INSERT INTO `pms_sku_stock` VALUES ('104', '28', '201808270028003', '649.00', '100', null, null, null, null, '0', '[{\"key\":\"颜色\",\"value\":\"银色\"},{\"key\":\"容量\",\"value\":\"16G\"}]');
+INSERT INTO `pms_sku_stock` VALUES ('105', '28', '201808270028004', '699.00', '100', null, null, null, null, '0', '[{\"key\":\"颜色\",\"value\":\"银色\"},{\"key\":\"容量\",\"value\":\"32G\"}]');
+INSERT INTO `pms_sku_stock` VALUES ('106', '29', '201808270029001', '5499.00', '99', null, null, null, null, '-8', '[{\"key\":\"颜色\",\"value\":\"金色\"},{\"key\":\"容量\",\"value\":\"32G\"}]');
+INSERT INTO `pms_sku_stock` VALUES ('107', '29', '201808270029002', '6299.00', '100', null, null, null, null, '0', '[{\"key\":\"颜色\",\"value\":\"金色\"},{\"key\":\"容量\",\"value\":\"64G\"}]');
+INSERT INTO `pms_sku_stock` VALUES ('108', '29', '201808270029003', '5499.00', '100', null, null, null, null, '0', '[{\"key\":\"颜色\",\"value\":\"银色\"},{\"key\":\"容量\",\"value\":\"32G\"}]');
+INSERT INTO `pms_sku_stock` VALUES ('109', '29', '201808270029004', '6299.00', '100', null, null, null, null, '0', '[{\"key\":\"颜色\",\"value\":\"银色\"},{\"key\":\"容量\",\"value\":\"64G\"}]');
+INSERT INTO `pms_sku_stock` VALUES ('110', '26', '201806070026001', '3788.00', '499', null, null, null, null, '0', '[{\"key\":\"颜色\",\"value\":\"金色\"},{\"key\":\"容量\",\"value\":\"16G\"}]');
+INSERT INTO `pms_sku_stock` VALUES ('111', '26', '201806070026002', '3999.00', '500', null, null, null, null, '0', '[{\"key\":\"颜色\",\"value\":\"金色\"},{\"key\":\"容量\",\"value\":\"32G\"}]');
+INSERT INTO `pms_sku_stock` VALUES ('112', '26', '201806070026003', '3788.00', '500', null, null, null, null, '0', '[{\"key\":\"颜色\",\"value\":\"银色\"},{\"key\":\"容量\",\"value\":\"16G\"}]');
+INSERT INTO `pms_sku_stock` VALUES ('113', '26', '201806070026004', '3999.00', '500', null, null, null, null, '0', '[{\"key\":\"颜色\",\"value\":\"银色\"},{\"key\":\"容量\",\"value\":\"32G\"}]');
+INSERT INTO `pms_sku_stock` VALUES ('163', '36', '202002210036001', '100.00', '100', '25', null, null, null, '9', '[{\"key\":\"颜色\",\"value\":\"红色\"},{\"key\":\"尺寸\",\"value\":\"38\"},{\"key\":\"风格\",\"value\":\"秋季\"}]');
+INSERT INTO `pms_sku_stock` VALUES ('164', '36', '202002210036002', '120.00', '98', '20', null, null, null, '6', '[{\"key\":\"颜色\",\"value\":\"红色\"},{\"key\":\"尺寸\",\"value\":\"38\"},{\"key\":\"风格\",\"value\":\"夏季\"}]');
+INSERT INTO `pms_sku_stock` VALUES ('165', '36', '202002210036003', '100.00', '100', '20', null, null, null, '0', '[{\"key\":\"颜色\",\"value\":\"红色\"},{\"key\":\"尺寸\",\"value\":\"39\"},{\"key\":\"风格\",\"value\":\"秋季\"}]');
+INSERT INTO `pms_sku_stock` VALUES ('166', '36', '202002210036004', '100.00', '100', '20', null, null, null, '0', '[{\"key\":\"颜色\",\"value\":\"红色\"},{\"key\":\"尺寸\",\"value\":\"39\"},{\"key\":\"风格\",\"value\":\"夏季\"}]');
+INSERT INTO `pms_sku_stock` VALUES ('167', '36', '202002210036005', '100.00', '100', '20', null, null, null, '0', '[{\"key\":\"颜色\",\"value\":\"蓝色\"},{\"key\":\"尺寸\",\"value\":\"38\"},{\"key\":\"风格\",\"value\":\"秋季\"}]');
+INSERT INTO `pms_sku_stock` VALUES ('168', '36', '202002210036006', '100.00', '100', '20', null, null, null, '0', '[{\"key\":\"颜色\",\"value\":\"蓝色\"},{\"key\":\"尺寸\",\"value\":\"38\"},{\"key\":\"风格\",\"value\":\"夏季\"}]');
+INSERT INTO `pms_sku_stock` VALUES ('169', '36', '202002210036007', '100.00', '100', '20', null, null, null, '0', '[{\"key\":\"颜色\",\"value\":\"蓝色\"},{\"key\":\"尺寸\",\"value\":\"39\"},{\"key\":\"风格\",\"value\":\"秋季\"}]');
+INSERT INTO `pms_sku_stock` VALUES ('170', '36', '202002210036008', '100.00', '100', '20', null, null, null, '0', '[{\"key\":\"颜色\",\"value\":\"蓝色\"},{\"key\":\"尺寸\",\"value\":\"39\"},{\"key\":\"风格\",\"value\":\"夏季\"}]');
+INSERT INTO `pms_sku_stock` VALUES ('171', '35', '202002250035001', '200.00', '100', '50', null, null, null, '0', '[{\"key\":\"颜色\",\"value\":\"红色\"},{\"key\":\"尺寸\",\"value\":\"38\"},{\"key\":\"风格\",\"value\":\"夏季\"}]');
+INSERT INTO `pms_sku_stock` VALUES ('172', '35', '202002250035002', '240.00', '100', '50', null, null, null, '0', '[{\"key\":\"颜色\",\"value\":\"红色\"},{\"key\":\"尺寸\",\"value\":\"38\"},{\"key\":\"风格\",\"value\":\"秋季\"}]');
+INSERT INTO `pms_sku_stock` VALUES ('173', '35', '202002250035003', '200.00', '100', '50', null, null, null, '0', '[{\"key\":\"颜色\",\"value\":\"红色\"},{\"key\":\"尺寸\",\"value\":\"39\"},{\"key\":\"风格\",\"value\":\"夏季\"}]');
+INSERT INTO `pms_sku_stock` VALUES ('174', '35', '202002250035004', '200.00', '100', '50', null, null, null, '0', '[{\"key\":\"颜色\",\"value\":\"红色\"},{\"key\":\"尺寸\",\"value\":\"39\"},{\"key\":\"风格\",\"value\":\"秋季\"}]');
+INSERT INTO `pms_sku_stock` VALUES ('175', '35', '202002250035005', '200.00', '100', '50', null, null, null, '0', '[{\"key\":\"颜色\",\"value\":\"蓝色\"},{\"key\":\"尺寸\",\"value\":\"38\"},{\"key\":\"风格\",\"value\":\"夏季\"}]');
+INSERT INTO `pms_sku_stock` VALUES ('176', '35', '202002250035006', '200.00', '100', '50', null, null, null, '0', '[{\"key\":\"颜色\",\"value\":\"蓝色\"},{\"key\":\"尺寸\",\"value\":\"38\"},{\"key\":\"风格\",\"value\":\"秋季\"}]');
+INSERT INTO `pms_sku_stock` VALUES ('177', '35', '202002250035007', '200.00', '100', '50', null, null, null, '0', '[{\"key\":\"颜色\",\"value\":\"蓝色\"},{\"key\":\"尺寸\",\"value\":\"39\"},{\"key\":\"风格\",\"value\":\"夏季\"}]');
+INSERT INTO `pms_sku_stock` VALUES ('178', '35', '202002250035008', '200.00', '100', '50', null, null, null, '0', '[{\"key\":\"颜色\",\"value\":\"蓝色\"},{\"key\":\"尺寸\",\"value\":\"39\"},{\"key\":\"风格\",\"value\":\"秋季\"}]');
 
 -- ----------------------------
 -- Table structure for sms_coupon
@@ -1713,7 +1723,7 @@ CREATE TABLE `ums_admin` (
   `login_time` datetime DEFAULT NULL COMMENT '最后登录时间',
   `status` int(1) DEFAULT '1' COMMENT '帐号启用状态：0->禁用；1->启用',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8 COMMENT='后台用户表';
+) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8 COMMENT='后台用户表';
 
 -- ----------------------------
 -- Records of ums_admin
@@ -1736,7 +1746,7 @@ CREATE TABLE `ums_admin_login_log` (
   `address` varchar(100) DEFAULT NULL,
   `user_agent` varchar(100) DEFAULT NULL COMMENT '浏览器登录类型',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=192 DEFAULT CHARSET=utf8 COMMENT='后台用户登录日志表';
+) ENGINE=InnoDB AUTO_INCREMENT=196 DEFAULT CHARSET=utf8 COMMENT='后台用户登录日志表';
 
 -- ----------------------------
 -- Records of ums_admin_login_log
@@ -1923,15 +1933,19 @@ INSERT INTO `ums_admin_login_log` VALUES ('179', '3', '2020-02-10 11:10:02', '0:
 INSERT INTO `ums_admin_login_log` VALUES ('180', '6', '2020-02-10 14:25:17', '0:0:0:0:0:0:0:1', null, null);
 INSERT INTO `ums_admin_login_log` VALUES ('181', '6', '2020-02-10 14:29:14', '0:0:0:0:0:0:0:1', null, null);
 INSERT INTO `ums_admin_login_log` VALUES ('182', '3', '2020-02-10 16:09:16', '0:0:0:0:0:0:0:1', null, null);
-INSERT INTO `ums_admin_login_log` VALUES ('183', '3', '2020-02-12 10:13:26', '0:0:0:0:0:0:0:1', null, null);
-INSERT INTO `ums_admin_login_log` VALUES ('184', '4', '2020-02-12 10:16:20', '0:0:0:0:0:0:0:1', null, null);
-INSERT INTO `ums_admin_login_log` VALUES ('185', '3', '2020-02-12 10:39:25', '0:0:0:0:0:0:0:1', null, null);
-INSERT INTO `ums_admin_login_log` VALUES ('186', '6', '2020-02-12 14:49:06', '0:0:0:0:0:0:0:1', null, null);
-INSERT INTO `ums_admin_login_log` VALUES ('187', '3', '2020-02-12 14:51:09', '0:0:0:0:0:0:0:1', null, null);
-INSERT INTO `ums_admin_login_log` VALUES ('188', '6', '2020-02-12 14:51:50', '0:0:0:0:0:0:0:1', null, null);
-INSERT INTO `ums_admin_login_log` VALUES ('189', '3', '2020-02-12 14:56:53', '0:0:0:0:0:0:0:1', null, null);
-INSERT INTO `ums_admin_login_log` VALUES ('190', '6', '2020-02-12 14:57:20', '0:0:0:0:0:0:0:1', null, null);
-INSERT INTO `ums_admin_login_log` VALUES ('191', '3', '2020-02-14 10:41:49', '0:0:0:0:0:0:0:1', null, null);
+INSERT INTO `ums_admin_login_log` VALUES ('183', '3', '2020-02-20 14:39:19', '0:0:0:0:0:0:0:1', null, null);
+INSERT INTO `ums_admin_login_log` VALUES ('184', '8', '2020-02-20 17:14:58', '0:0:0:0:0:0:0:1', null, null);
+INSERT INTO `ums_admin_login_log` VALUES ('185', '8', '2020-02-20 17:17:04', '0:0:0:0:0:0:0:1', null, null);
+INSERT INTO `ums_admin_login_log` VALUES ('186', '8', '2020-02-20 17:17:42', '0:0:0:0:0:0:0:1', null, null);
+INSERT INTO `ums_admin_login_log` VALUES ('187', '8', '2020-02-21 10:26:56', '0:0:0:0:0:0:0:1', null, null);
+INSERT INTO `ums_admin_login_log` VALUES ('188', '8', '2020-02-21 10:28:54', '0:0:0:0:0:0:0:1', null, null);
+INSERT INTO `ums_admin_login_log` VALUES ('189', '8', '2020-02-21 10:32:25', '0:0:0:0:0:0:0:1', null, null);
+INSERT INTO `ums_admin_login_log` VALUES ('190', '8', '2020-02-21 10:33:41', '0:0:0:0:0:0:0:1', null, null);
+INSERT INTO `ums_admin_login_log` VALUES ('191', '8', '2020-02-21 10:35:58', '0:0:0:0:0:0:0:1', null, null);
+INSERT INTO `ums_admin_login_log` VALUES ('192', '8', '2020-02-21 10:36:49', '0:0:0:0:0:0:0:1', null, null);
+INSERT INTO `ums_admin_login_log` VALUES ('193', '3', '2020-02-21 11:10:11', '0:0:0:0:0:0:0:1', null, null);
+INSERT INTO `ums_admin_login_log` VALUES ('194', '3', '2020-02-25 16:11:13', '0:0:0:0:0:0:0:1', null, null);
+INSERT INTO `ums_admin_login_log` VALUES ('195', '3', '2020-02-25 16:46:29', '0:0:0:0:0:0:0:1', null, null);
 
 -- ----------------------------
 -- Table structure for ums_admin_permission_relation
@@ -1958,7 +1972,7 @@ CREATE TABLE `ums_admin_role_relation` (
   `admin_id` bigint(20) DEFAULT NULL,
   `role_id` bigint(20) DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=32 DEFAULT CHARSET=utf8 COMMENT='后台用户和角色关系表';
+) ENGINE=InnoDB AUTO_INCREMENT=31 DEFAULT CHARSET=utf8 COMMENT='后台用户和角色关系表';
 
 -- ----------------------------
 -- Records of ums_admin_role_relation
@@ -1967,7 +1981,7 @@ INSERT INTO `ums_admin_role_relation` VALUES ('26', '3', '5');
 INSERT INTO `ums_admin_role_relation` VALUES ('27', '6', '1');
 INSERT INTO `ums_admin_role_relation` VALUES ('28', '7', '2');
 INSERT INTO `ums_admin_role_relation` VALUES ('29', '1', '5');
-INSERT INTO `ums_admin_role_relation` VALUES ('31', '4', '6');
+INSERT INTO `ums_admin_role_relation` VALUES ('30', '4', '5');
 
 -- ----------------------------
 -- Table structure for ums_growth_change_history
@@ -2393,7 +2407,7 @@ CREATE TABLE `ums_resource_category` (
   `name` varchar(200) DEFAULT NULL COMMENT '分类名称',
   `sort` int(4) DEFAULT NULL COMMENT '排序',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8 COMMENT='资源分类表';
+) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8 COMMENT='资源分类表';
 
 -- ----------------------------
 -- Records of ums_resource_category
@@ -2418,7 +2432,7 @@ CREATE TABLE `ums_role` (
   `status` int(1) DEFAULT '1' COMMENT '启用状态：0->禁用；1->启用',
   `sort` int(11) DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8 COMMENT='后台用户角色表';
+) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8 COMMENT='后台用户角色表';
 
 -- ----------------------------
 -- Records of ums_role
@@ -2426,7 +2440,6 @@ CREATE TABLE `ums_role` (
 INSERT INTO `ums_role` VALUES ('1', '商品管理员', '只能查看及操作商品', '0', '2020-02-03 16:50:37', '1', '0');
 INSERT INTO `ums_role` VALUES ('2', '订单管理员', '只能查看及操作订单', '0', '2018-09-30 15:53:45', '1', '0');
 INSERT INTO `ums_role` VALUES ('5', '超级管理员', '拥有所有查看和操作功能', '0', '2020-02-02 15:11:05', '1', '0');
-INSERT INTO `ums_role` VALUES ('6', '测试角色', '仅供测试', '0', '2020-02-12 10:14:09', '1', '0');
 
 -- ----------------------------
 -- Table structure for ums_role_menu_relation
@@ -2437,11 +2450,17 @@ CREATE TABLE `ums_role_menu_relation` (
   `role_id` bigint(20) DEFAULT NULL COMMENT '角色ID',
   `menu_id` bigint(20) DEFAULT NULL COMMENT '菜单ID',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=113 DEFAULT CHARSET=utf8 COMMENT='后台角色菜单关系表';
+) ENGINE=InnoDB AUTO_INCREMENT=96 DEFAULT CHARSET=utf8 COMMENT='后台角色菜单关系表';
 
 -- ----------------------------
 -- Records of ums_role_menu_relation
 -- ----------------------------
+INSERT INTO `ums_role_menu_relation` VALUES ('33', '1', '1');
+INSERT INTO `ums_role_menu_relation` VALUES ('34', '1', '2');
+INSERT INTO `ums_role_menu_relation` VALUES ('35', '1', '3');
+INSERT INTO `ums_role_menu_relation` VALUES ('36', '1', '4');
+INSERT INTO `ums_role_menu_relation` VALUES ('37', '1', '5');
+INSERT INTO `ums_role_menu_relation` VALUES ('38', '1', '6');
 INSERT INTO `ums_role_menu_relation` VALUES ('53', '2', '7');
 INSERT INTO `ums_role_menu_relation` VALUES ('54', '2', '8');
 INSERT INTO `ums_role_menu_relation` VALUES ('55', '2', '9');
@@ -2471,12 +2490,6 @@ INSERT INTO `ums_role_menu_relation` VALUES ('92', '5', '22');
 INSERT INTO `ums_role_menu_relation` VALUES ('93', '5', '23');
 INSERT INTO `ums_role_menu_relation` VALUES ('94', '5', '24');
 INSERT INTO `ums_role_menu_relation` VALUES ('95', '5', '25');
-INSERT INTO `ums_role_menu_relation` VALUES ('107', '1', '1');
-INSERT INTO `ums_role_menu_relation` VALUES ('108', '1', '2');
-INSERT INTO `ums_role_menu_relation` VALUES ('109', '1', '3');
-INSERT INTO `ums_role_menu_relation` VALUES ('110', '1', '4');
-INSERT INTO `ums_role_menu_relation` VALUES ('111', '1', '5');
-INSERT INTO `ums_role_menu_relation` VALUES ('112', '1', '6');
 
 -- ----------------------------
 -- Table structure for ums_role_permission_relation
@@ -2519,7 +2532,7 @@ CREATE TABLE `ums_role_resource_relation` (
   `role_id` bigint(20) DEFAULT NULL COMMENT '角色ID',
   `resource_id` bigint(20) DEFAULT NULL COMMENT '资源ID',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=184 DEFAULT CHARSET=utf8 COMMENT='后台角色资源关系表';
+) ENGINE=InnoDB AUTO_INCREMENT=178 DEFAULT CHARSET=utf8 COMMENT='后台角色资源关系表';
 
 -- ----------------------------
 -- Records of ums_role_resource_relation

mall-admin/src/main/java/com/macro/mall/service/impl/PmsProductServiceImpl.java

@@ -1,5 +1,6 @@
 package com.macro.mall.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import com.github.pagehelper.PageHelper;
 import com.macro.mall.dao.*;
 import com.macro.mall.dto.PmsProductParam;
@@ -8,7 +9,6 @@ import com.macro.mall.dto.PmsProductResult;
 import com.macro.mall.mapper.*;
 import com.macro.mall.model.*;
 import com.macro.mall.service.PmsProductService;
-import io.swagger.annotations.Example;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,6 +21,7 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 商品管理Service实现类
@@ -71,7 +72,7 @@ public class PmsProductServiceImpl implements PmsProductService {
         PmsProduct product = productParam;
         product.setId(null);
         productMapper.insertSelective(product);
-        //根据促销类型设置价格：、阶梯价格、满减价格
+        //根据促销类型设置价格：会员价格、阶梯价格、满减价格
         Long productId = product.getId();
         //会员价格
         relateAndInsertList(memberPriceDao, productParam.getMemberPriceList(), productId);
@@ -139,11 +140,7 @@ public class PmsProductServiceImpl implements PmsProductService {
         productFullReductionMapper.deleteByExample(fullReductionExample);
         relateAndInsertList(productFullReductionDao, productParam.getProductFullReductionList(), id);
         //修改sku库存信息
-        PmsSkuStockExample skuStockExample = new PmsSkuStockExample();
-        skuStockExample.createCriteria().andProductIdEqualTo(id);
-        skuStockMapper.deleteByExample(skuStockExample);
-        handleSkuStockCode(productParam.getSkuStockList(),id);
-        relateAndInsertList(skuStockDao, productParam.getSkuStockList(), id);
+        handleUpdateSkuStockList(id, productParam);
         //修改商品参数,添加自定义商品规格
         PmsProductAttributeValueExample productAttributeValueExample = new PmsProductAttributeValueExample();
         productAttributeValueExample.createCriteria().andProductIdEqualTo(id);
@@ -163,6 +160,49 @@ public class PmsProductServiceImpl implements PmsProductService {
         return count;
     }
 
+    private void handleUpdateSkuStockList(Long id, PmsProductParam productParam) {
+        //当前的sku信息
+        List<PmsSkuStock> currSkuList = productParam.getSkuStockList();
+        //当前没有sku直接删除
+        if(CollUtil.isEmpty(currSkuList)){
+            PmsSkuStockExample skuStockExample = new PmsSkuStockExample();
+            skuStockExample.createCriteria().andProductIdEqualTo(id);
+            skuStockMapper.deleteByExample(skuStockExample);
+            return;
+        }
+        //获取初始sku信息
+        PmsSkuStockExample skuStockExample = new PmsSkuStockExample();
+        skuStockExample.createCriteria().andProductIdEqualTo(id);
+        List<PmsSkuStock> oriStuList = skuStockMapper.selectByExample(skuStockExample);
+        //获取新增sku信息
+        List<PmsSkuStock> insertSkuList = currSkuList.stream().filter(item->item.getId()==null).collect(Collectors.toList());
+        //获取需要更新的sku信息
+        List<PmsSkuStock> updateSkuList = currSkuList.stream().filter(item->item.getId()!=null).collect(Collectors.toList());
+        List<Long> updateSkuIds = updateSkuList.stream().map(PmsSkuStock::getId).collect(Collectors.toList());
+        //获取需要删除的sku信息
+        List<PmsSkuStock> removeSkuList = oriStuList.stream().filter(item-> !updateSkuIds.contains(item.getId())).collect(Collectors.toList());
+        handleSkuStockCode(insertSkuList,id);
+        handleSkuStockCode(updateSkuList,id);
+        //新增sku
+        if(CollUtil.isNotEmpty(insertSkuList)){
+            relateAndInsertList(skuStockDao, insertSkuList, id);
+        }
+        //删除sku
+        if(CollUtil.isNotEmpty(removeSkuList)){
+            List<Long> removeSkuIds = removeSkuList.stream().map(PmsSkuStock::getId).collect(Collectors.toList());
+            PmsSkuStockExample removeExample = new PmsSkuStockExample();
+            removeExample.createCriteria().andIdIn(removeSkuIds);
+            skuStockMapper.deleteByExample(removeExample);
+        }
+        //修改sku
+        if(CollUtil.isNotEmpty(updateSkuList)){
+            for (PmsSkuStock pmsSkuStock : updateSkuList) {
+                skuStockMapper.updateByPrimaryKeySelective(pmsSkuStock);
+            }
+        }
+
+    }
+
     @Override
     public List<PmsProduct> list(PmsProductQueryParam productQueryParam, Integer pageSize, Integer pageNum) {
         PageHelper.startPage(pageNum, pageSize);
@@ -260,70 +300,6 @@ public class PmsProductServiceImpl implements PmsProductService {
         return productMapper.selectByExample(productExample);
     }
 
-    /**
-     * @deprecated 旧版创建
-     */
-    public int createOld(PmsProductParam productParam) {
-        int count;
-        //创建商品
-        PmsProduct product = productParam;
-        product.setId(null);
-        productMapper.insertSelective(product);
-        //根据促销类型设置价格：、阶梯价格、满减价格
-        Long productId = product.getId();
-        //会员价格
-        List<PmsMemberPrice> memberPriceList = productParam.getMemberPriceList();
-        if (!CollectionUtils.isEmpty(memberPriceList)) {
-            for (PmsMemberPrice pmsMemberPrice : memberPriceList) {
-                pmsMemberPrice.setId(null);
-                pmsMemberPrice.setProductId(productId);
-            }
-            memberPriceDao.insertList(memberPriceList);
-        }
-        //阶梯价格
-        List<PmsProductLadder> productLadderList = productParam.getProductLadderList();
-        if (!CollectionUtils.isEmpty(productLadderList)) {
-            for (PmsProductLadder productLadder : productLadderList) {
-                productLadder.setId(null);
-                productLadder.setProductId(productId);
-            }
-            productLadderDao.insertList(productLadderList);
-        }
-        //满减价格
-        List<PmsProductFullReduction> productFullReductionList = productParam.getProductFullReductionList();
-        if (!CollectionUtils.isEmpty(productFullReductionList)) {
-            for (PmsProductFullReduction productFullReduction : productFullReductionList) {
-                productFullReduction.setId(null);
-                productFullReduction.setProductId(productId);
-            }
-            productFullReductionDao.insertList(productFullReductionList);
-        }
-        //添加sku库存信息
-        List<PmsSkuStock> skuStockList = productParam.getSkuStockList();
-        if (!CollectionUtils.isEmpty(skuStockList)) {
-            for (PmsSkuStock skuStock : skuStockList) {
-                skuStock.setId(null);
-                skuStock.setProductId(productId);
-            }
-            skuStockDao.insertList(skuStockList);
-        }
-        //添加商品参数,添加自定义商品规格
-        List<PmsProductAttributeValue> productAttributeValueList = productParam.getProductAttributeValueList();
-        if (!CollectionUtils.isEmpty(productAttributeValueList)) {
-            for (PmsProductAttributeValue productAttributeValue : productAttributeValueList) {
-                productAttributeValue.setId(null);
-                productAttributeValue.setProductId(productId);
-            }
-            productAttributeValueDao.insertList(productAttributeValueList);
-        }
-        //关联专题
-        relateAndInsertList(subjectProductRelationDao, productParam.getSubjectProductRelationList(), productId);
-        //关联优选
-        relateAndInsertList(prefrenceAreaProductRelationDao, productParam.getPrefrenceAreaProductRelationList(), productId);
-        count = 1;
-        return count;
-    }
-
     /**
      * 建立和插入关系表操作
      *

mall-admin/src/main/resources/dao/OmsOrderDao.xml

@@ -74,9 +74,6 @@
             oi.product_price item_product_price,
             oi.product_quantity item_product_quantity,
             oi.product_attr item_product_attr,
-            oi.sp1 item_sp1,
-            oi.sp2 item_sp2,
-            oi.sp3 item_sp3,
             oh.id history_id,
             oh.operate_man history_operate_man,
             oh.create_time history_create_time,

mall-admin/src/main/resources/dao/PmsProductDao.xml

@@ -24,7 +24,7 @@
             l.id ladder_id,l.product_id ladder_product_id,l.discount ladder_discount,l.count ladder_count,l.price ladder_price,
             pf.id full_id,pf.product_id full_product_id,pf.full_price full_full_price,pf.reduce_price full_reduce_price,
             m.id member_id,m.product_id member_product_id,m.member_level_id member_member_level_id,m.member_price member_member_price,m.member_level_name member_member_level_name,
-            s.id sku_id,s.product_id sku_product_id,s.price sku_price,s.low_stock sku_low_stock,s.pic sku_pic,s.sale sku_sale,s.sku_code sku_sku_code,s.sp1 sku_sp1,s.sp2 sku_sp2,s.sp3 sku_sp3,s.stock sku_stock,
+            s.id sku_id,s.product_id sku_product_id,s.price sku_price,s.low_stock sku_low_stock,s.pic sku_pic,s.sale sku_sale,s.sku_code sku_sku_code,s.stock sku_stock,s.sp_data sku_sp_data,
             a.id attribute_id,a.product_id attribute_product_id,a.product_attribute_id attribute_product_attribute_id,a.value attribute_value
         FROM pms_product p
         LEFT JOIN pms_product_category pc on pc.id = p.product_category_id

mall-admin/src/main/resources/dao/PmsSkuStockDao.xml

@@ -2,22 +2,20 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.macro.mall.dao.PmsSkuStockDao">
     <insert id="insertList">
-        INSERT INTO pms_sku_stock (product_id, sku_code, price, stock, low_stock, sp1, sp2, sp3, pic, sale) VALUES
+        INSERT INTO pms_sku_stock (product_id, sku_code, price, stock, low_stock, pic, sale, sp_data) VALUES
         <foreach collection="list" item="item" index="index" separator=",">
             (#{item.productId,jdbcType=BIGINT},
             #{item.skuCode,jdbcType=VARCHAR},
             #{item.price,jdbcType=DECIMAL},
             #{item.stock,jdbcType=INTEGER},
             #{item.lowStock,jdbcType=INTEGER},
-            #{item.sp1,jdbcType=VARCHAR},
-            #{item.sp2,jdbcType=VARCHAR},
-            #{item.sp3,jdbcType=VARCHAR},
             #{item.pic,jdbcType=VARCHAR},
-            #{item.sale,jdbcType=INTEGER})
+            #{item.sale,jdbcType=INTEGER},
+            #{item.spData,jdbcType=VARCHAR})
         </foreach>
     </insert>
     <insert id="replaceList">
-        REPLACE INTO pms_sku_stock (id,product_id, sku_code, price, stock, low_stock, sp1, sp2, sp3, pic, sale) VALUES
+        REPLACE INTO pms_sku_stock (id,product_id, sku_code, price, stock, low_stock,pic, sale, sp_data) VALUES
         <foreach collection="list" item="item" index="index" separator=",">
             (#{item.id,jdbcType=BIGINT},
             #{item.productId,jdbcType=BIGINT},
@@ -25,11 +23,9 @@
             #{item.price,jdbcType=DECIMAL},
             #{item.stock,jdbcType=INTEGER},
             #{item.lowStock,jdbcType=INTEGER},
-            #{item.sp1,jdbcType=VARCHAR},
-            #{item.sp2,jdbcType=VARCHAR},
-            #{item.sp3,jdbcType=VARCHAR},
             #{item.pic,jdbcType=VARCHAR},
-            #{item.sale,jdbcType=INTEGER})
+            #{item.sale,jdbcType=INTEGER},
+            #{item.spData,jdbcType=VARCHAR})
         </foreach>
     </insert>
 </mapper>

mall-mbg/src/main/java/com/macro/mall/model/OmsCartItem.java

@@ -20,15 +20,6 @@ public class OmsCartItem implements Serializable {
     @ApiModelProperty(value = "添加到购物车的价格")
     private BigDecimal price;
 
-    @ApiModelProperty(value = "销售属性1")
-    private String sp1;
-
-    @ApiModelProperty(value = "销售属性2")
-    private String sp2;
-
-    @ApiModelProperty(value = "销售属性3")
-    private String sp3;
-
     @ApiModelProperty(value = "商品主图")
     private String productPic;
 
@@ -113,30 +104,6 @@ public class OmsCartItem implements Serializable {
         this.price = price;
     }
 
-    public String getSp1() {
-        return sp1;
-    }
-
-    public void setSp1(String sp1) {
-        this.sp1 = sp1;
-    }
-
-    public String getSp2() {
-        return sp2;
-    }
-
-    public void setSp2(String sp2) {
-        this.sp2 = sp2;
-    }
-
-    public String getSp3() {
-        return sp3;
-    }
-
-    public void setSp3(String sp3) {
-        this.sp3 = sp3;
-    }
-
     public String getProductPic() {
         return productPic;
     }
@@ -245,9 +212,6 @@ public class OmsCartItem implements Serializable {
         sb.append(", memberId=").append(memberId);
         sb.append(", quantity=").append(quantity);
         sb.append(", price=").append(price);
-        sb.append(", sp1=").append(sp1);
-        sb.append(", sp2=").append(sp2);
-        sb.append(", sp3=").append(sp3);
         sb.append(", productPic=").append(productPic);
         sb.append(", productName=").append(productName);
         sb.append(", productSubTitle=").append(productSubTitle);

mall-mbg/src/main/java/com/macro/mall/model/OmsCartItemExample.java

@@ -466,216 +466,6 @@ public class OmsCartItemExample {
             return (Criteria) this;
         }
 
-        public Criteria andSp1IsNull() {
-            addCriterion("sp1 is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp1IsNotNull() {
-            addCriterion("sp1 is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp1EqualTo(String value) {
-            addCriterion("sp1 =", value, "sp1");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp1NotEqualTo(String value) {
-            addCriterion("sp1 <>", value, "sp1");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp1GreaterThan(String value) {
-            addCriterion("sp1 >", value, "sp1");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp1GreaterThanOrEqualTo(String value) {
-            addCriterion("sp1 >=", value, "sp1");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp1LessThan(String value) {
-            addCriterion("sp1 <", value, "sp1");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp1LessThanOrEqualTo(String value) {
-            addCriterion("sp1 <=", value, "sp1");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp1Like(String value) {
-            addCriterion("sp1 like", value, "sp1");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp1NotLike(String value) {
-            addCriterion("sp1 not like", value, "sp1");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp1In(List<String> values) {
-            addCriterion("sp1 in", values, "sp1");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp1NotIn(List<String> values) {
-            addCriterion("sp1 not in", values, "sp1");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp1Between(String value1, String value2) {
-            addCriterion("sp1 between", value1, value2, "sp1");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp1NotBetween(String value1, String value2) {
-            addCriterion("sp1 not between", value1, value2, "sp1");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp2IsNull() {
-            addCriterion("sp2 is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp2IsNotNull() {
-            addCriterion("sp2 is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp2EqualTo(String value) {
-            addCriterion("sp2 =", value, "sp2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp2NotEqualTo(String value) {
-            addCriterion("sp2 <>", value, "sp2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp2GreaterThan(String value) {
-            addCriterion("sp2 >", value, "sp2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp2GreaterThanOrEqualTo(String value) {
-            addCriterion("sp2 >=", value, "sp2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp2LessThan(String value) {
-            addCriterion("sp2 <", value, "sp2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp2LessThanOrEqualTo(String value) {
-            addCriterion("sp2 <=", value, "sp2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp2Like(String value) {
-            addCriterion("sp2 like", value, "sp2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp2NotLike(String value) {
-            addCriterion("sp2 not like", value, "sp2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp2In(List<String> values) {
-            addCriterion("sp2 in", values, "sp2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp2NotIn(List<String> values) {
-            addCriterion("sp2 not in", values, "sp2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp2Between(String value1, String value2) {
-            addCriterion("sp2 between", value1, value2, "sp2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp2NotBetween(String value1, String value2) {
-            addCriterion("sp2 not between", value1, value2, "sp2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp3IsNull() {
-            addCriterion("sp3 is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp3IsNotNull() {
-            addCriterion("sp3 is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp3EqualTo(String value) {
-            addCriterion("sp3 =", value, "sp3");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp3NotEqualTo(String value) {
-            addCriterion("sp3 <>", value, "sp3");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp3GreaterThan(String value) {
-            addCriterion("sp3 >", value, "sp3");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp3GreaterThanOrEqualTo(String value) {
-            addCriterion("sp3 >=", value, "sp3");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp3LessThan(String value) {
-            addCriterion("sp3 <", value, "sp3");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp3LessThanOrEqualTo(String value) {
-            addCriterion("sp3 <=", value, "sp3");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp3Like(String value) {
-            addCriterion("sp3 like", value, "sp3");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp3NotLike(String value) {
-            addCriterion("sp3 not like", value, "sp3");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp3In(List<String> values) {
-            addCriterion("sp3 in", values, "sp3");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp3NotIn(List<String> values) {
-            addCriterion("sp3 not in", values, "sp3");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp3Between(String value1, String value2) {
-            addCriterion("sp3 between", value1, value2, "sp3");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp3NotBetween(String value1, String value2) {
-            addCriterion("sp3 not between", value1, value2, "sp3");
-            return (Criteria) this;
-        }
-
         public Criteria andProductPicIsNull() {
             addCriterion("product_pic is null");
             return (Criteria) this;

mall-mbg/src/main/java/com/macro/mall/model/OmsOrderItem.java

@@ -38,13 +38,6 @@ public class OmsOrderItem implements Serializable {
     @ApiModelProperty(value = "商品分类id")
     private Long productCategoryId;
 
-    @ApiModelProperty(value = "商品的销售属性")
-    private String sp1;
-
-    private String sp2;
-
-    private String sp3;
-
     @ApiModelProperty(value = "商品促销名称")
     private String promotionName;
 
@@ -173,30 +166,6 @@ public class OmsOrderItem implements Serializable {
         this.productCategoryId = productCategoryId;
     }
 
-    public String getSp1() {
-        return sp1;
-    }
-
-    public void setSp1(String sp1) {
-        this.sp1 = sp1;
-    }
-
-    public String getSp2() {
-        return sp2;
-    }
-
-    public void setSp2(String sp2) {
-        this.sp2 = sp2;
-    }
-
-    public String getSp3() {
-        return sp3;
-    }
-
-    public void setSp3(String sp3) {
-        this.sp3 = sp3;
-    }
-
     public String getPromotionName() {
         return promotionName;
     }
@@ -280,9 +249,6 @@ public class OmsOrderItem implements Serializable {
         sb.append(", productSkuId=").append(productSkuId);
         sb.append(", productSkuCode=").append(productSkuCode);
         sb.append(", productCategoryId=").append(productCategoryId);
-        sb.append(", sp1=").append(sp1);
-        sb.append(", sp2=").append(sp2);
-        sb.append(", sp3=").append(sp3);
         sb.append(", promotionName=").append(promotionName);
         sb.append(", promotionAmount=").append(promotionAmount);
         sb.append(", couponAmount=").append(couponAmount);

mall-mbg/src/main/java/com/macro/mall/model/OmsOrderItemExample.java

@@ -945,216 +945,6 @@ public class OmsOrderItemExample {
             return (Criteria) this;
         }
 
-        public Criteria andSp1IsNull() {
-            addCriterion("sp1 is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp1IsNotNull() {
-            addCriterion("sp1 is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp1EqualTo(String value) {
-            addCriterion("sp1 =", value, "sp1");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp1NotEqualTo(String value) {
-            addCriterion("sp1 <>", value, "sp1");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp1GreaterThan(String value) {
-            addCriterion("sp1 >", value, "sp1");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp1GreaterThanOrEqualTo(String value) {
-            addCriterion("sp1 >=", value, "sp1");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp1LessThan(String value) {
-            addCriterion("sp1 <", value, "sp1");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp1LessThanOrEqualTo(String value) {
-            addCriterion("sp1 <=", value, "sp1");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp1Like(String value) {
-            addCriterion("sp1 like", value, "sp1");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp1NotLike(String value) {
-            addCriterion("sp1 not like", value, "sp1");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp1In(List<String> values) {
-            addCriterion("sp1 in", values, "sp1");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp1NotIn(List<String> values) {
-            addCriterion("sp1 not in", values, "sp1");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp1Between(String value1, String value2) {
-            addCriterion("sp1 between", value1, value2, "sp1");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp1NotBetween(String value1, String value2) {
-            addCriterion("sp1 not between", value1, value2, "sp1");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp2IsNull() {
-            addCriterion("sp2 is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp2IsNotNull() {
-            addCriterion("sp2 is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp2EqualTo(String value) {
-            addCriterion("sp2 =", value, "sp2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp2NotEqualTo(String value) {
-            addCriterion("sp2 <>", value, "sp2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp2GreaterThan(String value) {
-            addCriterion("sp2 >", value, "sp2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp2GreaterThanOrEqualTo(String value) {
-            addCriterion("sp2 >=", value, "sp2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp2LessThan(String value) {
-            addCriterion("sp2 <", value, "sp2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp2LessThanOrEqualTo(String value) {
-            addCriterion("sp2 <=", value, "sp2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp2Like(String value) {
-            addCriterion("sp2 like", value, "sp2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp2NotLike(String value) {
-            addCriterion("sp2 not like", value, "sp2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp2In(List<String> values) {
-            addCriterion("sp2 in", values, "sp2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp2NotIn(List<String> values) {
-            addCriterion("sp2 not in", values, "sp2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp2Between(String value1, String value2) {
-            addCriterion("sp2 between", value1, value2, "sp2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp2NotBetween(String value1, String value2) {
-            addCriterion("sp2 not between", value1, value2, "sp2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp3IsNull() {
-            addCriterion("sp3 is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp3IsNotNull() {
-            addCriterion("sp3 is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp3EqualTo(String value) {
-            addCriterion("sp3 =", value, "sp3");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp3NotEqualTo(String value) {
-            addCriterion("sp3 <>", value, "sp3");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp3GreaterThan(String value) {
-            addCriterion("sp3 >", value, "sp3");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp3GreaterThanOrEqualTo(String value) {
-            addCriterion("sp3 >=", value, "sp3");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp3LessThan(String value) {
-            addCriterion("sp3 <", value, "sp3");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp3LessThanOrEqualTo(String value) {
-            addCriterion("sp3 <=", value, "sp3");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp3Like(String value) {
-            addCriterion("sp3 like", value, "sp3");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp3NotLike(String value) {
-            addCriterion("sp3 not like", value, "sp3");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp3In(List<String> values) {
-            addCriterion("sp3 in", values, "sp3");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp3NotIn(List<String> values) {
-            addCriterion("sp3 not in", values, "sp3");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp3Between(String value1, String value2) {
-            addCriterion("sp3 between", value1, value2, "sp3");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp3NotBetween(String value1, String value2) {
-            addCriterion("sp3 not between", value1, value2, "sp3");
-            return (Criteria) this;
-        }
-
         public Criteria andPromotionNameIsNull() {
             addCriterion("promotion_name is null");
             return (Criteria) this;

mall-mbg/src/main/java/com/macro/mall/model/PmsSkuStock.java

@@ -20,13 +20,6 @@ public class PmsSkuStock implements Serializable {
     @ApiModelProperty(value = "预警库存")
     private Integer lowStock;
 
-    @ApiModelProperty(value = "销售属性1")
-    private String sp1;
-
-    private String sp2;
-
-    private String sp3;
-
     @ApiModelProperty(value = "展示图片")
     private String pic;
 
@@ -39,6 +32,9 @@ public class PmsSkuStock implements Serializable {
     @ApiModelProperty(value = "锁定库存")
     private Integer lockStock;
 
+    @ApiModelProperty(value = "商品销售属性，json格式")
+    private String spData;
+
     private static final long serialVersionUID = 1L;
 
     public Long getId() {
@@ -89,30 +85,6 @@ public class PmsSkuStock implements Serializable {
         this.lowStock = lowStock;
     }
 
-    public String getSp1() {
-        return sp1;
-    }
-
-    public void setSp1(String sp1) {
-        this.sp1 = sp1;
-    }
-
-    public String getSp2() {
-        return sp2;
-    }
-
-    public void setSp2(String sp2) {
-        this.sp2 = sp2;
-    }
-
-    public String getSp3() {
-        return sp3;
-    }
-
-    public void setSp3(String sp3) {
-        this.sp3 = sp3;
-    }
-
     public String getPic() {
         return pic;
     }
@@ -145,6 +117,14 @@ public class PmsSkuStock implements Serializable {
         this.lockStock = lockStock;
     }
 
+    public String getSpData() {
+        return spData;
+    }
+
+    public void setSpData(String spData) {
+        this.spData = spData;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -157,13 +137,11 @@ public class PmsSkuStock implements Serializable {
         sb.append(", price=").append(price);
         sb.append(", stock=").append(stock);
         sb.append(", lowStock=").append(lowStock);
-        sb.append(", sp1=").append(sp1);
-        sb.append(", sp2=").append(sp2);
-        sb.append(", sp3=").append(sp3);
         sb.append(", pic=").append(pic);
         sb.append(", sale=").append(sale);
         sb.append(", promotionPrice=").append(promotionPrice);
         sb.append(", lockStock=").append(lockStock);
+        sb.append(", spData=").append(spData);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

mall-mbg/src/main/java/com/macro/mall/model/PmsSkuStockExample.java

@@ -475,216 +475,6 @@ public class PmsSkuStockExample {
             return (Criteria) this;
         }
 
-        public Criteria andSp1IsNull() {
-            addCriterion("sp1 is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp1IsNotNull() {
-            addCriterion("sp1 is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp1EqualTo(String value) {
-            addCriterion("sp1 =", value, "sp1");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp1NotEqualTo(String value) {
-            addCriterion("sp1 <>", value, "sp1");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp1GreaterThan(String value) {
-            addCriterion("sp1 >", value, "sp1");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp1GreaterThanOrEqualTo(String value) {
-            addCriterion("sp1 >=", value, "sp1");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp1LessThan(String value) {
-            addCriterion("sp1 <", value, "sp1");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp1LessThanOrEqualTo(String value) {
-            addCriterion("sp1 <=", value, "sp1");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp1Like(String value) {
-            addCriterion("sp1 like", value, "sp1");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp1NotLike(String value) {
-            addCriterion("sp1 not like", value, "sp1");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp1In(List<String> values) {
-            addCriterion("sp1 in", values, "sp1");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp1NotIn(List<String> values) {
-            addCriterion("sp1 not in", values, "sp1");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp1Between(String value1, String value2) {
-            addCriterion("sp1 between", value1, value2, "sp1");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp1NotBetween(String value1, String value2) {
-            addCriterion("sp1 not between", value1, value2, "sp1");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp2IsNull() {
-            addCriterion("sp2 is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp2IsNotNull() {
-            addCriterion("sp2 is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp2EqualTo(String value) {
-            addCriterion("sp2 =", value, "sp2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp2NotEqualTo(String value) {
-            addCriterion("sp2 <>", value, "sp2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp2GreaterThan(String value) {
-            addCriterion("sp2 >", value, "sp2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp2GreaterThanOrEqualTo(String value) {
-            addCriterion("sp2 >=", value, "sp2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp2LessThan(String value) {
-            addCriterion("sp2 <", value, "sp2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp2LessThanOrEqualTo(String value) {
-            addCriterion("sp2 <=", value, "sp2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp2Like(String value) {
-            addCriterion("sp2 like", value, "sp2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp2NotLike(String value) {
-            addCriterion("sp2 not like", value, "sp2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp2In(List<String> values) {
-            addCriterion("sp2 in", values, "sp2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp2NotIn(List<String> values) {
-            addCriterion("sp2 not in", values, "sp2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp2Between(String value1, String value2) {
-            addCriterion("sp2 between", value1, value2, "sp2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp2NotBetween(String value1, String value2) {
-            addCriterion("sp2 not between", value1, value2, "sp2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp3IsNull() {
-            addCriterion("sp3 is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp3IsNotNull() {
-            addCriterion("sp3 is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp3EqualTo(String value) {
-            addCriterion("sp3 =", value, "sp3");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp3NotEqualTo(String value) {
-            addCriterion("sp3 <>", value, "sp3");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp3GreaterThan(String value) {
-            addCriterion("sp3 >", value, "sp3");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp3GreaterThanOrEqualTo(String value) {
-            addCriterion("sp3 >=", value, "sp3");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp3LessThan(String value) {
-            addCriterion("sp3 <", value, "sp3");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp3LessThanOrEqualTo(String value) {
-            addCriterion("sp3 <=", value, "sp3");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp3Like(String value) {
-            addCriterion("sp3 like", value, "sp3");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp3NotLike(String value) {
-            addCriterion("sp3 not like", value, "sp3");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp3In(List<String> values) {
-            addCriterion("sp3 in", values, "sp3");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp3NotIn(List<String> values) {
-            addCriterion("sp3 not in", values, "sp3");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp3Between(String value1, String value2) {
-            addCriterion("sp3 between", value1, value2, "sp3");
-            return (Criteria) this;
-        }
-
-        public Criteria andSp3NotBetween(String value1, String value2) {
-            addCriterion("sp3 not between", value1, value2, "sp3");
-            return (Criteria) this;
-        }
-
         public Criteria andPicIsNull() {
             addCriterion("pic is null");
             return (Criteria) this;
@@ -934,6 +724,76 @@ public class PmsSkuStockExample {
             addCriterion("lock_stock not between", value1, value2, "lockStock");
             return (Criteria) this;
         }
+
+        public Criteria andSpDataIsNull() {
+            addCriterion("sp_data is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpDataIsNotNull() {
+            addCriterion("sp_data is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpDataEqualTo(String value) {
+            addCriterion("sp_data =", value, "spData");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpDataNotEqualTo(String value) {
+            addCriterion("sp_data <>", value, "spData");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpDataGreaterThan(String value) {
+            addCriterion("sp_data >", value, "spData");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpDataGreaterThanOrEqualTo(String value) {
+            addCriterion("sp_data >=", value, "spData");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpDataLessThan(String value) {
+            addCriterion("sp_data <", value, "spData");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpDataLessThanOrEqualTo(String value) {
+            addCriterion("sp_data <=", value, "spData");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpDataLike(String value) {
+            addCriterion("sp_data like", value, "spData");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpDataNotLike(String value) {
+            addCriterion("sp_data not like", value, "spData");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpDataIn(List<String> values) {
+            addCriterion("sp_data in", values, "spData");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpDataNotIn(List<String> values) {
+            addCriterion("sp_data not in", values, "spData");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpDataBetween(String value1, String value2) {
+            addCriterion("sp_data between", value1, value2, "spData");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpDataNotBetween(String value1, String value2) {
+            addCriterion("sp_data not between", value1, value2, "spData");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

mall-mbg/src/main/resources/com/macro/mall/mapper/OmsCartItemMapper.xml

@@ -8,9 +8,6 @@
     <result column="member_id" jdbcType="BIGINT" property="memberId" />
     <result column="quantity" jdbcType="INTEGER" property="quantity" />
     <result column="price" jdbcType="DECIMAL" property="price" />
-    <result column="sp1" jdbcType="VARCHAR" property="sp1" />
-    <result column="sp2" jdbcType="VARCHAR" property="sp2" />
-    <result column="sp3" jdbcType="VARCHAR" property="sp3" />
     <result column="product_pic" jdbcType="VARCHAR" property="productPic" />
     <result column="product_name" jdbcType="VARCHAR" property="productName" />
     <result column="product_sub_title" jdbcType="VARCHAR" property="productSubTitle" />
@@ -83,9 +80,9 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, product_id, product_sku_id, member_id, quantity, price, sp1, sp2, sp3, product_pic, 
-    product_name, product_sub_title, product_sku_code, member_nickname, create_date, 
-    modify_date, delete_status, product_category_id, product_brand, product_sn, product_attr
+    id, product_id, product_sku_id, member_id, quantity, price, product_pic, product_name, 
+    product_sub_title, product_sku_code, member_nickname, create_date, modify_date, delete_status, 
+    product_category_id, product_brand, product_sn, product_attr
   </sql>
   <select id="selectByExample" parameterType="com.macro.mall.model.OmsCartItemExample" resultMap="BaseResultMap">
     select
@@ -122,15 +119,13 @@
       SELECT LAST_INSERT_ID()
     </selectKey>
     insert into oms_cart_item (product_id, product_sku_id, member_id, 
-      quantity, price, sp1, 
-      sp2, sp3, product_pic, 
+      quantity, price, product_pic, 
       product_name, product_sub_title, product_sku_code, 
       member_nickname, create_date, modify_date, 
       delete_status, product_category_id, product_brand, 
       product_sn, product_attr)
     values (#{productId,jdbcType=BIGINT}, #{productSkuId,jdbcType=BIGINT}, #{memberId,jdbcType=BIGINT}, 
-      #{quantity,jdbcType=INTEGER}, #{price,jdbcType=DECIMAL}, #{sp1,jdbcType=VARCHAR}, 
-      #{sp2,jdbcType=VARCHAR}, #{sp3,jdbcType=VARCHAR}, #{productPic,jdbcType=VARCHAR}, 
+      #{quantity,jdbcType=INTEGER}, #{price,jdbcType=DECIMAL}, #{productPic,jdbcType=VARCHAR}, 
       #{productName,jdbcType=VARCHAR}, #{productSubTitle,jdbcType=VARCHAR}, #{productSkuCode,jdbcType=VARCHAR}, 
       #{memberNickname,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP}, #{modifyDate,jdbcType=TIMESTAMP}, 
       #{deleteStatus,jdbcType=INTEGER}, #{productCategoryId,jdbcType=BIGINT}, #{productBrand,jdbcType=VARCHAR}, 
@@ -157,15 +152,6 @@
       <if test="price != null">
         price,
       </if>
-      <if test="sp1 != null">
-        sp1,
-      </if>
-      <if test="sp2 != null">
-        sp2,
-      </if>
-      <if test="sp3 != null">
-        sp3,
-      </if>
       <if test="productPic != null">
         product_pic,
       </if>
@@ -219,15 +205,6 @@
       <if test="price != null">
         #{price,jdbcType=DECIMAL},
       </if>
-      <if test="sp1 != null">
-        #{sp1,jdbcType=VARCHAR},
-      </if>
-      <if test="sp2 != null">
-        #{sp2,jdbcType=VARCHAR},
-      </if>
-      <if test="sp3 != null">
-        #{sp3,jdbcType=VARCHAR},
-      </if>
       <if test="productPic != null">
         #{productPic,jdbcType=VARCHAR},
       </if>
@@ -293,15 +270,6 @@
       <if test="record.price != null">
         price = #{record.price,jdbcType=DECIMAL},
       </if>
-      <if test="record.sp1 != null">
-        sp1 = #{record.sp1,jdbcType=VARCHAR},
-      </if>
-      <if test="record.sp2 != null">
-        sp2 = #{record.sp2,jdbcType=VARCHAR},
-      </if>
-      <if test="record.sp3 != null">
-        sp3 = #{record.sp3,jdbcType=VARCHAR},
-      </if>
       <if test="record.productPic != null">
         product_pic = #{record.productPic,jdbcType=VARCHAR},
       </if>
@@ -351,9 +319,6 @@
       member_id = #{record.memberId,jdbcType=BIGINT},
       quantity = #{record.quantity,jdbcType=INTEGER},
       price = #{record.price,jdbcType=DECIMAL},
-      sp1 = #{record.sp1,jdbcType=VARCHAR},
-      sp2 = #{record.sp2,jdbcType=VARCHAR},
-      sp3 = #{record.sp3,jdbcType=VARCHAR},
       product_pic = #{record.productPic,jdbcType=VARCHAR},
       product_name = #{record.productName,jdbcType=VARCHAR},
       product_sub_title = #{record.productSubTitle,jdbcType=VARCHAR},
@@ -388,15 +353,6 @@
       <if test="price != null">
         price = #{price,jdbcType=DECIMAL},
       </if>
-      <if test="sp1 != null">
-        sp1 = #{sp1,jdbcType=VARCHAR},
-      </if>
-      <if test="sp2 != null">
-        sp2 = #{sp2,jdbcType=VARCHAR},
-      </if>
-      <if test="sp3 != null">
-        sp3 = #{sp3,jdbcType=VARCHAR},
-      </if>
       <if test="productPic != null">
         product_pic = #{productPic,jdbcType=VARCHAR},
       </if>
@@ -443,9 +399,6 @@
       member_id = #{memberId,jdbcType=BIGINT},
       quantity = #{quantity,jdbcType=INTEGER},
       price = #{price,jdbcType=DECIMAL},
-      sp1 = #{sp1,jdbcType=VARCHAR},
-      sp2 = #{sp2,jdbcType=VARCHAR},
-      sp3 = #{sp3,jdbcType=VARCHAR},
       product_pic = #{productPic,jdbcType=VARCHAR},
       product_name = #{productName,jdbcType=VARCHAR},
       product_sub_title = #{productSubTitle,jdbcType=VARCHAR},

mall-mbg/src/main/resources/com/macro/mall/mapper/OmsOrderItemMapper.xml

@@ -15,9 +15,6 @@
     <result column="product_sku_id" jdbcType="BIGINT" property="productSkuId" />
     <result column="product_sku_code" jdbcType="VARCHAR" property="productSkuCode" />
     <result column="product_category_id" jdbcType="BIGINT" property="productCategoryId" />
-    <result column="sp1" jdbcType="VARCHAR" property="sp1" />
-    <result column="sp2" jdbcType="VARCHAR" property="sp2" />
-    <result column="sp3" jdbcType="VARCHAR" property="sp3" />
     <result column="promotion_name" jdbcType="VARCHAR" property="promotionName" />
     <result column="promotion_amount" jdbcType="DECIMAL" property="promotionAmount" />
     <result column="coupon_amount" jdbcType="DECIMAL" property="couponAmount" />
@@ -88,8 +85,8 @@
   <sql id="Base_Column_List">
     id, order_id, order_sn, product_id, product_pic, product_name, product_brand, product_sn, 
     product_price, product_quantity, product_sku_id, product_sku_code, product_category_id, 
-    sp1, sp2, sp3, promotion_name, promotion_amount, coupon_amount, integration_amount, 
-    real_amount, gift_integration, gift_growth, product_attr
+    promotion_name, promotion_amount, coupon_amount, integration_amount, real_amount, 
+    gift_integration, gift_growth, product_attr
   </sql>
   <select id="selectByExample" parameterType="com.macro.mall.model.OmsOrderItemExample" resultMap="BaseResultMap">
     select
@@ -129,18 +126,16 @@
       product_pic, product_name, product_brand, 
       product_sn, product_price, product_quantity, 
       product_sku_id, product_sku_code, product_category_id, 
-      sp1, sp2, sp3, promotion_name, 
-      promotion_amount, coupon_amount, integration_amount, 
-      real_amount, gift_integration, gift_growth, 
-      product_attr)
+      promotion_name, promotion_amount, coupon_amount, 
+      integration_amount, real_amount, gift_integration, 
+      gift_growth, product_attr)
     values (#{orderId,jdbcType=BIGINT}, #{orderSn,jdbcType=VARCHAR}, #{productId,jdbcType=BIGINT}, 
       #{productPic,jdbcType=VARCHAR}, #{productName,jdbcType=VARCHAR}, #{productBrand,jdbcType=VARCHAR}, 
       #{productSn,jdbcType=VARCHAR}, #{productPrice,jdbcType=DECIMAL}, #{productQuantity,jdbcType=INTEGER}, 
       #{productSkuId,jdbcType=BIGINT}, #{productSkuCode,jdbcType=VARCHAR}, #{productCategoryId,jdbcType=BIGINT}, 
-      #{sp1,jdbcType=VARCHAR}, #{sp2,jdbcType=VARCHAR}, #{sp3,jdbcType=VARCHAR}, #{promotionName,jdbcType=VARCHAR}, 
-      #{promotionAmount,jdbcType=DECIMAL}, #{couponAmount,jdbcType=DECIMAL}, #{integrationAmount,jdbcType=DECIMAL}, 
-      #{realAmount,jdbcType=DECIMAL}, #{giftIntegration,jdbcType=INTEGER}, #{giftGrowth,jdbcType=INTEGER}, 
-      #{productAttr,jdbcType=VARCHAR})
+      #{promotionName,jdbcType=VARCHAR}, #{promotionAmount,jdbcType=DECIMAL}, #{couponAmount,jdbcType=DECIMAL}, 
+      #{integrationAmount,jdbcType=DECIMAL}, #{realAmount,jdbcType=DECIMAL}, #{giftIntegration,jdbcType=INTEGER}, 
+      #{giftGrowth,jdbcType=INTEGER}, #{productAttr,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.macro.mall.model.OmsOrderItem">
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
@@ -184,15 +179,6 @@
       <if test="productCategoryId != null">
         product_category_id,
       </if>
-      <if test="sp1 != null">
-        sp1,
-      </if>
-      <if test="sp2 != null">
-        sp2,
-      </if>
-      <if test="sp3 != null">
-        sp3,
-      </if>
       <if test="promotionName != null">
         promotion_name,
       </if>
@@ -255,15 +241,6 @@
       <if test="productCategoryId != null">
         #{productCategoryId,jdbcType=BIGINT},
       </if>
-      <if test="sp1 != null">
-        #{sp1,jdbcType=VARCHAR},
-      </if>
-      <if test="sp2 != null">
-        #{sp2,jdbcType=VARCHAR},
-      </if>
-      <if test="sp3 != null">
-        #{sp3,jdbcType=VARCHAR},
-      </if>
       <if test="promotionName != null">
         #{promotionName,jdbcType=VARCHAR},
       </if>
@@ -338,15 +315,6 @@
       <if test="record.productCategoryId != null">
         product_category_id = #{record.productCategoryId,jdbcType=BIGINT},
       </if>
-      <if test="record.sp1 != null">
-        sp1 = #{record.sp1,jdbcType=VARCHAR},
-      </if>
-      <if test="record.sp2 != null">
-        sp2 = #{record.sp2,jdbcType=VARCHAR},
-      </if>
-      <if test="record.sp3 != null">
-        sp3 = #{record.sp3,jdbcType=VARCHAR},
-      </if>
       <if test="record.promotionName != null">
         promotion_name = #{record.promotionName,jdbcType=VARCHAR},
       </if>
@@ -391,9 +359,6 @@
       product_sku_id = #{record.productSkuId,jdbcType=BIGINT},
       product_sku_code = #{record.productSkuCode,jdbcType=VARCHAR},
       product_category_id = #{record.productCategoryId,jdbcType=BIGINT},
-      sp1 = #{record.sp1,jdbcType=VARCHAR},
-      sp2 = #{record.sp2,jdbcType=VARCHAR},
-      sp3 = #{record.sp3,jdbcType=VARCHAR},
       promotion_name = #{record.promotionName,jdbcType=VARCHAR},
       promotion_amount = #{record.promotionAmount,jdbcType=DECIMAL},
       coupon_amount = #{record.couponAmount,jdbcType=DECIMAL},
@@ -445,15 +410,6 @@
       <if test="productCategoryId != null">
         product_category_id = #{productCategoryId,jdbcType=BIGINT},
       </if>
-      <if test="sp1 != null">
-        sp1 = #{sp1,jdbcType=VARCHAR},
-      </if>
-      <if test="sp2 != null">
-        sp2 = #{sp2,jdbcType=VARCHAR},
-      </if>
-      <if test="sp3 != null">
-        sp3 = #{sp3,jdbcType=VARCHAR},
-      </if>
       <if test="promotionName != null">
         promotion_name = #{promotionName,jdbcType=VARCHAR},
       </if>
@@ -495,9 +451,6 @@
       product_sku_id = #{productSkuId,jdbcType=BIGINT},
       product_sku_code = #{productSkuCode,jdbcType=VARCHAR},
       product_category_id = #{productCategoryId,jdbcType=BIGINT},
-      sp1 = #{sp1,jdbcType=VARCHAR},
-      sp2 = #{sp2,jdbcType=VARCHAR},
-      sp3 = #{sp3,jdbcType=VARCHAR},
       promotion_name = #{promotionName,jdbcType=VARCHAR},
       promotion_amount = #{promotionAmount,jdbcType=DECIMAL},
       coupon_amount = #{couponAmount,jdbcType=DECIMAL},

mall-mbg/src/main/resources/com/macro/mall/mapper/PmsSkuStockMapper.xml

@@ -8,13 +8,11 @@
     <result column="price" jdbcType="DECIMAL" property="price" />
     <result column="stock" jdbcType="INTEGER" property="stock" />
     <result column="low_stock" jdbcType="INTEGER" property="lowStock" />
-    <result column="sp1" jdbcType="VARCHAR" property="sp1" />
-    <result column="sp2" jdbcType="VARCHAR" property="sp2" />
-    <result column="sp3" jdbcType="VARCHAR" property="sp3" />
     <result column="pic" jdbcType="VARCHAR" property="pic" />
     <result column="sale" jdbcType="INTEGER" property="sale" />
     <result column="promotion_price" jdbcType="DECIMAL" property="promotionPrice" />
     <result column="lock_stock" jdbcType="INTEGER" property="lockStock" />
+    <result column="sp_data" jdbcType="VARCHAR" property="spData" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -75,8 +73,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, product_id, sku_code, price, stock, low_stock, sp1, sp2, sp3, pic, sale, promotion_price, 
-    lock_stock
+    id, product_id, sku_code, price, stock, low_stock, pic, sale, promotion_price, lock_stock, 
+    sp_data
   </sql>
   <select id="selectByExample" parameterType="com.macro.mall.model.PmsSkuStockExample" resultMap="BaseResultMap">
     select
@@ -113,13 +111,13 @@
       SELECT LAST_INSERT_ID()
     </selectKey>
     insert into pms_sku_stock (product_id, sku_code, price, 
-      stock, low_stock, sp1, 
-      sp2, sp3, pic, sale, 
-      promotion_price, lock_stock)
+      stock, low_stock, pic, 
+      sale, promotion_price, lock_stock, 
+      sp_data)
     values (#{productId,jdbcType=BIGINT}, #{skuCode,jdbcType=VARCHAR}, #{price,jdbcType=DECIMAL}, 
-      #{stock,jdbcType=INTEGER}, #{lowStock,jdbcType=INTEGER}, #{sp1,jdbcType=VARCHAR}, 
-      #{sp2,jdbcType=VARCHAR}, #{sp3,jdbcType=VARCHAR}, #{pic,jdbcType=VARCHAR}, #{sale,jdbcType=INTEGER}, 
-      #{promotionPrice,jdbcType=DECIMAL}, #{lockStock,jdbcType=INTEGER})
+      #{stock,jdbcType=INTEGER}, #{lowStock,jdbcType=INTEGER}, #{pic,jdbcType=VARCHAR}, 
+      #{sale,jdbcType=INTEGER}, #{promotionPrice,jdbcType=DECIMAL}, #{lockStock,jdbcType=INTEGER}, 
+      #{spData,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.macro.mall.model.PmsSkuStock">
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
@@ -142,15 +140,6 @@
       <if test="lowStock != null">
         low_stock,
       </if>
-      <if test="sp1 != null">
-        sp1,
-      </if>
-      <if test="sp2 != null">
-        sp2,
-      </if>
-      <if test="sp3 != null">
-        sp3,
-      </if>
       <if test="pic != null">
         pic,
       </if>
@@ -163,6 +152,9 @@
       <if test="lockStock != null">
         lock_stock,
       </if>
+      <if test="spData != null">
+        sp_data,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="productId != null">
@@ -180,15 +172,6 @@
       <if test="lowStock != null">
         #{lowStock,jdbcType=INTEGER},
       </if>
-      <if test="sp1 != null">
-        #{sp1,jdbcType=VARCHAR},
-      </if>
-      <if test="sp2 != null">
-        #{sp2,jdbcType=VARCHAR},
-      </if>
-      <if test="sp3 != null">
-        #{sp3,jdbcType=VARCHAR},
-      </if>
       <if test="pic != null">
         #{pic,jdbcType=VARCHAR},
       </if>
@@ -201,6 +184,9 @@
       <if test="lockStock != null">
         #{lockStock,jdbcType=INTEGER},
       </if>
+      <if test="spData != null">
+        #{spData,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.macro.mall.model.PmsSkuStockExample" resultType="java.lang.Long">
@@ -230,15 +216,6 @@
       <if test="record.lowStock != null">
         low_stock = #{record.lowStock,jdbcType=INTEGER},
       </if>
-      <if test="record.sp1 != null">
-        sp1 = #{record.sp1,jdbcType=VARCHAR},
-      </if>
-      <if test="record.sp2 != null">
-        sp2 = #{record.sp2,jdbcType=VARCHAR},
-      </if>
-      <if test="record.sp3 != null">
-        sp3 = #{record.sp3,jdbcType=VARCHAR},
-      </if>
       <if test="record.pic != null">
         pic = #{record.pic,jdbcType=VARCHAR},
       </if>
@@ -251,6 +228,9 @@
       <if test="record.lockStock != null">
         lock_stock = #{record.lockStock,jdbcType=INTEGER},
       </if>
+      <if test="record.spData != null">
+        sp_data = #{record.spData,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -264,13 +244,11 @@
       price = #{record.price,jdbcType=DECIMAL},
       stock = #{record.stock,jdbcType=INTEGER},
       low_stock = #{record.lowStock,jdbcType=INTEGER},
-      sp1 = #{record.sp1,jdbcType=VARCHAR},
-      sp2 = #{record.sp2,jdbcType=VARCHAR},
-      sp3 = #{record.sp3,jdbcType=VARCHAR},
       pic = #{record.pic,jdbcType=VARCHAR},
       sale = #{record.sale,jdbcType=INTEGER},
       promotion_price = #{record.promotionPrice,jdbcType=DECIMAL},
-      lock_stock = #{record.lockStock,jdbcType=INTEGER}
+      lock_stock = #{record.lockStock,jdbcType=INTEGER},
+      sp_data = #{record.spData,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -293,15 +271,6 @@
       <if test="lowStock != null">
         low_stock = #{lowStock,jdbcType=INTEGER},
       </if>
-      <if test="sp1 != null">
-        sp1 = #{sp1,jdbcType=VARCHAR},
-      </if>
-      <if test="sp2 != null">
-        sp2 = #{sp2,jdbcType=VARCHAR},
-      </if>
-      <if test="sp3 != null">
-        sp3 = #{sp3,jdbcType=VARCHAR},
-      </if>
       <if test="pic != null">
         pic = #{pic,jdbcType=VARCHAR},
       </if>
@@ -314,6 +283,9 @@
       <if test="lockStock != null">
         lock_stock = #{lockStock,jdbcType=INTEGER},
       </if>
+      <if test="spData != null">
+        sp_data = #{spData,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -324,13 +296,11 @@
       price = #{price,jdbcType=DECIMAL},
       stock = #{stock,jdbcType=INTEGER},
       low_stock = #{lowStock,jdbcType=INTEGER},
-      sp1 = #{sp1,jdbcType=VARCHAR},
-      sp2 = #{sp2,jdbcType=VARCHAR},
-      sp3 = #{sp3,jdbcType=VARCHAR},
       pic = #{pic,jdbcType=VARCHAR},
       sale = #{sale,jdbcType=INTEGER},
       promotion_price = #{promotionPrice,jdbcType=DECIMAL},
-      lock_stock = #{lockStock,jdbcType=INTEGER}
+      lock_stock = #{lockStock,jdbcType=INTEGER},
+      sp_data = #{spData,jdbcType=VARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>

mall-portal/src/main/java/com/macro/mall/portal/service/impl/OmsCartItemServiceImpl.java

@@ -60,14 +60,8 @@ public class OmsCartItemServiceImpl implements OmsCartItemService {
         OmsCartItemExample example = new OmsCartItemExample();
         OmsCartItemExample.Criteria criteria = example.createCriteria().andMemberIdEqualTo(cartItem.getMemberId())
                 .andProductIdEqualTo(cartItem.getProductId()).andDeleteStatusEqualTo(0);
-        if (!StringUtils.isEmpty(cartItem.getSp1())) {
-            criteria.andSp1EqualTo(cartItem.getSp1());
-        }
-        if (!StringUtils.isEmpty(cartItem.getSp2())) {
-            criteria.andSp2EqualTo(cartItem.getSp2());
-        }
-        if (!StringUtils.isEmpty(cartItem.getSp3())) {
-            criteria.andSp3EqualTo(cartItem.getSp3());
+        if (!StringUtils.isEmpty(cartItem.getProductSkuId())) {
+            criteria.andProductSkuIdEqualTo(cartItem.getProductSkuId());
         }
         List<OmsCartItem> cartItemList = cartItemMapper.selectByExample(example);
         if (!CollectionUtils.isEmpty(cartItemList)) {

mall-portal/src/main/resources/dao/PortalOrderItemDao.xml

@@ -5,20 +5,18 @@
         insert into oms_order_item (order_id, order_sn, product_id,
         product_pic, product_name, product_brand,
         product_sn, product_price, product_quantity,
-        product_sku_id, product_category_id, product_sku_code,
-        sp1, sp2, sp3, promotion_name,
+        product_sku_id, product_category_id, product_sku_code,promotion_name,
         promotion_amount, coupon_amount, integration_amount,
-        real_amount) values
+        real_amount,product_attr) values
         <foreach collection="list" item="item" separator="," index="index">
             (#{item.orderId,jdbcType=BIGINT}, #{item.orderSn,jdbcType=VARCHAR}, #{item.productId,jdbcType=BIGINT},
             #{item.productPic,jdbcType=VARCHAR}, #{item.productName,jdbcType=VARCHAR}, #{item.productBrand,jdbcType=VARCHAR},
             #{item.productSn,jdbcType=VARCHAR}, #{item.productPrice,jdbcType=DECIMAL}, #{item.productQuantity,jdbcType=INTEGER},
             #{item.productSkuId,jdbcType=BIGINT}, #{item.productCategoryId,jdbcType=BIGINT}, #{item.productSkuCode,jdbcType=VARCHAR},
-            #{item.sp1,jdbcType=VARCHAR}, #{item.sp2,jdbcType=VARCHAR}, #{item.sp3,jdbcType=VARCHAR},
             #{item.promotionName,jdbcType=VARCHAR},
             #{item.promotionAmount,jdbcType=DECIMAL}, #{item.couponAmount,jdbcType=DECIMAL},
             #{item.integrationAmount,jdbcType=DECIMAL},
-            #{item.realAmount,jdbcType=DECIMAL})
+            #{item.realAmount,jdbcType=DECIMAL},#{item.productAttr,jdbcType=VARCHAR})
         </foreach>
     </insert>
 </mapper>

mall-portal/src/main/resources/dao/PortalProductDao.xml

@@ -31,9 +31,6 @@
             ps.id sku_id,
             ps.sku_code sku_code,
             ps.price sku_price,
-            ps.sp1 sku_sp1,
-            ps.sp2 sku_sp2,
-            ps.sp3 sku_sp3,
             ps.stock sku_stock,
             ps.pic sku_pic
         FROM