From 237ec4d94f61b8c907da25918c3b6b2710ca31a1 Mon Sep 17 00:00:00 2001 From: zhh Date: Mon, 19 Nov 2018 16:10:34 +0800 Subject: [PATCH] =?UTF-8?q?=E9=99=90=E6=97=B6=E8=B4=AD=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- document/sql/mall.sql | 68 ++++++++++++++----- .../SmsFlashPromotionSessionController.java | 19 ++++-- .../dto/SmsFlashPromotionSessionDetail.java | 15 ++++ ...sFlashPromotionProductRelationService.java | 8 +++ .../SmsFlashPromotionSessionService.java | 8 ++- ...shPromotionProductRelationServiceImpl.java | 10 +++ .../SmsFlashPromotionSessionServiceImpl.java | 27 ++++++-- .../SmsFlashPromotionProductRelationDao.xml | 4 ++ 8 files changed, 131 insertions(+), 28 deletions(-) create mode 100644 mall-admin/src/main/java/com/macro/mall/dto/SmsFlashPromotionSessionDetail.java diff --git a/document/sql/mall.sql b/document/sql/mall.sql index ec4d36a..e0ec894 100644 --- a/document/sql/mall.sql +++ b/document/sql/mall.sql @@ -10,7 +10,7 @@ Target Server Type : MYSQL Target Server Version : 50719 File Encoding : 65001 -Date: 2018-11-14 15:39:56 +Date: 2018-11-19 16:09:46 */ SET FOREIGN_KEY_CHECKS=0; @@ -886,20 +886,20 @@ INSERT INTO `pms_product` VALUES ('12', '1', '7', '0', '1', '女式超柔软拉 INSERT INTO `pms_product` VALUES ('13', '1', '7', '0', '1', '女式超柔软拉毛运动开衫3', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180522/web.png', 'No86577', '1', '1', '0', '1', '0', '0', '0', '249.00', '0.00', '0', '100', '0', '匠心剪裁，垂感质地', '匠心剪裁，垂感质地', '299.00', '100', '0', '件', '0.00', '0', 'string', '女式超柔软拉毛运动开衫', 'string', 'string', 'string', 'string', 'string', 'string', '2018-04-26 10:41:03', '2018-04-26 10:41:03', '0', '0', '万和', '外套'); INSERT INTO `pms_product` VALUES ('14', '1', '7', '0', '1', '女式超柔软拉毛运动开衫3', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180522/web.png', 'No86577', '1', '0', '0', '1', '0', '0', '0', '249.00', '0.00', '0', '100', '0', '匠心剪裁，垂感质地', '匠心剪裁，垂感质地', '299.00', '100', '0', '件', '0.00', '0', 'string', '女式超柔软拉毛运动开衫', 'string', 'string', 'string', 'string', 'string', 'string', '2018-04-26 10:41:03', '2018-04-26 10:41:03', '0', '0', '万和', '外套'); INSERT INTO `pms_product` VALUES ('18', '1', '7', '0', '1', '女式超柔软拉毛运动开衫3', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180522/web.png', 'No86577', '1', '0', '0', '1', '0', '0', '0', '249.00', '0.00', '0', '100', '0', '匠心剪裁，垂感质地', '匠心剪裁，垂感质地', '299.00', '100', '0', '件', '0.00', '0', 'string', '女式超柔软拉毛运动开衫', 'string', 'string', 'string', 'string', 'string', 'string', '2018-04-26 10:41:03', '2018-04-26 10:41:03', '0', '0', '万和', '外套'); -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', '0', '0', '', '0.00', '1', '1,2', '', '', '', '', '', '', '', null, null, '0', '0', '小米', '外套'); +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', '毛衫测试', '毛衫测试', '

', '', 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', '0', '0', '', '0.00', '0', '', '', '', '', '', '', '', '', null, null, '0', '0', '小米', '外套'); +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', '', '', '

', '', 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', '0', '0', '', '0.00', '0', '', '', '', '', '', '', '

', '', 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', '0', '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', '0', '0', '0', '0', '5499.00', null, '5499', '5499', '0', '【限时限量抢购】Apple产品年中狂欢节，好物尽享，美在智慧！速来 >> 勾选[保障服务][原厂保2年]，获得AppleCare+全方位服务计划，原厂延保售后无忧。', '', '5499.00', '0', '0', '', '0.00', '0', '', '', '', '', '', '', '', '', null, null, '0', '0', '苹果', '手机数码'); -INSERT INTO `pms_product` VALUES ('30', '50', '8', '0', '1', 'HLA海澜之家简约动物印花短袖T恤', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/5ad83a4fN6ff67ecd.jpg!cc_350x449.jpg', 'HNTBJ2E042A', '0', '1', '1', '1', '0', '0', '0', '98.00', null, '0', '0', '0', '2018夏季新品微弹舒适新款短T男生 6月6日-6月20日，满300减30，参与互动赢百元礼券，立即分享赢大奖', '', '98.00', '0', '0', '', '0.00', '0', '', '', '', '', '', '', '', '', null, null, '0', '0', '海澜之家', 'T恤'); -INSERT INTO `pms_product` VALUES ('31', '50', '8', '0', '1', 'HLA海澜之家蓝灰花纹圆领针织布短袖T恤', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/5ac98b64N70acd82f.jpg!cc_350x449.jpg', 'HNTBJ2E080A', '0', '1', '0', '0', '0', '0', '0', '98.00', null, '0', '0', '0', '2018夏季新品短袖T恤男HNTBJ2E080A 蓝灰花纹80 175/92A/L80A 蓝灰花纹80 175/92A/L', '', '98.00', '0', '0', '', '0.00', '0', '', '', '', '', '', '', '', '', null, null, '0', '0', '海澜之家', 'T恤'); -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', '0', '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', '0', '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', '0', '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', '0', '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', '0', '0', '', '0.00', '0', '', '', '', '', '', '', '', '', null, null, '0', '0', 'NIKE', '男鞋'); +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', '', '', '', '', '', '', '

', '', 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', '0', '0', '0', '0', '5499.00', null, '5499', '5499', '0', '【限时限量抢购】Apple产品年中狂欢节，好物尽享，美在智慧！速来 >> 勾选[保障服务][原厂保2年]，获得AppleCare+全方位服务计划，原厂延保售后无忧。', '', '5499.00', '100', '0', '', '0.00', '0', '', '', '', '', '', '', '', '', null, null, '0', '0', '苹果', '手机数码'); +INSERT INTO `pms_product` VALUES ('30', '50', '8', '0', '1', 'HLA海澜之家简约动物印花短袖T恤', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/5ad83a4fN6ff67ecd.jpg!cc_350x449.jpg', 'HNTBJ2E042A', '0', '1', '1', '1', '0', '0', '0', '98.00', null, '0', '0', '0', '2018夏季新品微弹舒适新款短T男生 6月6日-6月20日，满300减30，参与互动赢百元礼券，立即分享赢大奖', '', '98.00', '100', '0', '', '0.00', '0', '', '', '', '', '', '', '', '', null, null, '0', '0', '海澜之家', 'T恤'); +INSERT INTO `pms_product` VALUES ('31', '50', '8', '0', '1', 'HLA海澜之家蓝灰花纹圆领针织布短袖T恤', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180615/5ac98b64N70acd82f.jpg!cc_350x449.jpg', 'HNTBJ2E080A', '0', '1', '0', '0', '0', '0', '0', '98.00', null, '0', '0', '0', '2018夏季新品短袖T恤男HNTBJ2E080A 蓝灰花纹80 175/92A/L80A 蓝灰花纹80 175/92A/L', '', '98.00', '100', '0', '', '0.00', '0', '', '', '', '', '', '', '', '', null, null, '0', '0', '海澜之家', 'T恤'); +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', '男鞋'); -- ---------------------------- -- Table structure for pms_product_attribute @@ -1469,11 +1469,20 @@ CREATE TABLE `sms_flash_promotion` ( `status` int(1) DEFAULT NULL COMMENT '上下线状态', `create_time` datetime DEFAULT NULL COMMENT '秒杀时间段名称', PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='限时购表'; +) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=utf8 COMMENT='限时购表'; -- ---------------------------- -- Records of sms_flash_promotion -- ---------------------------- +INSERT INTO `sms_flash_promotion` VALUES ('2', '春季家电家具疯狂秒杀1', '2018-11-12', '2018-11-23', '1', '2018-11-16 11:12:13'); +INSERT INTO `sms_flash_promotion` VALUES ('3', '手机特卖', '2018-11-03', '2018-11-10', '1', '2018-11-16 11:11:31'); +INSERT INTO `sms_flash_promotion` VALUES ('4', '春季家电家具疯狂秒杀3', '2018-11-24', '2018-11-25', '1', '2018-11-16 11:12:19'); +INSERT INTO `sms_flash_promotion` VALUES ('5', '春季家电家具疯狂秒杀4', '2018-11-16', '2018-11-16', '1', '2018-11-16 11:12:24'); +INSERT INTO `sms_flash_promotion` VALUES ('6', '春季家电家具疯狂秒杀5', '2018-11-16', '2018-11-16', '1', '2018-11-16 11:12:31'); +INSERT INTO `sms_flash_promotion` VALUES ('7', '春季家电家具疯狂秒杀6', '2018-11-16', '2018-11-16', '1', '2018-11-16 11:12:35'); +INSERT INTO `sms_flash_promotion` VALUES ('8', '春季家电家具疯狂秒杀7', '2018-11-16', '2018-11-16', '0', '2018-11-16 11:12:39'); +INSERT INTO `sms_flash_promotion` VALUES ('9', '春季家电家具疯狂秒杀8', '2018-11-16', '2018-11-16', '0', '2018-11-16 11:12:42'); +INSERT INTO `sms_flash_promotion` VALUES ('13', '测试', '2018-11-01', '2018-11-30', '0', '2018-11-19 10:34:24'); -- ---------------------------- -- Table structure for sms_flash_promotion_log @@ -1499,7 +1508,7 @@ CREATE TABLE `sms_flash_promotion_log` ( -- ---------------------------- DROP TABLE IF EXISTS `sms_flash_promotion_product_relation`; CREATE TABLE `sms_flash_promotion_product_relation` ( - `id` bigint(20) NOT NULL COMMENT '编号', + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '编号', `flash_promotion_id` bigint(20) DEFAULT NULL, `flash_promotion_session_id` bigint(20) DEFAULT NULL COMMENT '编号', `product_id` bigint(20) DEFAULT NULL, @@ -1508,11 +1517,27 @@ CREATE TABLE `sms_flash_promotion_product_relation` ( `flash_promotion_limit` int(11) DEFAULT NULL COMMENT '每人限购数量', `sort` int(11) DEFAULT NULL COMMENT '排序', PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='商品限时购与商品关系表'; +) ENGINE=InnoDB AUTO_INCREMENT=21 DEFAULT CHARSET=utf8 COMMENT='商品限时购与商品关系表'; -- ---------------------------- -- Records of sms_flash_promotion_product_relation -- ---------------------------- +INSERT INTO `sms_flash_promotion_product_relation` VALUES ('1', '2', '1', '26', '3000.00', '10', '1', '0'); +INSERT INTO `sms_flash_promotion_product_relation` VALUES ('2', '2', '1', '27', '2000.00', '10', '1', '20'); +INSERT INTO `sms_flash_promotion_product_relation` VALUES ('3', '2', '1', '28', '599.00', '19', '1', '0'); +INSERT INTO `sms_flash_promotion_product_relation` VALUES ('4', '2', '1', '29', '4999.00', '10', '1', '100'); +INSERT INTO `sms_flash_promotion_product_relation` VALUES ('9', '2', '2', '26', '2999.00', '100', '1', '0'); +INSERT INTO `sms_flash_promotion_product_relation` VALUES ('10', '2', '2', '27', null, null, null, null); +INSERT INTO `sms_flash_promotion_product_relation` VALUES ('11', '2', '2', '28', null, null, null, null); +INSERT INTO `sms_flash_promotion_product_relation` VALUES ('12', '2', '2', '29', null, null, null, null); +INSERT INTO `sms_flash_promotion_product_relation` VALUES ('13', '2', '2', '30', null, null, null, null); +INSERT INTO `sms_flash_promotion_product_relation` VALUES ('14', '2', '3', '31', null, null, null, null); +INSERT INTO `sms_flash_promotion_product_relation` VALUES ('15', '2', '3', '32', null, null, null, null); +INSERT INTO `sms_flash_promotion_product_relation` VALUES ('16', '2', '4', '33', null, null, null, null); +INSERT INTO `sms_flash_promotion_product_relation` VALUES ('17', '2', '4', '34', null, null, null, null); +INSERT INTO `sms_flash_promotion_product_relation` VALUES ('18', '2', '5', '36', null, null, null, null); +INSERT INTO `sms_flash_promotion_product_relation` VALUES ('19', '2', '6', '33', null, null, null, null); +INSERT INTO `sms_flash_promotion_product_relation` VALUES ('20', '2', '6', '34', null, null, null, null); -- ---------------------------- -- Table structure for sms_flash_promotion_session @@ -1526,11 +1551,18 @@ CREATE TABLE `sms_flash_promotion_session` ( `status` int(1) DEFAULT NULL COMMENT '启用状态：0->不启用；1->启用', `create_time` datetime DEFAULT NULL COMMENT '创建时间', PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='限时购场次表'; +) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8 COMMENT='限时购场次表'; -- ---------------------------- -- Records of sms_flash_promotion_session -- ---------------------------- +INSERT INTO `sms_flash_promotion_session` VALUES ('1', '8:00', '08:00:29', '09:00:33', '1', '2018-11-16 13:22:17'); +INSERT INTO `sms_flash_promotion_session` VALUES ('2', '10:00', '10:00:33', '11:00:33', '1', '2018-11-16 13:22:34'); +INSERT INTO `sms_flash_promotion_session` VALUES ('3', '12:00', '12:00:00', '13:00:22', '1', '2018-11-16 13:22:37'); +INSERT INTO `sms_flash_promotion_session` VALUES ('4', '14:00', '14:00:00', '15:00:00', '1', '2018-11-16 13:22:41'); +INSERT INTO `sms_flash_promotion_session` VALUES ('5', '16:00', '16:00:00', '17:00:00', '1', '2018-11-16 13:22:45'); +INSERT INTO `sms_flash_promotion_session` VALUES ('6', '18:00', '18:00:00', '19:00:00', '1', '2018-11-16 13:21:34'); +INSERT INTO `sms_flash_promotion_session` VALUES ('7', '20:00', '20:00:33', '21:00:33', '0', '2018-11-16 13:22:55'); -- ---------------------------- -- Table structure for sms_home_advertise @@ -1682,7 +1714,7 @@ CREATE TABLE `ums_admin` ( -- Records of ums_admin -- ---------------------------- INSERT INTO `ums_admin` VALUES ('1', 'test', '202cb962ac59075b964b07152d234b70', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180607/timg.jpg', null, '测试账号', null, '2018-09-29 13:55:30', '2018-09-29 13:55:39', '1'); -INSERT INTO `ums_admin` VALUES ('3', 'admin', 'e10adc3949ba59abbe56e057f20f883e', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180607/timg.jpg', 'admin@163.com', '系统管理员', '系统管理员', '2018-10-08 13:32:47', '2018-11-13 09:49:27', '1'); +INSERT INTO `ums_admin` VALUES ('3', 'admin', 'e10adc3949ba59abbe56e057f20f883e', 'http://macro-oss.oss-cn-shenzhen.aliyuncs.com/mall/images/20180607/timg.jpg', 'admin@163.com', '系统管理员', '系统管理员', '2018-10-08 13:32:47', '2018-11-19 10:33:47', '1'); -- ---------------------------- -- Table structure for ums_admin_login_log diff --git a/mall-admin/src/main/java/com/macro/mall/controller/SmsFlashPromotionSessionController.java b/mall-admin/src/main/java/com/macro/mall/controller/SmsFlashPromotionSessionController.java index e6b92ae..f122afa 100644 --- a/mall-admin/src/main/java/com/macro/mall/controller/SmsFlashPromotionSessionController.java +++ b/mall-admin/src/main/java/com/macro/mall/controller/SmsFlashPromotionSessionController.java @@ -1,6 +1,7 @@ package com.macro.mall.controller; import com.macro.mall.dto.CommonResult; +import com.macro.mall.dto.SmsFlashPromotionSessionDetail; import com.macro.mall.model.SmsFlashPromotionSession; import com.macro.mall.service.SmsFlashPromotionSessionService; import io.swagger.annotations.Api; @@ -73,11 +74,19 @@ public class SmsFlashPromotionSessionController { return new CommonResult().success(promotionSession); } - @ApiOperation("根据状态获取全部场次") + @ApiOperation("获取全部场次") @RequestMapping(value = "/list", method = RequestMethod.GET) @ResponseBody - public Object list(Integer status) { - List promotionSessionList = flashPromotionSessionService.list(status); - return new CommonResult().pageSuccess(promotionSessionList); + public Object list() { + List promotionSessionList = flashPromotionSessionService.list(); + return new CommonResult().success(promotionSessionList); } -} + + @ApiOperation("获取全部可选场次及其数量") + @RequestMapping(value = "/selectList", method = RequestMethod.GET) + @ResponseBody + public Object selectList(Long flashPromotionId) { + List promotionSessionList = flashPromotionSessionService.selectList(flashPromotionId); + return new CommonResult().success(promotionSessionList); + } +} \ No newline at end of file diff --git a/mall-admin/src/main/java/com/macro/mall/dto/SmsFlashPromotionSessionDetail.java b/mall-admin/src/main/java/com/macro/mall/dto/SmsFlashPromotionSessionDetail.java new file mode 100644 index 0000000..f4368e7 --- /dev/null +++ b/mall-admin/src/main/java/com/macro/mall/dto/SmsFlashPromotionSessionDetail.java @@ -0,0 +1,15 @@ +package com.macro.mall.dto; + +import com.macro.mall.model.SmsFlashPromotionSession; +import lombok.Getter; +import lombok.Setter; + +/** + * 包含商品数量的场次信息 + * Created by macro on 2018/11/19. + */ +public class SmsFlashPromotionSessionDetail extends SmsFlashPromotionSession { + @Setter + @Getter + private Integer productCount; +} diff --git a/mall-admin/src/main/java/com/macro/mall/service/SmsFlashPromotionProductRelationService.java b/mall-admin/src/main/java/com/macro/mall/service/SmsFlashPromotionProductRelationService.java index 86dee8e..60786b9 100644 --- a/mall-admin/src/main/java/com/macro/mall/service/SmsFlashPromotionProductRelationService.java +++ b/mall-admin/src/main/java/com/macro/mall/service/SmsFlashPromotionProductRelationService.java @@ -39,4 +39,12 @@ public interface SmsFlashPromotionProductRelationService { * @param flashPromotionSessionId 限时购场次id */ List list(Long flashPromotionId, Long flashPromotionSessionId, Integer pageSize, Integer pageNum); + + /** + * 根据活动和场次id获取商品关系数量 + * @param flashPromotionId + * @param flashPromotionSessionId + * @return + */ + int getCount(Long flashPromotionId,Long flashPromotionSessionId); } diff --git a/mall-admin/src/main/java/com/macro/mall/service/SmsFlashPromotionSessionService.java b/mall-admin/src/main/java/com/macro/mall/service/SmsFlashPromotionSessionService.java index b67fcbb..d54178b 100644 --- a/mall-admin/src/main/java/com/macro/mall/service/SmsFlashPromotionSessionService.java +++ b/mall-admin/src/main/java/com/macro/mall/service/SmsFlashPromotionSessionService.java @@ -1,5 +1,6 @@ package com.macro.mall.service; +import com.macro.mall.dto.SmsFlashPromotionSessionDetail; import com.macro.mall.model.SmsFlashPromotionSession; import java.util.List; @@ -37,5 +38,10 @@ public interface SmsFlashPromotionSessionService { /** * 根据启用状态获取场次列表 */ - List list(Integer status); + List list(); + + /** + * 获取全部可选场次及其数量 + */ + List selectList(Long flashPromotionId); } diff --git a/mall-admin/src/main/java/com/macro/mall/service/impl/SmsFlashPromotionProductRelationServiceImpl.java b/mall-admin/src/main/java/com/macro/mall/service/impl/SmsFlashPromotionProductRelationServiceImpl.java index a8733af..bcb4276 100644 --- a/mall-admin/src/main/java/com/macro/mall/service/impl/SmsFlashPromotionProductRelationServiceImpl.java +++ b/mall-admin/src/main/java/com/macro/mall/service/impl/SmsFlashPromotionProductRelationServiceImpl.java @@ -5,6 +5,7 @@ import com.macro.mall.dao.SmsFlashPromotionProductRelationDao; import com.macro.mall.dto.SmsFlashPromotionProduct; import com.macro.mall.mapper.SmsFlashPromotionProductRelationMapper; import com.macro.mall.model.SmsFlashPromotionProductRelation; +import com.macro.mall.model.SmsFlashPromotionProductRelationExample; import com.macro.mall.service.SmsFlashPromotionProductRelationService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -50,4 +51,13 @@ public class SmsFlashPromotionProductRelationServiceImpl implements SmsFlashProm PageHelper.startPage(pageNum,pageSize); return relationDao.getList(flashPromotionId,flashPromotionSessionId); } + + @Override + public int getCount(Long flashPromotionId, Long flashPromotionSessionId) { + SmsFlashPromotionProductRelationExample example = new SmsFlashPromotionProductRelationExample(); + example.createCriteria() + .andFlashPromotionIdEqualTo(flashPromotionId) + .andFlashPromotionSessionIdEqualTo(flashPromotionSessionId); + return relationMapper.countByExample(example); + } } diff --git a/mall-admin/src/main/java/com/macro/mall/service/impl/SmsFlashPromotionSessionServiceImpl.java b/mall-admin/src/main/java/com/macro/mall/service/impl/SmsFlashPromotionSessionServiceImpl.java index b23df92..cdd3148 100644 --- a/mall-admin/src/main/java/com/macro/mall/service/impl/SmsFlashPromotionSessionServiceImpl.java +++ b/mall-admin/src/main/java/com/macro/mall/service/impl/SmsFlashPromotionSessionServiceImpl.java @@ -1,12 +1,16 @@ package com.macro.mall.service.impl; +import com.macro.mall.dto.SmsFlashPromotionSessionDetail; import com.macro.mall.mapper.SmsFlashPromotionSessionMapper; import com.macro.mall.model.SmsFlashPromotionSession; import com.macro.mall.model.SmsFlashPromotionSessionExample; +import com.macro.mall.service.SmsFlashPromotionProductRelationService; import com.macro.mall.service.SmsFlashPromotionSessionService; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -18,6 +22,8 @@ import java.util.List; public class SmsFlashPromotionSessionServiceImpl implements SmsFlashPromotionSessionService { @Autowired private SmsFlashPromotionSessionMapper promotionSessionMapper; + @Autowired + private SmsFlashPromotionProductRelationService relationService; @Override public int create(SmsFlashPromotionSession promotionSession) { @@ -50,11 +56,24 @@ public class SmsFlashPromotionSessionServiceImpl implements SmsFlashPromotionSes } @Override - public List list(Integer status) { + public List list() { SmsFlashPromotionSessionExample example = new SmsFlashPromotionSessionExample(); - if (status != null) { - example.createCriteria().andStatusEqualTo(status); - } return promotionSessionMapper.selectByExample(example); } + + @Override + public List selectList(Long flashPromotionId) { + List result = new ArrayList<>(); + SmsFlashPromotionSessionExample example = new SmsFlashPromotionSessionExample(); + example.createCriteria().andStatusEqualTo(1); + List list = promotionSessionMapper.selectByExample(example); + for (SmsFlashPromotionSession promotionSession : list) { + SmsFlashPromotionSessionDetail detail = new SmsFlashPromotionSessionDetail(); + BeanUtils.copyProperties(promotionSession, detail); + int count = relationService.getCount(flashPromotionId, promotionSession.getId()); + detail.setProductCount(count); + result.add(detail); + } + return result; + } } diff --git a/mall-admin/src/main/resources/dao/SmsFlashPromotionProductRelationDao.xml b/mall-admin/src/main/resources/dao/SmsFlashPromotionProductRelationDao.xml index fb2a226..f00afc2 100644 --- a/mall-admin/src/main/resources/dao/SmsFlashPromotionProductRelationDao.xml +++ b/mall-admin/src/main/resources/dao/SmsFlashPromotionProductRelationDao.xml @@ -10,6 +10,9 @@ r.flash_promotion_price, r.flash_promotion_count, r.flash_promotion_limit, + r.flash_promotion_id, + r.flash_promotion_session_id, + r.product_id, r.sort, p.id p_id, p.`name` p_name, @@ -22,5 +25,6 @@ WHERE r.flash_promotion_id = #{flashPromotionId} AND r.flash_promotion_session_id = #{flashPromotionSessionId} + ORDER BY r.sort DESC \ No newline at end of file