| @@ -0,0 +1,27 @@ | |||||
| UPDATE `mallink`.`mall_permission` SET `resource_type` = 0, `url` = NULL WHERE `id` = 612; | |||||
| INSERT INTO `mallink`.`mall_permission`(`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) VALUES (61201, '微信物料', 612, 'Y', NULL, 1, NULL, NULL, 'xiaochengxupath', 'icon-wuliaoguanli-', 0, 61201); | |||||
| INSERT INTO `mallink`.`mall_permission`(`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) VALUES (61202, '抖音物料', 612, 'Y', NULL, 1, NULL, NULL, 'ttpath', 'icon-wuliaoguanli-', 0, 61202); | |||||
| INSERT INTO `mallink`.`mall_permission`(`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) VALUES (616, '批次活动', 6, 'Y', NULL, 0, NULL, NULL, NULL, 'icon-kehu', 0, 603); | |||||
| UPDATE `mallink`.`mall_permission` SET `parent_id` = 616, `sort` = 6611 WHERE `id` = 6611; | |||||
| INSERT INTO `mallink`.`mall_permission`(`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) VALUES (6610, '券批次管理', 616, 'Y', NULL, 1, NULL, NULL, 'couponbatch', NULL, 0, 6610); | |||||
| UPDATE `mallink`.`mall_sale_type` SET `menus` = '[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 50, 101, 102, 103, 104, 105, 106, 107, 108, 109, 201, 202, 203, 204, 205, 206, 209, 211, 212, 221, 222, 224, 225, 251, 299, 300, 301, 302, 303, 304, 305, 306, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 420, 421, 422, 431, 432, 501, 502, 503, 504, 505, 506, 507, 508, 509, 511, 512, 513, 514, 521, 522, 523, 531, 532, 533, 591, 592, 595, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 616, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 651, 652, 661, 662, 663, 664, 665, 666, 671, 672, 673, 674, 675, 681, 682, 683, 684, 685, 687, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 713, 714, 715, 901, 902, 903, 904, 905, 906, 907, 908, 910, 931, 932, 951, 952, 961, 962, 963, 965, 966, 967, 968, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017, 6610, 6611, 41701, 41702, 60701, 60702, 61201]' WHERE `id` = 1; | |||||
| UPDATE `mallink`.`mall_sale_type` SET `menus` = '[1, 2, 4, 5, 6, 7, 8, 9, 10, 50, 101, 102, 103, 104, 105, 106, 107, 201, 202, 203, 204, 205, 209, 211, 212, 221, 222, 224, 225, 251, 409, 410, 411, 416, 418, 420, 421, 501, 502, 503, 504, 505, 506, 507, 508, 509, 511, 512, 513, 514, 521, 522, 523, 531, 532, 533, 591, 592, 595, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 616, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 651, 652, 661, 662, 663, 664, 665, 666, 671, 672, 673, 674, 675, 681, 682, 683, 684, 685, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 713, 714, 715, 901, 902, 903, 904, 905, 906, 907, 908, 910, 931, 932, 951, 961, 6610, 6611, 60701, 60702, 61201]' WHERE `id` = 2; | |||||
| UPDATE `mallink`.`mall_sale_type` SET `menus` = '[2, 4, 5, 6, 7, 10, 50, 201, 202, 205, 211, 212, 221, 222, 224, 225, 251, 409, 410, 411, 416, 418, 501, 502, 503, 504, 505, 506, 507, 508, 511, 512, 513, 514, 521, 522, 523, 531, 532, 533, 591, 592, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 621, 622, 623, 624, 625, 626, 641, 642, 643, 644, 645, 646, 651, 652, 661, 662, 663, 664, 671, 672, 673, 674, 675, 681, 682, 683, 684, 685, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 713, 715, 901, 902, 903, 904, 905, 906, 907, 908, 910, 931, 932, 60701, 60702, 61201]' WHERE `id` = 3; | |||||
| UPDATE `mallink`.`mall_sale_type` SET `menus` = '[2, 4, 5, 6, 7, 10, 50, 201, 202, 205, 211, 212, 221, 222, 224, 251, 409, 410, 411, 416, 418, 501, 502, 503, 504, 505, 506, 507, 508, 511, 512, 513, 514, 521, 522, 523, 531, 532, 591, 601, 602, 604, 605, 606, 607, 608, 610, 611, 612, 613, 622, 623, 624, 625, 626, 641, 642, 643, 644, 661, 662, 663, 664, 671, 672, 674, 675, 681, 682, 684, 685, 691, 692, 693, 694, 695, 711, 901, 902, 904, 905, 906, 907, 908, 910, 931, 932, 60701, 60702, 61201]' WHERE `id` = 4; | |||||
| UPDATE `mallink`.`mall_sale_type` SET `menus` = '[1, 2, 4, 5, 6, 50, 105, 110, 201, 205, 202, 211, 212, 221, 222, 223, 224, 251, 409, 410, 411, 416, 500, 502, 504, 505, 506, 507, 511, 512, 521, 522, 523, 591, 592, 595, 601, 602, 605, 606, 610, 612, 615, 622, 647, 676, 680, 711, 901, 902, 904, 907, 61202, 61501, 61502]' WHERE `id` = 11; | |||||
| UPDATE `mallink`.`mall_sale_type` SET `menus` = '[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 50, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 201, 202, 203, 204, 205, 206, 209, 211, 212, 221, 222, 223, 224, 225, 251, 299, 300, 301, 302, 303, 304, 305, 306, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 420, 421, 422, 431, 432, 500, 501, 502, 503, 504, 505, 506, 507, 508, 509, 511, 512, 513, 514, 521, 522, 523, 531, 532, 533, 591, 592, 595, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 615, 616, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 647, 651, 652, 661, 662, 663, 664, 665, 666, 671, 672, 673, 674, 675, 676, 680, 681, 682, 683, 684, 685, 687, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 713, 714, 715, 901, 902, 903, 904, 905, 906, 907, 908, 910, 931, 932, 951, 952, 961, 962, 963, 965, 966, 967, 968, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017, 6610, 6611, 41701, 41702, 60701, 60702, 61201, 61202, 61501, 61502]' WHERE `id` = 12; | |||||
| UPDATE `mallink`.`mall_sale_type` SET `menus` = '[1, 2, 5, 6, 8, 10, 50, 101, 102, 104, 105, 106, 108, 109, 203, 204, 206, 207, 501, 502, 503, 504, 505, 506, 507, 511, 512, 522, 523, 509, 591, 595, 601, 605, 621, 622, 623, 624, 625, 626, 627, 671, 901, 902]' WHERE `id` = 100; | |||||
| UPDATE `mallink`.`mall_sale_type` SET `menus` = '[1, 2, 4, 5, 6, 50, 105, 110, 201, 205, 202, 211, 212, 221, 222, 223, 224, 251, 409, 410, 411, 416, 500, 502, 504, 505, 506, 507, 511, 512, 521, 522, 523, 591, 592, 595, 601, 602, 605, 606, 610, 615, 622, 648, 649, 676, 680, 711, 901, 902, 904, 907, 61501, 61502]' WHERE `id` = 101; | |||||
| UPDATE `mallink`.`mall_sale_type` SET `menus` = '[1, 2, 4, 5, 6, 50, 105, 110, 201, 205, 202, 211, 212, 221, 222, 223, 224, 251, 409, 410, 411, 416, 500, 502, 504, 505, 506, 507, 511, 512, 521, 522, 523, 591, 592, 595, 601, 602, 605, 606, 610, 612, 615, 622, 647, 650, 676, 680, 711, 901, 902, 904, 907, 41001, 61202, 61501, 61502, 71101]' WHERE `id` = 102; | |||||
| UPDATE `mallink`.`mall_sale_type` SET `menus` = '[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 50, 101, 102, 103, 104, 105, 106, 107, 108, 109, 201, 202, 203, 204, 205, 206, 209, 211, 212, 221, 222, 224, 225, 251, 299, 300, 301, 302, 303, 304, 305, 306, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 420, 421, 422, 431, 432, 501, 502, 503, 504, 505, 506, 507, 508, 509, 511, 512, 513, 514, 521, 522, 523, 531, 532, 533, 591, 592, 595, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 616, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 651, 652, 661, 662, 663, 664, 665, 666, 671, 672, 673, 674, 675, 681, 682, 683, 684, 685, 687, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 713, 714, 715, 901, 902, 903, 904, 905, 906, 907, 910, 931, 932, 951, 952, 961, 962, 963, 965, 966, 967, 968, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017, 6610, 6611, 41701, 41702, 60701, 60702, 61201]' WHERE `id` = 1028; | |||||
| UPDATE `mallink`.`mall_sale_type` SET `menus` = '[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 50, 101, 102, 103, 104, 105, 106, 107, 108, 109, 201, 202, 203, 204, 205, 206, 209, 211, 212, 221, 222, 224, 225, 251, 299, 300, 307, 308, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 420, 421, 422, 431, 432, 501, 502, 503, 504, 505, 506, 507, 508, 509, 511, 512, 513, 514, 521, 522, 523, 531, 532, 533, 591, 592, 595, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 616, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 651, 652, 661, 662, 663, 664, 665, 666, 671, 672, 673, 674, 675, 681, 682, 683, 684, 685, 687, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 713, 714, 715, 901, 902, 903, 904, 905, 906, 907, 908, 910, 931, 932, 951, 952, 961, 962, 963, 965, 966, 967, 968, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017, 6610, 6611, 41701, 41702, 60701, 60702, 61201]' WHERE `id` = 1035001036; | |||||
| UPDATE `mallink`.`mall_sale_type` SET `menus` = '[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 50, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 201, 202, 203, 204, 205, 206, 209, 211, 212, 221, 222, 225, 223, 224, 251, 299, 300, 307, 308, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 420, 421, 422, 431, 432, 500, 501, 502, 503, 504, 505, 506, 507, 508, 509, 511, 512, 513, 514, 521, 522, 523, 531, 532, 533, 591, 592, 595, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 615, 616, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 647, 651, 652, 661, 662, 663, 664, 665, 666, 671, 672, 673, 674, 675, 676, 680, 681, 682, 683, 684, 685, 687, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 713, 714, 715, 901, 902, 903, 904, 905, 906, 907, 908, 910, 931, 932, 951, 952, 961, 962, 963, 965, 966, 967, 968, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017, 6610, 6611, 41701, 41702, 60701, 60702, 61201, 61202, 61501, 61502]' WHERE `id` = 103500103610; | |||||
| @@ -1,6 +1,6 @@ | |||||
| alter table wx_coupon_password add column price int(11) not null default 0 comment '面额'; | |||||
| update wx_coupon_password cp inner join wx_coupon_89 c on cp.coupon_id = c.id set cp.price = c.price where cp.price = 0 and c.price > 0 ; | |||||
| ###已上线已执行### | |||||
| #alter table wx_coupon_password add column price int(11) not null default 0 comment '面额'; | |||||
| #update wx_coupon_password cp inner join wx_coupon_89 c on cp.coupon_id = c.id set cp.price = c.price where cp.price = 0 and c.price > 0 ; | |||||
| @@ -0,0 +1,205 @@ | |||||
| ALTER TABLE `mallink`.`tt_merchant_poi` | |||||
| MODIFY COLUMN `poi_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '抖音POIID' AFTER `extra`; | |||||
| ALTER TABLE `mallink`.`wx_order_0` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_1` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_2` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_3` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_4` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_5` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_6` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_7` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_8` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_9` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_10` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_11` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_12` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_13` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_14` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_15` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_16` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_17` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_18` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_19` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_20` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_21` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_22` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_23` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_24` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_25` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_26` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_27` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_28` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_29` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_30` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_31` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_32` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_33` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_34` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_35` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_36` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_37` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_38` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_39` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_40` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_41` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_42` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_43` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_44` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_45` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_46` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_47` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_48` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_49` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_50` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_51` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_52` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_53` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_54` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_55` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_56` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_57` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_58` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_59` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_60` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_61` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_62` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_63` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_64` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_65` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_66` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_67` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_68` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_69` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_70` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_71` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_72` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_73` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_74` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_75` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_76` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_77` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_78` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_79` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_80` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_81` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_82` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_83` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_84` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_85` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_86` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_87` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_88` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_89` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_90` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_91` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_92` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_93` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_94` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_95` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_96` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_97` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_98` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| ALTER TABLE `mallink`.`wx_order_99` | |||||
| ADD COLUMN `from_id` varchar(100) COMMENT '来自' AFTER `ext_param`; | |||||
| @@ -0,0 +1,24 @@ | |||||
| CREATE TABLE `wx_coupon_batch` ( | |||||
| `id` bigint(20) unsigned NOT NULL, | |||||
| `tenant_id` varchar(5) NOT NULL, | |||||
| `parent_tenant_id` varchar(5) DEFAULT NULL, | |||||
| `name` varchar(100) DEFAULT NULL COMMENT '批次名称', | |||||
| `status` int(1) NOT NULL DEFAULT '0' COMMENT '状态0-草稿 1-进行中 2-已停止', | |||||
| `create_date` datetime DEFAULT NULL, | |||||
| `update_date` datetime DEFAULT NULL, | |||||
| `allow_count` int(3) NOT NULL DEFAULT '0' COMMENT '限购次数', | |||||
| PRIMARY KEY (`id`) | |||||
| ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; | |||||
| CREATE TABLE `wx_coupon_batch_item` ( | |||||
| `id` bigint(20) unsigned NOT NULL, | |||||
| `coupon_batch_id` bigint(20) NOT NULL COMMENT '批次id', | |||||
| `coupon_id` bigint(20) NOT NULL COMMENT '砍价券id', | |||||
| `coupon_batch_status` int(1) NOT NULL COMMENT '批次状态', | |||||
| `create_date` datetime DEFAULT NULL, | |||||
| `update_date` datetime DEFAULT NULL, | |||||
| `tenant_id` varchar(5) NOT NULL, | |||||
| `parent_tenant_id` varchar(5) DEFAULT NULL, | |||||
| PRIMARY KEY (`id`) | |||||
| ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; | |||||
| @@ -199,54 +199,50 @@ public class WxCardPayController extends BaseController { | |||||
| } | } | ||||
| // @ApiOperation("C端扫B端储值卡交易流水列表接口") | |||||
| // @GetMapping("list") | |||||
| // @ApiImplicitParams({ | |||||
| // @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), | |||||
| // @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) | |||||
| // public ResultData cardSpendList(@ModelAttribute WxCardSpendVo wxCardSpend, Integer pageNum, Integer pageSize) { | |||||
| // String ipStr = getIpAddr(); | |||||
| // logger.info("list: " + ipStr + " :" + wxCardSpend.toString()); | |||||
| // Long memberId; | |||||
| // try { | |||||
| // memberId = getMemberId(); | |||||
| // } catch (Exception e) { | |||||
| // return new ResultData(Result.ERROR,e.getMessage()); | |||||
| // } | |||||
| // return cardSpendList(wxCardSpend,memberId, pageNum, pageSize); | |||||
| // } | |||||
| // | |||||
| // private ResultData cardSpendList(WxCardSpendVo wxCardSpend,Long cUserId,Integer pageNum, Integer pageSize) { | |||||
| // if (wxCardSpend == null) wxCardSpend = new WxCardSpendVo(); | |||||
| // wxCardSpend.updateTenantInfo(getTenantInfo()); | |||||
| // wxCardSpend.setOwnerId(cUserId); | |||||
| // List<Integer> sources = new ArrayList<Integer>(); | |||||
| // sources.add(EnumMerchantSubsidySource.CARD.getCode()); | |||||
| // wxCardSpend.setSources(sources); | |||||
| // wxCardSpend.setCardSpendListShow(1); | |||||
| // final PageInfo<WxCardSpendVo> page = wxCardSpendService.listAsPage(wxCardSpend, pageNum, pageSize); | |||||
| // return new ResultData(page); | |||||
| // } | |||||
| // | |||||
| // @ApiOperation("C端扫B端储值卡交易流水SUM接口") | |||||
| // @GetMapping("sum") | |||||
| // public ResultData sumCardSpendList(@ModelAttribute WxCardSpendVo wxCardSpend) { | |||||
| // String ipStr = getIpAddr(); | |||||
| // logger.info("sumCardSpendList: " + ipStr + " :" + wxCardSpend.toString()); | |||||
| // Long memberId; | |||||
| // try { | |||||
| // memberId = getMemberId(); | |||||
| // } catch (Exception e) { | |||||
| // return new ResultData(Result.ERROR,e.getMessage()); | |||||
| // } | |||||
| // return sumCardSpendList(wxCardSpend,memberId); | |||||
| // } | |||||
| // | |||||
| // private ResultData sumCardSpendList(WxCardSpendVo wxCardSpend,Long cUserId) { | |||||
| // if (wxCardSpend == null) wxCardSpend = new WxCardSpendVo(); | |||||
| // wxCardSpend.updateTenantInfo(getTenantInfo()); | |||||
| // wxCardSpend.setOwnerId(cUserId); | |||||
| // final List<Map<String, Object>> mapList = wxCardSpendService.sumCardSpendForOwner(wxCardSpend); | |||||
| // return new ResultData(mapList); | |||||
| // } | |||||
| @ApiOperation("C端扫B端储值卡交易流水列表接口") | |||||
| @GetMapping("list") | |||||
| @ApiImplicitParams({ | |||||
| @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), | |||||
| @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) | |||||
| public ResultData cardSpendList(@ModelAttribute WxCardSpendVo wxCardSpend, Integer pageNum, Integer pageSize) { | |||||
| String ipStr = getIpAddr(); | |||||
| logger.info("list: " + ipStr + " :" + wxCardSpend.toString()); | |||||
| Long memberId; | |||||
| try { | |||||
| memberId = getMemberId(); | |||||
| } catch (Exception e) { | |||||
| return new ResultData(Result.ERROR,e.getMessage()); | |||||
| } | |||||
| return cardSpendList(wxCardSpend,memberId, pageNum, pageSize); | |||||
| } | |||||
| private ResultData cardSpendList(WxCardSpendVo wxCardSpend,Long cUserId,Integer pageNum, Integer pageSize) { | |||||
| if (wxCardSpend == null) wxCardSpend = new WxCardSpendVo(); | |||||
| wxCardSpend.updateTenantInfo(getTenantInfo()); | |||||
| wxCardSpend.setOwnerId(cUserId); | |||||
| final PageInfo<WxCardSpendVo> page = wxCardSpendService.listAsPage(wxCardSpend, pageNum, pageSize); | |||||
| return new ResultData(page); | |||||
| } | |||||
| @ApiOperation("C端扫B端储值卡交易流水SUM接口") | |||||
| @GetMapping("sum") | |||||
| public ResultData sumCardSpendList(@ModelAttribute WxCardSpendVo wxCardSpend) { | |||||
| String ipStr = getIpAddr(); | |||||
| logger.info("sumCardSpendList: " + ipStr + " :" + wxCardSpend.toString()); | |||||
| Long memberId; | |||||
| try { | |||||
| memberId = getMemberId(); | |||||
| } catch (Exception e) { | |||||
| return new ResultData(Result.ERROR,e.getMessage()); | |||||
| } | |||||
| return sumCardSpendList(wxCardSpend,memberId); | |||||
| } | |||||
| private ResultData sumCardSpendList(WxCardSpendVo wxCardSpend,Long cUserId) { | |||||
| if (wxCardSpend == null) wxCardSpend = new WxCardSpendVo(); | |||||
| wxCardSpend.updateTenantInfo(getTenantInfo()); | |||||
| wxCardSpend.setOwnerId(cUserId); | |||||
| final Map<String, BigDecimal> mapList = wxCardSpendService.sumCardSpend(wxCardSpend); | |||||
| return new ResultData(mapList); | |||||
| } | |||||
| } | } | ||||
| @@ -181,7 +181,7 @@ public class WxOrderController extends BaseController { | |||||
| // logger.info("支付2.0预下单回调---header{}"+header.toString()); | // logger.info("支付2.0预下单回调---header{}"+header.toString()); | ||||
| String body = ((BodyReaderHttpServletRequestWrapper) request).getBody(); | String body = ((BodyReaderHttpServletRequestWrapper) request).getBody(); | ||||
| // logger.info("支付2.0预下单回调---body{}"+body); | |||||
| logger.info("支付2.0预下单回调---body{}"+body); | |||||
| try { | try { | ||||
| JSONObject jsonObject = JSONObject.parseObject(body); | JSONObject jsonObject = JSONObject.parseObject(body); | ||||
| String msg = jsonObject.getString("msg"); | String msg = jsonObject.getString("msg"); | ||||
| @@ -0,0 +1,41 @@ | |||||
| package com.iformall.domain.po; | |||||
| import com.baomidou.mybatisplus.annotation.TableField; | |||||
| import com.baomidou.mybatisplus.annotation.TableName; | |||||
| import com.iformall.domain.po.base.TenantEntity; | |||||
| import lombok.Data; | |||||
| import lombok.EqualsAndHashCode; | |||||
| import lombok.ToString; | |||||
| import java.util.Date; | |||||
| import java.util.List; | |||||
| @TableName(value = "wx_coupon_batch") | |||||
| @Data | |||||
| @ToString(callSuper = true) | |||||
| @EqualsAndHashCode(callSuper = true) | |||||
| public class WxCouponBatch extends TenantEntity { | |||||
| private static final long serialVersionUID = 6722507735075416305L; | |||||
| protected Long id; | |||||
| @TableField(exist = false) | |||||
| private List<Long> ids; | |||||
| @io.swagger.annotations.ApiModelProperty(value="批次名称",name="name") | |||||
| private String name; | |||||
| @io.swagger.annotations.ApiModelProperty(value="EnumPressBatchStatus",name="status") | |||||
| private Integer status; | |||||
| @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | |||||
| private Date createDate; | |||||
| @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | |||||
| private Date updateDate; | |||||
| @io.swagger.annotations.ApiModelProperty(value="限购次数",name="allowCount") | |||||
| private Integer allowCount; | |||||
| @TableField(exist = false) | |||||
| private String couponIds; | |||||
| @TableField(exist = false) | |||||
| private String couponName; | |||||
| } | |||||
| @@ -0,0 +1,34 @@ | |||||
| package com.iformall.domain.po; | |||||
| import com.baomidou.mybatisplus.annotation.TableField; | |||||
| import com.baomidou.mybatisplus.annotation.TableName; | |||||
| import com.iformall.domain.po.base.TenantEntity; | |||||
| import lombok.Data; | |||||
| import lombok.EqualsAndHashCode; | |||||
| import lombok.ToString; | |||||
| import java.util.Date; | |||||
| @TableName(value = "wx_coupon_batch_item") | |||||
| @Data | |||||
| @ToString(callSuper = true) | |||||
| @EqualsAndHashCode(callSuper = true) | |||||
| public class WxCouponBatchItem extends TenantEntity { | |||||
| private static final long serialVersionUID = 6722507735075416305L; | |||||
| protected Long id; | |||||
| @io.swagger.annotations.ApiModelProperty(value="批次id",name="couponBatchId") | |||||
| private Long couponBatchId; | |||||
| @io.swagger.annotations.ApiModelProperty(value="砍价券id",name="couponId") | |||||
| private Long couponId; | |||||
| @io.swagger.annotations.ApiModelProperty(value="EnumPressBatchStatus",name="pressBatchStatus") | |||||
| private Integer couponBatchStatus; | |||||
| @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | |||||
| private Date createDate; | |||||
| @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | |||||
| private Date updateDate; | |||||
| @TableField(exist = false) | |||||
| private WxCoupon coupon; | |||||
| } | |||||
| @@ -133,6 +133,9 @@ public class WxOrder extends TenantEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value="额外参数,用于第三方平台",name="extParam") | @io.swagger.annotations.ApiModelProperty(value="额外参数,用于第三方平台",name="extParam") | ||||
| private String extParam; | private String extParam; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "来自(抖音来自poiId)", name = "fromId") | |||||
| private String fromId; | |||||
| public Object getExpParamValue(String key) { | public Object getExpParamValue(String key) { | ||||
| if (StringUtils.isBlank(extParam)) { | if (StringUtils.isBlank(extParam)) { | ||||
| @@ -0,0 +1,20 @@ | |||||
| package com.iformall.domain.vo; | |||||
| import java.io.Serializable; | |||||
| import java.text.DecimalFormat; | |||||
| import java.util.List; | |||||
| import com.iformall.domain.po.WxCouponBatch; | |||||
| import com.iformall.domain.po.WxDateAmountRecord; | |||||
| import com.iformall.domain.po.WxPressBatch; | |||||
| import lombok.Data; | |||||
| @Data | |||||
| public class CouponBatchVo implements Serializable{ | |||||
| private static final long serialVersionUID = 4494858079134918638L; | |||||
| //核销金额记录 | |||||
| private WxCouponBatch couponBatch; | |||||
| private List<Long> couponIdList; | |||||
| } | |||||
| @@ -21,6 +21,7 @@ public class TtMaQrcode extends AbstractWxMaQrcodeWrapper implements Serializabl | |||||
| private String appname; | private String appname; | ||||
| private String path; | private String path; | ||||
| private int width = 430; | private int width = 430; | ||||
| private boolean set_icon = true; | |||||
| public TtMaQrcode(String appname, String path, int width) { | public TtMaQrcode(String appname, String path, int width) { | ||||
| this.appname = appname; | this.appname = appname; | ||||
| @@ -0,0 +1,23 @@ | |||||
| package com.iformall.mapper; | |||||
| import com.iformall.common.CommonMapper; | |||||
| import com.iformall.domain.po.WxCouponBatchItem; | |||||
| import java.util.List; | |||||
| import org.apache.ibatis.annotations.Param; | |||||
| public interface WxCouponBatchItemMapper extends CommonMapper<WxCouponBatchItem, Long> { | |||||
| List<WxCouponBatchItem> findList(WxCouponBatchItem record); | |||||
| List<Long> getBatchIdList(@Param("couponIds")List<Long> couponIds,@Param("tenantId")String tenantId,@Param("pressBatchStatus")Integer pressBatchStatus); | |||||
| WxCouponBatchItem getById(@Param("id")Long id,@Param("tenantId")String tenantId); | |||||
| void updateWxPressBatchStatus(WxCouponBatchItem record); | |||||
| void deleteItem(WxCouponBatchItem record); | |||||
| void deleteAllItem(WxCouponBatchItem record); | |||||
| List<Long> getCouponIds(@Param("pressBatchId")Long pressBatchId,@Param("tenantId")String tenantId,@Param("pressBatchStatus")Integer pressBatchStatus); | |||||
| } | |||||
| @@ -0,0 +1,19 @@ | |||||
| package com.iformall.mapper; | |||||
| import com.iformall.common.CommonMapper; | |||||
| import com.iformall.domain.po.WxCouponBatch; | |||||
| import java.util.List; | |||||
| import org.apache.ibatis.annotations.Param; | |||||
| public interface WxCouponBatchMapper extends CommonMapper<WxCouponBatch, Long> { | |||||
| List<WxCouponBatch> findList(WxCouponBatch record); | |||||
| WxCouponBatch getById(@Param("id")Long id,@Param("tenantId")String tenantId); | |||||
| void updateWxPressBatchStatus(WxCouponBatch record); | |||||
| void deleteById(@Param("id")Long id,@Param("tenantId")String tenantId); | |||||
| } | |||||
| @@ -0,0 +1,60 @@ | |||||
| package com.iformall.service; | |||||
| import java.util.*; | |||||
| import javax.servlet.http.HttpServletRequest; | |||||
| import javax.servlet.http.HttpServletResponse; | |||||
| import com.github.pagehelper.PageInfo; | |||||
| import com.iformall.common.ResultData; | |||||
| import com.iformall.domain.po.TtCouponChannelPoi; | |||||
| import com.iformall.domain.po.WxAppinfo; | |||||
| import com.iformall.domain.po.WxCoupon; | |||||
| import com.iformall.domain.po.WxCouponBatch; | |||||
| import com.iformall.domain.po.WxCouponBatchItem; | |||||
| import com.iformall.domain.po.WxOrder; | |||||
| import com.iformall.domain.po.WxPressBatch; | |||||
| import com.iformall.domain.po.WxPressBatchItem; | |||||
| import com.iformall.domain.po.base.TenantEntity; | |||||
| import com.iformall.domain.vo.CouponBatchVo; | |||||
| import com.iformall.domain.vo.CouponPressBatchVo; | |||||
| import com.iformall.domain.vo.TtCouponVo; | |||||
| import com.iformall.domain.vo.WxCouponCVo; | |||||
| import com.iformall.domain.vo.WxCouponStatisVo; | |||||
| import com.iformall.domain.vo.WxMerchantVo; | |||||
| public interface WxCouponBatchService { | |||||
| /** | |||||
| * 根据实体查询分页列表 | |||||
| * | |||||
| * @param record | |||||
| * @param pageIndex | |||||
| * @param pageSize | |||||
| * @return | |||||
| */ | |||||
| PageInfo<WxCouponBatch> listAsPage(WxCouponBatch record, Integer pageIndex, Integer pageSize); | |||||
| List<WxCouponBatch> list(WxCouponBatch wxCoupon); | |||||
| void saveOrUpdate(WxCouponBatch wxCoupon); | |||||
| WxCouponBatch getById(Long id,String tenantId); | |||||
| PageInfo<WxCouponBatchItem> getItemPage(Long batchId,String tenantId, Integer pageIndex, Integer pageSize); | |||||
| List<WxCouponBatchItem> getItemList(Long batchId,String tenantId); | |||||
| List<Long> getItemCouponIdList(Long batchId,String tenantId); | |||||
| List<Long> getCouponIds(String tenantId); | |||||
| void saveItems(WxCouponBatch pressBatch,List<Long> couponIds); | |||||
| void deleteBatch(Long id,String tenantId); | |||||
| void deleteItemById(Long itemId,String tenantId); | |||||
| void deleteItemByBatchId(Long batchId,String tenantId); | |||||
| void updateStatus(WxCouponBatch pressBatch); | |||||
| CouponBatchVo getCouponPressBatch(WxCoupon coupon, Long cUserId); | |||||
| } | |||||
| @@ -746,12 +746,18 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc | |||||
| @Override | @Override | ||||
| public void updateTenantIdMsg(TenantEntity tenantInfo, TenantEntity mallTenant, Long userId) { | public void updateTenantIdMsg(TenantEntity tenantInfo, TenantEntity mallTenant, Long userId) { | ||||
| FmInsideBasicUserPushMsg basicUserPushMsg = new FmInsideBasicUserPushMsg(); | |||||
| basicUserPushMsg.setMsgType(EnumMsgRecordType.MEMBER_UPDATE_TENANT.getCode()); | |||||
| basicUserPushMsg.updateTenantInfo(tenantInfo); | |||||
| basicUserPushMsg.setMallTenantEntity(mallTenant); | |||||
| basicUserPushMsg.setBasicUserId(userId); | |||||
| mqBaseProducer.sendMessage(basicUserPushMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); | |||||
| try{ | |||||
| FmInsideBasicUserPushMsg basicUserPushMsg = new FmInsideBasicUserPushMsg(); | |||||
| basicUserPushMsg.setMsgType(EnumMsgRecordType.MEMBER_UPDATE_TENANT.getCode()); | |||||
| basicUserPushMsg.updateTenantInfo(tenantInfo); | |||||
| basicUserPushMsg.setMallTenantEntity(mallTenant); | |||||
| basicUserPushMsg.setBasicUserId(userId); | |||||
| mqBaseProducer.sendMessage(basicUserPushMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); | |||||
| logger.info(">>>>>>>>>>>send updateTenantIdMsg :"+basicUserPushMsg); | |||||
| }catch(Exception e){ | |||||
| logger.info(">>>>>>>>>>>send updateTenantIdMsg : error"+e.getMessage()); | |||||
| } | |||||
| } | } | ||||
| @Override | @Override | ||||
| @@ -0,0 +1,197 @@ | |||||
| package com.iformall.service.impl; | |||||
| import com.aliyun.openservices.shade.org.apache.commons.lang3.StringUtils; | |||||
| import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; | |||||
| import com.github.pagehelper.PageHelper; | |||||
| import com.github.pagehelper.PageInfo; | |||||
| import com.iformall.common.IdWorker; | |||||
| import com.iformall.common.Result; | |||||
| import com.iformall.common.ResultData; | |||||
| import com.iformall.domain.po.*; | |||||
| import com.iformall.domain.po.base.TenantEntity; | |||||
| import com.iformall.domain.vo.CouponBatchVo; | |||||
| import com.iformall.domain.vo.CouponPressBatchVo; | |||||
| import com.iformall.enums.EnumOrderStatus; | |||||
| import com.iformall.enums.EnumOrderType; | |||||
| import com.iformall.enums.EnumPressBatchStatus; | |||||
| import com.iformall.enums.EnumYesOrNo; | |||||
| import com.iformall.exception.MallinkException; | |||||
| import com.iformall.mapper.*; | |||||
| import com.iformall.service.*; | |||||
| import org.slf4j.Logger; | |||||
| import org.slf4j.LoggerFactory; | |||||
| import org.springframework.beans.factory.annotation.Autowired; | |||||
| import org.springframework.stereotype.Service; | |||||
| import org.springframework.transaction.annotation.Propagation; | |||||
| import org.springframework.transaction.annotation.Transactional; | |||||
| import java.util.*; | |||||
| @Service | |||||
| public class WxCouponBatchServiceImpl implements WxCouponBatchService { | |||||
| private final Logger logger = LoggerFactory.getLogger(this.getClass()); | |||||
| @Autowired | |||||
| WxCouponBatchMapper wxCouponBatchMapper; | |||||
| @Autowired | |||||
| WxCouponBatchItemMapper wxCouponBatchItemMapper; | |||||
| @Autowired | |||||
| WxCouponOrderMapper wxCouponOrderMapper; | |||||
| @Autowired | |||||
| WxCouponMapper wxCouponMapper; | |||||
| @Override | |||||
| public List<WxCouponBatch> list(WxCouponBatch record){ | |||||
| return wxCouponBatchMapper.findList(record); | |||||
| } | |||||
| @Override | |||||
| public PageInfo<WxCouponBatch> listAsPage(WxCouponBatch record, Integer pageIndex, Integer pageSize) { | |||||
| if (!StringUtils.isBlank(record.getCouponName())) { | |||||
| WxCoupon cq = new WxCoupon(); | |||||
| cq.updateTenantInfo(record); | |||||
| cq.setTitle(StringUtils.trimToNull(record.getCouponName())); | |||||
| List<Long> cids = wxCouponMapper.findIdList(cq); | |||||
| if (null == cids || cids.size() <= 0 ) { | |||||
| record.setId(0L); | |||||
| }else { | |||||
| List<Long> ids = wxCouponBatchItemMapper.getBatchIdList(cids, record.getTenantId(), record.getStatus()); | |||||
| if (null == ids || ids.size() <= 0) { | |||||
| record.setId(0L); | |||||
| }else { | |||||
| record.setIds(ids); | |||||
| } | |||||
| } | |||||
| } | |||||
| return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponBatchMapper.findList(record)); | |||||
| } | |||||
| @Override | |||||
| public void saveOrUpdate(WxCouponBatch record) { | |||||
| if (null == record.getId()) { | |||||
| final IdWorker idWorker = IdWorker.get(); | |||||
| record.setId(idWorker.nextId()); | |||||
| record.setCreateDate(new Date()); | |||||
| record.setUpdateDate(new Date()); | |||||
| wxCouponBatchMapper.insert(record); | |||||
| }else { | |||||
| record.setUpdateDate(new Date()); | |||||
| wxCouponBatchMapper.updateById(record); | |||||
| } | |||||
| } | |||||
| @Override | |||||
| public WxCouponBatch getById(Long id,String tenantId) { | |||||
| return wxCouponBatchMapper.getById(id, tenantId); | |||||
| } | |||||
| @Override | |||||
| public PageInfo<WxCouponBatchItem> getItemPage(Long batchId,String tenantId, Integer pageIndex, Integer pageSize) { | |||||
| WxCouponBatchItem iteq = new WxCouponBatchItem(); | |||||
| iteq.setTenantId(tenantId); | |||||
| iteq.setCouponBatchId(batchId); | |||||
| return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponBatchItemMapper.findList(iteq)); | |||||
| } | |||||
| @Override | |||||
| public List<WxCouponBatchItem> getItemList(Long batchId, String tenantId) { | |||||
| WxCouponBatchItem iteq = new WxCouponBatchItem(); | |||||
| iteq.setTenantId(tenantId); | |||||
| iteq.setCouponBatchId(batchId); | |||||
| return wxCouponBatchItemMapper.findList(iteq); | |||||
| } | |||||
| @Override | |||||
| public List<Long> getItemCouponIdList(Long batchId, String tenantId) { | |||||
| WxCouponBatchItem iteq = new WxCouponBatchItem(); | |||||
| iteq.setTenantId(tenantId); | |||||
| iteq.setCouponBatchId(batchId); | |||||
| return wxCouponBatchItemMapper.getCouponIds(batchId, tenantId, null); | |||||
| } | |||||
| @Override | |||||
| public List<Long> getCouponIds(String tenantId) { | |||||
| WxCouponBatchItem iteq = new WxCouponBatchItem(); | |||||
| iteq.setTenantId(tenantId); | |||||
| return wxCouponBatchItemMapper.getCouponIds(null, tenantId, null); | |||||
| } | |||||
| @Override | |||||
| @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) | |||||
| public void saveItems(WxCouponBatch pressBatch, List<Long> couponIds) { | |||||
| for (Long cid : couponIds) { | |||||
| WxCouponBatchItem iteq = new WxCouponBatchItem(); | |||||
| iteq.updateTenantInfo(pressBatch); | |||||
| iteq.setCouponBatchId(pressBatch.getId()); | |||||
| iteq.setCouponId(cid); | |||||
| iteq.setCouponBatchStatus(pressBatch.getStatus()); | |||||
| iteq.setCreateDate(new Date()); | |||||
| iteq.setUpdateDate(new Date()); | |||||
| wxCouponBatchItemMapper.insert(iteq); | |||||
| } | |||||
| } | |||||
| @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) | |||||
| @Override | |||||
| public void deleteBatch(Long id, String tenantId) { | |||||
| wxCouponBatchMapper.deleteById(id, tenantId); | |||||
| deleteItemByBatchId(id, tenantId); | |||||
| } | |||||
| @Override | |||||
| public void deleteItemById(Long itemId, String tenantId) { | |||||
| WxCouponBatchItem iteq = new WxCouponBatchItem(); | |||||
| iteq.setTenantId(tenantId); | |||||
| iteq.setId(itemId); | |||||
| wxCouponBatchItemMapper.deleteItem(iteq); | |||||
| } | |||||
| @Override | |||||
| public void deleteItemByBatchId(Long batchId, String tenantId) { | |||||
| WxCouponBatchItem iteq = new WxCouponBatchItem(); | |||||
| iteq.setTenantId(tenantId); | |||||
| iteq.setCouponBatchId(batchId); | |||||
| wxCouponBatchItemMapper.deleteAllItem(iteq); | |||||
| } | |||||
| @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) | |||||
| @Override | |||||
| public void updateStatus(WxCouponBatch pressBatch) { | |||||
| wxCouponBatchMapper.updateWxPressBatchStatus(pressBatch); | |||||
| WxCouponBatchItem item = new WxCouponBatchItem(); | |||||
| item.updateTenantInfo(pressBatch); | |||||
| item.setCouponBatchId(pressBatch.getId()); | |||||
| item.setCouponBatchStatus(pressBatch.getStatus()); | |||||
| wxCouponBatchItemMapper.updateWxPressBatchStatus(item); | |||||
| } | |||||
| @Override | |||||
| public CouponBatchVo getCouponPressBatch(WxCoupon coupon, Long cUserId) { | |||||
| WxCouponBatchItem query = new WxCouponBatchItem(); | |||||
| query.updateTenantInfo(coupon); | |||||
| query.setCouponId(coupon.getId()); | |||||
| query.setCouponBatchStatus(EnumPressBatchStatus.RUNNING.getCode()); | |||||
| List<WxCouponBatchItem> batchList = wxCouponBatchItemMapper.findList(query); | |||||
| //一个砍价商品只能存在一个有效的批次 | |||||
| if (null != batchList && batchList.size() > 0 ) { | |||||
| if (batchList.size() > 1) { | |||||
| throw new MallinkException(Result.ERROR,"该券["+coupon.getTitle()+"]存在多个有效批次活动,请联系管理员重新设置."); | |||||
| }else { | |||||
| WxCouponBatchItem batchItem = batchList.get(0); | |||||
| WxCouponBatch pressBatch = wxCouponBatchMapper.getById(batchItem.getCouponBatchId(), batchItem.getTenantId()); | |||||
| //查询该批次下所有的砍价商品, | |||||
| List<Long> batchCouponIds = wxCouponBatchItemMapper.getCouponIds(batchItem.getCouponBatchId(), batchItem.getTenantId(), EnumPressBatchStatus.RUNNING.getCode()); | |||||
| if (null == batchCouponIds || batchCouponIds.size() <= 0 ) { | |||||
| throw new MallinkException(Result.ERROR,"未查询到砍价["+coupon.getTitle()+"]有效批次活动记录,"); | |||||
| } | |||||
| CouponBatchVo vo = new CouponBatchVo(); | |||||
| vo.setCouponBatch(pressBatch); | |||||
| vo.setCouponIdList(batchCouponIds); | |||||
| return vo; | |||||
| } | |||||
| } | |||||
| return null; | |||||
| } | |||||
| } | |||||
| @@ -237,6 +237,11 @@ public class WxOrderServiceImpl implements WxOrderService { | |||||
| @Autowired | @Autowired | ||||
| WxPressBatchService wxPressBatchService; | WxPressBatchService wxPressBatchService; | ||||
| @Lazy | |||||
| @Autowired | |||||
| WxCouponBatchService wxCouponBatchService; | |||||
| @Override | @Override | ||||
| public PageInfo<WxOrder> listAsPage(WxOrder record, Integer pageIndex, Integer pageSize) { | public PageInfo<WxOrder> listAsPage(WxOrder record, Integer pageIndex, Integer pageSize) { | ||||
| return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxOrderMapper.findList(record)); | return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxOrderMapper.findList(record)); | ||||
| @@ -775,51 +780,13 @@ public class WxOrderServiceImpl implements WxOrderService { | |||||
| // } | // } | ||||
| //如果是砍价,则需要判断批次规则 | //如果是砍价,则需要判断批次规则 | ||||
| if (isPressOrder) { | if (isPressOrder) { | ||||
| CouponPressBatchVo checkPressResult = wxPressBatchService.getCouponPressBatch(counpon, user.getId()); | |||||
| if (null != checkPressResult) { | |||||
| WxPressBatch pressBatch = checkPressResult.getPressBatch(); | |||||
| List<Long> cids = checkPressResult.getCouponIdList(); | |||||
| if (null != cids && cids.size() > 0 ) { | |||||
| couponOrderQ.setCouponIds(cids); | |||||
| //判断这些券发起中+已完成的 | |||||
| WxOrder orderq = new WxOrder(); | |||||
| orderq.updateTenantInfo(counpon); | |||||
| orderq.setCouponIds(cids); | |||||
| orderq.setCUserId(user.getId()); | |||||
| //if (pressBatch.getPromoterLimitRule().equals(EnumCouponUseLimitRule.TOBEUSED_USELIMIT.getCode())) { | |||||
| List<Integer> statusS = new ArrayList<Integer>(); | |||||
| statusS.add(EnumOrderStatus.ORDER_STATUS_PRESSING.getCode()); | |||||
| statusS.add(EnumOrderStatus.ORDER_STATUS_PRESS_COMPLETE.getCode()); | |||||
| statusS.add(EnumOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode()); | |||||
| statusS.add(EnumOrderStatus.ORDER_STATUS_PAYMENT_SUCCESS.getCode()); | |||||
| statusS.add(EnumOrderStatus.ORDER_STATUS_PENDING_REFUND.getCode()); | |||||
| statusS.add(EnumOrderStatus.ORDER_STATUS_REFUND_SUCCESS.getCode()); | |||||
| statusS.add(EnumOrderStatus.ORDER_STATUS_REFUND_FAILD.getCode()); | |||||
| orderq.setStatusS(statusS); | |||||
| //} | |||||
| int _count = wxOrderMapper.countCouponConditionType1(orderq); | |||||
| if (_count >= pressBatch.getPromoterAllowCount()) { | |||||
| throw new MallinkException(ErrorCode.ORDER_IS_FAIL.getCode(),"当前用户发起砍价次数已超限.["+pressBatch.getName()+"]"); | |||||
| } | |||||
| if (counpon.getUseLimitRule().equals(EnumCouponUseLimitRule.TOBEUSED_USELIMIT.getCode())) { | |||||
| couponOrderQ.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode()); | |||||
| } | |||||
| couponOrderQ.setCouponId(counpon.getId()); | |||||
| }else { | |||||
| throw new MallinkException(ErrorCode.ORDER_IS_FAIL.getCode(),"砍价批次["+pressBatch.getName()+"]未设置券."); | |||||
| } | |||||
| }else { | |||||
| if (counpon.getUseLimitRule().equals(EnumCouponUseLimitRule.TOBEUSED_USELIMIT.getCode())) { | |||||
| couponOrderQ.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode()); | |||||
| } | |||||
| couponOrderQ.setCouponId(counpon.getId()); | |||||
| } | |||||
| checkPressBatchRule(counpon, couponOrderQ, user); | |||||
| }else { | }else { | ||||
| if (counpon.getUseLimitRule().equals(EnumCouponUseLimitRule.TOBEUSED_USELIMIT.getCode())) { | |||||
| couponOrderQ.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode()); | |||||
| } | |||||
| couponOrderQ.setCouponId(counpon.getId()); | |||||
| checkCouponBatchRule(counpon, couponOrderQ, user); | |||||
| // if (counpon.getUseLimitRule().equals(EnumCouponUseLimitRule.TOBEUSED_USELIMIT.getCode())) { | |||||
| // couponOrderQ.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode()); | |||||
| // } | |||||
| // couponOrderQ.setCouponId(counpon.getId()); | |||||
| } | } | ||||
| return wxCouponOrderMapper.findProductCount(couponOrderQ)+couponNumber; | return wxCouponOrderMapper.findProductCount(couponOrderQ)+couponNumber; | ||||
| } catch(MallinkException e1) { | } catch(MallinkException e1) { | ||||
| @@ -830,6 +797,88 @@ public class WxOrderServiceImpl implements WxOrderService { | |||||
| } | } | ||||
| } | } | ||||
| private void checkPressBatchRule(WxCoupon counpon,WxCouponOrder couponOrderQ,WxCUserBasicInfo user) { | |||||
| CouponPressBatchVo checkPressResult = wxPressBatchService.getCouponPressBatch(counpon, user.getId()); | |||||
| if (null != checkPressResult) { | |||||
| WxPressBatch pressBatch = checkPressResult.getPressBatch(); | |||||
| List<Long> cids = checkPressResult.getCouponIdList(); | |||||
| if (null != cids && cids.size() > 0 ) { | |||||
| couponOrderQ.setCouponIds(cids); | |||||
| //判断这些券发起中+已完成的 | |||||
| WxOrder orderq = new WxOrder(); | |||||
| orderq.updateTenantInfo(counpon); | |||||
| orderq.setCouponIds(cids); | |||||
| orderq.setCUserId(user.getId()); | |||||
| //if (pressBatch.getPromoterLimitRule().equals(EnumCouponUseLimitRule.TOBEUSED_USELIMIT.getCode())) { | |||||
| List<Integer> statusS = new ArrayList<Integer>(); | |||||
| statusS.add(EnumOrderStatus.ORDER_STATUS_PRESSING.getCode()); | |||||
| statusS.add(EnumOrderStatus.ORDER_STATUS_PRESS_COMPLETE.getCode()); | |||||
| statusS.add(EnumOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode()); | |||||
| statusS.add(EnumOrderStatus.ORDER_STATUS_PAYMENT_SUCCESS.getCode()); | |||||
| statusS.add(EnumOrderStatus.ORDER_STATUS_PENDING_REFUND.getCode()); | |||||
| statusS.add(EnumOrderStatus.ORDER_STATUS_REFUND_SUCCESS.getCode()); | |||||
| statusS.add(EnumOrderStatus.ORDER_STATUS_REFUND_FAILD.getCode()); | |||||
| orderq.setStatusS(statusS); | |||||
| //} | |||||
| int _count = wxOrderMapper.countCouponConditionType1(orderq); | |||||
| if (_count >= pressBatch.getPromoterAllowCount()) { | |||||
| throw new MallinkException(ErrorCode.ORDER_IS_FAIL.getCode(),"当前用户发起砍价次数已批次超限.["+pressBatch.getName()+"]"); | |||||
| } | |||||
| if (counpon.getUseLimitRule().equals(EnumCouponUseLimitRule.TOBEUSED_USELIMIT.getCode())) { | |||||
| couponOrderQ.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode()); | |||||
| } | |||||
| couponOrderQ.setCouponId(counpon.getId()); | |||||
| }else { | |||||
| throw new MallinkException(ErrorCode.ORDER_IS_FAIL.getCode(),"砍价批次["+pressBatch.getName()+"]未设置券."); | |||||
| } | |||||
| }else { | |||||
| if (counpon.getUseLimitRule().equals(EnumCouponUseLimitRule.TOBEUSED_USELIMIT.getCode())) { | |||||
| couponOrderQ.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode()); | |||||
| } | |||||
| couponOrderQ.setCouponId(counpon.getId()); | |||||
| } | |||||
| } | |||||
| private void checkCouponBatchRule(WxCoupon counpon,WxCouponOrder couponOrderQ,WxCUserBasicInfo user) { | |||||
| CouponBatchVo checkPressResult = wxCouponBatchService.getCouponPressBatch(counpon, user.getId()); | |||||
| if (null != checkPressResult) { | |||||
| WxCouponBatch pressBatch = checkPressResult.getCouponBatch(); | |||||
| List<Long> cids = checkPressResult.getCouponIdList(); | |||||
| if (null != cids && cids.size() > 0 ) { | |||||
| couponOrderQ.setCouponIds(cids); | |||||
| //判断这些券发起中+已完成的 | |||||
| WxOrder orderq = new WxOrder(); | |||||
| orderq.updateTenantInfo(counpon); | |||||
| orderq.setCouponIds(cids); | |||||
| orderq.setCUserId(user.getId()); | |||||
| List<Integer> statusS = new ArrayList<Integer>(); | |||||
| statusS.add(EnumOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode()); | |||||
| statusS.add(EnumOrderStatus.ORDER_STATUS_PAYMENT_SUCCESS.getCode()); | |||||
| statusS.add(EnumOrderStatus.ORDER_STATUS_PENDING_REFUND.getCode()); | |||||
| statusS.add(EnumOrderStatus.ORDER_STATUS_REFUND_SUCCESS.getCode()); | |||||
| statusS.add(EnumOrderStatus.ORDER_STATUS_REFUND_FAILD.getCode()); | |||||
| orderq.setStatusS(statusS); | |||||
| int _count = wxOrderMapper.countCouponConditionType1(orderq); | |||||
| if (_count >= pressBatch.getAllowCount()) { | |||||
| throw new MallinkException(ErrorCode.ORDER_IS_FAIL.getCode(),"当前用户购买次数已批次超限.["+pressBatch.getName()+"]"); | |||||
| } | |||||
| if (counpon.getUseLimitRule().equals(EnumCouponUseLimitRule.TOBEUSED_USELIMIT.getCode())) { | |||||
| couponOrderQ.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode()); | |||||
| } | |||||
| couponOrderQ.setCouponId(counpon.getId()); | |||||
| }else { | |||||
| throw new MallinkException(ErrorCode.ORDER_IS_FAIL.getCode(),"券批次["+pressBatch.getName()+"]未设置券."); | |||||
| } | |||||
| }else { | |||||
| if (counpon.getUseLimitRule().equals(EnumCouponUseLimitRule.TOBEUSED_USELIMIT.getCode())) { | |||||
| couponOrderQ.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode()); | |||||
| } | |||||
| couponOrderQ.setCouponId(counpon.getId()); | |||||
| } | |||||
| } | |||||
| /** | /** | ||||
| * 商户注券减库存 | * 商户注券减库存 | ||||
| @@ -3045,7 +3094,7 @@ public class WxOrderServiceImpl implements WxOrderService { | |||||
| record.setPayment(0); | record.setPayment(0); | ||||
| record.setFormId(formId); | record.setFormId(formId); | ||||
| record.setOrderGroupId(0L); | record.setOrderGroupId(0L); | ||||
| record.setExtParam(extParam);; | |||||
| record.setExtParam(extParam); | |||||
| record.setShippingType(shippingType); | record.setShippingType(shippingType); | ||||
| if(EnumOrderShopingType.DISTRIBUTION.getCode().equals(shippingType)){ | if(EnumOrderShopingType.DISTRIBUTION.getCode().equals(shippingType)){ | ||||
| @@ -3663,6 +3712,7 @@ public class WxOrderServiceImpl implements WxOrderService { | |||||
| WxOrder updOrder = new WxOrder(); | WxOrder updOrder = new WxOrder(); | ||||
| updOrder.updateTenantInfo(tenantEntity); | updOrder.updateTenantInfo(tenantEntity); | ||||
| updOrder.setId(singleOrder.getId()); | updOrder.setId(singleOrder.getId()); | ||||
| updOrder.setFromId(good.getPoiId()); | |||||
| if (good.getItemOrderInfoList().size() == 1) { | if (good.getItemOrderInfoList().size() == 1) { | ||||
| updOrder.setExtParam(JSON.toJSONString(good.getItemOrderInfoList().get(0))); | updOrder.setExtParam(JSON.toJSONString(good.getItemOrderInfoList().get(0))); | ||||
| } else { | } else { | ||||
| @@ -32,6 +32,9 @@ public class FmInsideCouponVerifyMsgServiceImpl implements MsgSendService { | |||||
| @Autowired | @Autowired | ||||
| private WxMerchantBUserService merchantBUserService; | private WxMerchantBUserService merchantBUserService; | ||||
| @Autowired | |||||
| private WxCUserBasicInfoService wxCUserBasicInfoService; | |||||
| @Autowired | @Autowired | ||||
| private WxMerchantService merchantService; | private WxMerchantService merchantService; | ||||
| @@ -58,6 +61,8 @@ public class FmInsideCouponVerifyMsgServiceImpl implements MsgSendService { | |||||
| orderService.sendInsideOrderPushDeliveryMsg(couponOrder,null,couponOrder.getId()); | orderService.sendInsideOrderPushDeliveryMsg(couponOrder,null,couponOrder.getId()); | ||||
| // orderService.sendInsideOrderPushMsg(couponOrder,couponOrder.getComposeOrderId()); | // orderService.sendInsideOrderPushMsg(couponOrder,couponOrder.getComposeOrderId()); | ||||
| wxCUserBasicInfoService.updateTenantIdMsg(couponOrder,merchant,couponOrder.getCUserId()); | |||||
| couponOrderService.actionAfterVerify(couponOrder, merchant); | couponOrderService.actionAfterVerify(couponOrder, merchant); | ||||
| } | } | ||||
| } | } | ||||
| @@ -0,0 +1,103 @@ | |||||
| <?xml version="1.0" encoding="UTF-8"?> | |||||
| <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> | |||||
| <mapper namespace="com.iformall.mapper.WxCouponBatchItemMapper"> | |||||
| <resultMap id="BaseResultMap" type="com.iformall.domain.po.WxCouponBatchItem"> | |||||
| <id column="id" jdbcType="BIGINT" property="id"/> | |||||
| <result column="tenant_id" jdbcType="VARCHAR" property="tenantId"/> | |||||
| <result column="parent_tenant_id" jdbcType="VARCHAR" property="parentTenantId" /> | |||||
| <result column="coupon_batch_id" jdbcType="BIGINT" property="couponBatchId" /> | |||||
| <result column="coupon_id" jdbcType="BIGINT" property="couponId"/> | |||||
| <result column="create_date" jdbcType="TIMESTAMP" property="createDate"/> | |||||
| <result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/> | |||||
| <result column="coupon_batch_status" jdbcType="INTEGER" property="couponBatchStatus"/> | |||||
| </resultMap> | |||||
| <sql id="allColumns"> | |||||
| `id`, `tenant_id`, `parent_tenant_id`, `coupon_batch_id`, `coupon_id`, `create_date`,`update_date`,`coupon_batch_status` | |||||
| </sql> | |||||
| <sql id="dynamicWhereConditions"> | |||||
| where `tenant_id` = #{tenantId} | |||||
| <if test=" null != id "> | |||||
| and `id` = #{id} | |||||
| </if> | |||||
| <if test=" null != parentTenantId and '' != parentTenantId"> | |||||
| and `parent_tenant_id` = #{parentTenantId} | |||||
| </if> | |||||
| <if test=" null != pressBatchId"> | |||||
| and `press_batch_id` = #{pressBatchId} | |||||
| </if> | |||||
| <if test=" null != couponId"> | |||||
| and `coupon_id` = #{couponId} | |||||
| </if> | |||||
| <if test=" null != pressBatchStatus"> | |||||
| and `press_batch_status` = #{pressBatchStatus} | |||||
| </if> | |||||
| <if test=" null != ids "> | |||||
| and `id` in | |||||
| <foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")"> | |||||
| #{idItem} | |||||
| </foreach> | |||||
| </if> | |||||
| </sql> | |||||
| <select id="findList" parameterType="com.iformall.domain.po.WxCouponBatchItem" resultMap="BaseResultMap"> | |||||
| select | |||||
| <include refid="allColumns"/> | |||||
| from wx_coupon_batch_item | |||||
| <include refid="dynamicWhereConditions"/> | |||||
| <if test=" null != sortColumns">order by ${sortColumns}</if> | |||||
| </select> | |||||
| <select id="getBatchIdList" parameterType="java.util.HashMap" resultType="Long"> | |||||
| select distinct coupon_batch_id from wx_coupon_batch_item where `tenant_id` = #{tenantId} | |||||
| <if test=" null != pressBatchStatus"> | |||||
| and `coupon_batch_status` = #{couponBatchStatus} | |||||
| </if> | |||||
| <if test=" null != couponIds "> | |||||
| and `coupon_id` in | |||||
| <foreach collection="couponIds" index="index" item="cIdItem" open="(" separator="," close=")"> | |||||
| #{cIdItem} | |||||
| </foreach> | |||||
| </if> | |||||
| </select> | |||||
| <select id="getById" parameterType="java.util.HashMap" resultMap="BaseResultMap"> | |||||
| select | |||||
| <include refid="allColumns"/> | |||||
| from wx_coupon_batch_item | |||||
| where `id` = #{id} | |||||
| and tenant_id=#{tenantId} | |||||
| </select> | |||||
| <update id="updateWxPressBatchStatus" parameterType="com.iformall.domain.po.WxCouponBatchItem" > | |||||
| update wx_coupon_batch_item set coupon_batch_status = #{couponBatchStatus} where `coupon_batch_id` = #{couponBatchId} and tenant_id=#{tenantId} | |||||
| </update> | |||||
| <delete id= "deleteItem" parameterType="com.iformall.domain.po.WxCouponBatchItem" > | |||||
| delete from wx_coupon_batch_item where `id` = #{id} and tenant_id=#{tenantId} | |||||
| </delete> | |||||
| <delete id= "deleteAllItem" parameterType="com.iformall.domain.po.WxCouponBatchItem" > | |||||
| delete from wx_coupon_batch_item where `coupon_batch_id` = #{couponBatchId} and tenant_id=#{tenantId} | |||||
| </delete> | |||||
| <select id="getCouponIds" parameterType="java.util.HashMap" resultType="Long"> | |||||
| select coupon_id from wx_coupon_batch_item where tenant_id=#{tenantId} | |||||
| <if test=" null != couponBatchId"> | |||||
| and `coupon_batch_id` = #{couponBatchId} | |||||
| </if> | |||||
| <if test=" null != couponBatchStatus"> | |||||
| and `coupon_batch_status` = #{couponBatchStatus} | |||||
| </if> | |||||
| </select> | |||||
| </mapper> | |||||
| @@ -0,0 +1,67 @@ | |||||
| <?xml version="1.0" encoding="UTF-8"?> | |||||
| <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> | |||||
| <mapper namespace="com.iformall.mapper.WxCouponBatchMapper"> | |||||
| <resultMap id="BaseResultMap" type="com.iformall.domain.po.WxCouponBatch"> | |||||
| <id column="id" jdbcType="BIGINT" property="id"/> | |||||
| <result column="tenant_id" jdbcType="VARCHAR" property="tenantId"/> | |||||
| <result column="parent_tenant_id" jdbcType="VARCHAR" property="parentTenantId" /> | |||||
| <result column="name" jdbcType="VARCHAR" property="name" /> | |||||
| <result column="status" jdbcType="INTEGER" property="status"/> | |||||
| <result column="create_date" jdbcType="TIMESTAMP" property="createDate"/> | |||||
| <result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/> | |||||
| <result column="allow_count" jdbcType="INTEGER" property="allowCount"/> | |||||
| </resultMap> | |||||
| <sql id="allColumns"> | |||||
| `id`, `tenant_id`, `parent_tenant_id`, `name`, `status`, `create_date`,`update_date`,`allow_count` | |||||
| </sql> | |||||
| <sql id="dynamicWhereConditions"> | |||||
| where `tenant_id` = #{tenantId} | |||||
| <if test=" null != id "> | |||||
| and `id` = #{id} | |||||
| </if> | |||||
| <if test=" null != parentTenantId and '' != parentTenantId"> | |||||
| and `parent_tenant_id` = #{parentTenantId} | |||||
| </if> | |||||
| <if test=" null != status"> | |||||
| and `status` = #{status} | |||||
| </if> | |||||
| <if test=" null != name and '' != name"> | |||||
| and `name` like concat('%', #{name},'%') | |||||
| </if> | |||||
| <if test=" null != ids "> | |||||
| and `id` in | |||||
| <foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")"> | |||||
| #{idItem} | |||||
| </foreach> | |||||
| </if> | |||||
| </sql> | |||||
| <select id="findList" parameterType="com.iformall.domain.po.WxCouponBatch" resultMap="BaseResultMap"> | |||||
| select | |||||
| <include refid="allColumns"/> | |||||
| from wx_coupon_batch | |||||
| <include refid="dynamicWhereConditions"/> | |||||
| <if test=" null != sortColumns">order by ${sortColumns}</if> | |||||
| </select> | |||||
| <select id="getById" parameterType="java.util.HashMap" resultMap="BaseResultMap"> | |||||
| select <include refid="allColumns"/> from wx_coupon_batch where `id` = #{id} and tenant_id=#{tenantId} | |||||
| </select> | |||||
| <update id="updateWxPressBatchStatus" parameterType="com.iformall.domain.po.WxCouponBatch" > | |||||
| update wx_coupon_batch set status = #{status} where `id` = #{id} and tenant_id=#{tenantId} | |||||
| </update> | |||||
| <delete id="deleteById" parameterType="java.util.HashMap" > | |||||
| delete from wx_coupon_batch where `id` = #{id} and tenant_id=#{tenantId} | |||||
| </delete> | |||||
| </mapper> | |||||
| @@ -37,11 +37,12 @@ | |||||
| <result column="shipping_address" jdbcType="VARCHAR" property="shippingAddress"/> | <result column="shipping_address" jdbcType="VARCHAR" property="shippingAddress"/> | ||||
| <result column="parent_order_id" jdbcType="BIGINT" property="parentOrderId"/> | <result column="parent_order_id" jdbcType="BIGINT" property="parentOrderId"/> | ||||
| <result column="ext_param" jdbcType="VARCHAR" property="extParam"/> | <result column="ext_param" jdbcType="VARCHAR" property="extParam"/> | ||||
| <result column="from_id" jdbcType="VARCHAR" property="fromId"/> | |||||
| </resultMap> | </resultMap> | ||||
| <sql id="allColumns"> | <sql id="allColumns"> | ||||
| `id`,`order_number`,`tenant_id`,`parent_tenant_id`,`c_user_id`,`coupon_channel_id`,`product_id`,`product_name`,`type`,`pay_vendor`,`pay_version`,`make_merchant_id`,`payment_type`,`payment`,`payment_time`,`freight_price`,`order_status`,`cps_status`,`create_date`,`update_date`,`detail`,`ref_detail`, | `id`,`order_number`,`tenant_id`,`parent_tenant_id`,`c_user_id`,`coupon_channel_id`,`product_id`,`product_name`,`type`,`pay_vendor`,`pay_version`,`make_merchant_id`,`payment_type`,`payment`,`payment_time`,`freight_price`,`order_status`,`cps_status`,`create_date`,`update_date`,`detail`,`ref_detail`, | ||||
| `press_end_date`,`press_current_num`,`press_current_value`,`order_group_id`,`form_id`,`total_payment`,`compose_order_id`,`coupon_number`,`compose_order_type`,`shipping_type`,`shipping_address`,`parent_order_id`,`ext_param` | |||||
| `press_end_date`,`press_current_num`,`press_current_value`,`order_group_id`,`form_id`,`total_payment`,`compose_order_id`,`coupon_number`,`compose_order_type`,`shipping_type`,`shipping_address`,`parent_order_id`,`ext_param`,`from_id` | |||||
| </sql> | </sql> | ||||
| <sql id="dynamicWhereConditions"> | <sql id="dynamicWhereConditions"> | ||||
| @@ -152,6 +153,10 @@ | |||||
| <if test=" null != parentOrderId "> | <if test=" null != parentOrderId "> | ||||
| and `parent_order_id` = #{parentOrderId} | and `parent_order_id` = #{parentOrderId} | ||||
| </if> | </if> | ||||
| <if test=" null != fromId and '' != fromId "> | |||||
| and `from_id` = #{fromId} | |||||
| </if> | |||||
| <if test=" null != statusS "> | <if test=" null != statusS "> | ||||
| and `order_status` in | and `order_status` in | ||||
| @@ -336,7 +341,7 @@ | |||||
| <select id="findListOfCUser" parameterType="com.iformall.domain.po.WxOrder" resultMap="BaseResultMap"> | <select id="findListOfCUser" parameterType="com.iformall.domain.po.WxOrder" resultMap="BaseResultMap"> | ||||
| select | select | ||||
| o.id,o.order_number,o.tenant_id,o.parent_tenant_id,o.c_user_id,o.coupon_channel_id,o.product_id,o.product_name,o.payment_type,o.payment,o.payment_time,o.order_status,o.create_date,o.update_date, | o.id,o.order_number,o.tenant_id,o.parent_tenant_id,o.c_user_id,o.coupon_channel_id,o.product_id,o.product_name,o.payment_type,o.payment,o.payment_time,o.order_status,o.create_date,o.update_date, | ||||
| o.compose_order_type,o.compose_order_id,o.`coupon_number`,o.`freight_price`,o.`shipping_type`,o.`shipping_address`,o.parent_order_id,o.ext_param | |||||
| o.compose_order_type,o.compose_order_id,o.`coupon_number`,o.`freight_price`,o.`shipping_type`,o.`shipping_address`,o.parent_order_id,o.ext_param,o.from_id | |||||
| from wx_order o | from wx_order o | ||||
| where o.order_status in (0,1,2,3,4,5,97) | where o.order_status in (0,1,2,3,4,5,97) | ||||
| @@ -373,7 +378,7 @@ | |||||
| <select id="selectDetailOfCUser" parameterType="com.iformall.domain.po.WxOrder" resultMap="BaseResultMap"> | <select id="selectDetailOfCUser" parameterType="com.iformall.domain.po.WxOrder" resultMap="BaseResultMap"> | ||||
| select | select | ||||
| o.id,o.order_number,o.tenant_id,o.parent_tenant_id,o.c_user_id,o.coupon_channel_id,o.product_id,o.product_name,o.payment_type,o.payment,o.payment_time,o.order_status,o.create_date,o.update_date, | o.id,o.order_number,o.tenant_id,o.parent_tenant_id,o.c_user_id,o.coupon_channel_id,o.product_id,o.product_name,o.payment_type,o.payment,o.payment_time,o.order_status,o.create_date,o.update_date, | ||||
| o.compose_order_type,o.compose_order_id,o.parent_order_id,o.`coupon_number`,o.`freight_price`,o.`shipping_type`,o.`shipping_address`,o.ext_param | |||||
| o.compose_order_type,o.compose_order_id,o.parent_order_id,o.`coupon_number`,o.`freight_price`,o.`shipping_type`,o.`shipping_address`,o.ext_param,o.from_id | |||||
| FROM wx_order o where o.`tenant_id` = #{tenantId} | FROM wx_order o where o.`tenant_id` = #{tenantId} | ||||
| <if test="cUserId != null"> | <if test="cUserId != null"> | ||||
| and o.c_user_id = #{cUserId} | and o.c_user_id = #{cUserId} | ||||