Skip to content

J
jiedao-api-boot-master
Commit 06684a34 authored by zhengyi's avatar zhengyi
Browse files
Options

预装、分拣只排除特价与费用申请审批进行中的订单

parent ee61b999
Hide whitespace changes
Inline Side-by-side
Showing with 62 additions and 34 deletions
sql/ecw_customer_contacts.sql
View file @ 06684a34
......@@ -1590,7 +1590,7 @@ INSERT INTO `ecw_customer_contacts_20221206`(`id`, `customer_id`, `department`,
INSERT INTO `ecw_customer_contacts_20221206`(`id`, `customer_id`, `department`, `position`, `name`, `phone`, `social`, `social_number`, `email`, `default`, `addtime`, `updatetime`, `userid`, `username`, `area_code`, `phone_new`, `is_auto`) VALUES (1606, 1609, NULL, NULL, 'Rak.Liu Company', '+8618675890761', NULL, NULL, '', 1, 1610939367, 1634225015, 1335, 'Rak.Liu(18675890761)', '+86', '18675890761', 0);
INSERT INTO `ecw_customer_contacts_20221206`(`id`, `customer_id`, `department`, `position`, `name`, `phone`, `social`, `social_number`, `email`, `default`, `addtime`, `updatetime`, `userid`, `username`, `area_code`, `phone_new`, `is_auto`) VALUES (1607, 1610, NULL, NULL, 'jo', '+8618820160134', NULL, NULL, 'sales6@szistartech.com', 1, 1610939367, NULL, 0, NULL, '+86', '18820160134', 0);
INSERT INTO `ecw_customer_contacts_20221206`(`id`, `customer_id`, `department`, `position`, `name`, `phone`, `social`, `social_number`, `email`, `default`, `addtime`, `updatetime`, `userid`, `username`, `area_code`, `phone_new`, `is_auto`) VALUES (1608, 1611, NULL, NULL, 'Solid global enterprises', '+2349031573034', NULL, NULL, 'Ikejiofor Cyril@gmial,com', 1, 1610939367, NULL, 0, NULL, '+234', '9031573034', 0);
INSERT INTO `ecw_customer_contacts_20221206`(`id`, `customer_id`, `department`, `position`, `name`, `phone`, `social`, `social_number`, `email`, `default`, `addtime`, `updatetime`, `userid`, `username`, `area_code`, `phone_new`, `is_auto`) VALUES (1609, 1612, NULL, NULL, 'TODAY\'S KITCHEN', '+2348035501605', NULL, NULL, 'nnatexkitchen@yahoo.com', 1, 1610939367, NULL, 0, NULL, '+234', '8035501605', 0);
INSERT INTO `ecw_customer_contacts_20221206`(`id`, `customer_id`, `department`, `position`, `name`, `phone`, `social`, `social_number`, `email`, `default`, `addtime`, `updatetime`, `userid`, `username`, `area_code`, `phone_new`, `is_auto`) VALUES (1609, 1612, NULL, NULL, 'TODAY\SKITCHEN', '+2348035501605', NULL, NULL, 'nnatexkitchen@yahoo.com', 1, 1610939367, NULL, 0, NULL, '+234', '8035501605', 0);
INSERT INTO `ecw_customer_contacts_20221206`(`id`, `customer_id`, `department`, `position`, `name`, `phone`, `social`, `social_number`, `email`, `default`, `addtime`, `updatetime`, `userid`, `username`, `area_code`, `phone_new`, `is_auto`) VALUES (1610, 1613, NULL, NULL, '王贤能', '+8613058047797', NULL, NULL, 'sales001@aibatech.cn', 1, 1610939367, NULL, 0, NULL, '+86', '13058047797', 0);
INSERT INTO `ecw_customer_contacts_20221206`(`id`, `customer_id`, `department`, `position`, `name`, `phone`, `social`, `social_number`, `email`, `default`, `addtime`, `updatetime`, `userid`, `username`, `area_code`, `phone_new`, `is_auto`) VALUES (1611, 1614, NULL, NULL, 'scot', '+2347010654693', NULL, NULL, 'Obsalami@yahoo.com', 1, 1610939367, NULL, 0, NULL, '+234', '7010654693', 0);
INSERT INTO `ecw_customer_contacts_20221206`(`id`, `customer_id`, `department`, `position`, `name`, `phone`, `social`, `social_number`, `email`, `default`, `addtime`, `updatetime`, `userid`, `username`, `area_code`, `phone_new`, `is_auto`) VALUES (1612, 1615, NULL, NULL, 'Jenna 玲星', '+8615797737280', NULL, NULL, '', 1, 1610939367, 1635243737, 1915, 'Jenna(15797737280)', '+86', '15797737280', 0);
......@@ -17702,7 +17702,7 @@ INSERT INTO `ecw_customer_contacts_20221206`(`id`, `customer_id`, `department`,
INSERT INTO `ecw_customer_contacts_20221206`(`id`, `customer_id`, `department`, `position`, `name`, `phone`, `social`, `social_number`, `email`, `default`, `addtime`, `updatetime`, `userid`, `username`, `area_code`, `phone_new`, `is_auto`) VALUES (18165, 17079, '', '', 'Rabiu Kaduna', '+2348037875258', NULL, '', 'Rabiumargi2020@gmail.com', 1, NULL, NULL, 0, '', '+234', '8037875258', 0);
INSERT INTO `ecw_customer_contacts_20221206`(`id`, `customer_id`, `department`, `position`, `name`, `phone`, `social`, `social_number`, `email`, `default`, `addtime`, `updatetime`, `userid`, `username`, `area_code`, `phone_new`, `is_auto`) VALUES (18166, 17080, '', '', 'Barry/Portia', '+886287682628', NULL, '', '', 1, NULL, NULL, 0, '', '+886', '287682628', 0);
INSERT INTO `ecw_customer_contacts_20221206`(`id`, `customer_id`, `department`, `position`, `name`, `phone`, `social`, `social_number`, `email`, `default`, `addtime`, `updatetime`, `userid`, `username`, `area_code`, `phone_new`, `is_auto`) VALUES (18167, 17081, '', '', 'Pavithran', '+971508513171', NULL, '', '', 1, NULL, NULL, 0, '', '+971', '508513171', 0);
INSERT INTO `ecw_customer_contacts_20221206`(`id`, `customer_id`, `department`, `position`, `name`, `phone`, `social`, `social_number`, `email`, `default`, `addtime`, `updatetime`, `userid`, `username`, `area_code`, `phone_new`, `is_auto`) VALUES (18168, 2675, '', 'Jude \'s elder brother', 'James', '+2348034855068', NULL, '', 'Idealcarenigeria@gmail.com ', 0, NULL, NULL, 0, '', '+234', '8034855068', 0);
INSERT INTO `ecw_customer_contacts_20221206`(`id`, `customer_id`, `department`, `position`, `name`, `phone`, `social`, `social_number`, `email`, `default`, `addtime`, `updatetime`, `userid`, `username`, `area_code`, `phone_new`, `is_auto`) VALUES (18168, 2675, '', 'Jude \ selder brother', 'James', '+2348034855068', NULL, '', 'Idealcarenigeria@gmail.com ', 0, NULL, NULL, 0, '', '+234', '8034855068', 0);
INSERT INTO `ecw_customer_contacts_20221206`(`id`, `customer_id`, `department`, `position`, `name`, `phone`, `social`, `social_number`, `email`, `default`, `addtime`, `updatetime`, `userid`, `username`, `area_code`, `phone_new`, `is_auto`) VALUES (18169, 17082, '', '', 'Jonas', '+233541016672', '', '', '', 1, NULL, NULL, 0, '', '+233', '541016672', 0);
INSERT INTO `ecw_customer_contacts_20221206`(`id`, `customer_id`, `department`, `position`, `name`, `phone`, `social`, `social_number`, `email`, `default`, `addtime`, `updatetime`, `userid`, `username`, `area_code`, `phone_new`, `is_auto`) VALUES (18170, 17083, '', '', 'Arinze Uzor', '+2348030624829', NULL, '', '+2348030624829 arizonauzor@gmail.com', 1, NULL, NULL, 0, '', '+234', '8030624829', 0);
INSERT INTO `ecw_customer_contacts_20221206`(`id`, `customer_id`, `department`, `position`, `name`, `phone`, `social`, `social_number`, `email`, `default`, `addtime`, `updatetime`, `userid`, `username`, `area_code`, `phone_new`, `is_auto`) VALUES (18171, 17084, '', '', '朱燚校Frank', '+8613865510564', NULL, '', '', 1, NULL, NULL, 0, '', '+86', '13865510564', 0);
......@@ -18191,7 +18191,7 @@ INSERT INTO `ecw_customer_contacts_20221206`(`id`, `customer_id`, `department`,
INSERT INTO `ecw_customer_contacts_20221206`(`id`, `customer_id`, `department`, `position`, `name`, `phone`, `social`, `social_number`, `email`, `default`, `addtime`, `updatetime`, `userid`, `username`, `area_code`, `phone_new`, `is_auto`) VALUES (18668, 17572, '', '', '曹小姐', '+8613566363968', '', '', '', 1, NULL, NULL, 0, '', '+86', '13566363968', 0);
INSERT INTO `ecw_customer_contacts_20221206`(`id`, `customer_id`, `department`, `position`, `name`, `phone`, `social`, `social_number`, `email`, `default`, `addtime`, `updatetime`, `userid`, `username`, `area_code`, `phone_new`, `is_auto`) VALUES (18669, 17573, '', '', 'charleambofana', '+258842301410', NULL, '', '', 1, NULL, NULL, 0, '', '+258', '842301410', 0);
INSERT INTO `ecw_customer_contacts_20221206`(`id`, `customer_id`, `department`, `position`, `name`, `phone`, `social`, `social_number`, `email`, `default`, `addtime`, `updatetime`, `userid`, `username`, `area_code`, `phone_new`, `is_auto`) VALUES (18671, 17575, '', '', 'Eve', '+2348133398829', '4', '', 'Evelawrey99@gmail.com', 1, 1634225018, 1634225018, 1722, '(8133398829)', '+234', '8133398829', 0);
INSERT INTO `ecw_customer_contacts_20221206`(`id`, `customer_id`, `department`, `position`, `name`, `phone`, `social`, `social_number`, `email`, `default`, `addtime`, `updatetime`, `userid`, `username`, `area_code`, `phone_new`, `is_auto`) VALUES (18672, 17576, '', '', 'George Adam\'s Smith', '+2348065834740', '', '', '', 1, NULL, NULL, 0, '', '+234', '8065834740', 0);
INSERT INTO `ecw_customer_contacts_20221206`(`id`, `customer_id`, `department`, `position`, `name`, `phone`, `social`, `social_number`, `email`, `default`, `addtime`, `updatetime`, `userid`, `username`, `area_code`, `phone_new`, `is_auto`) VALUES (18672, 17576, '', '', 'George Adam\s Smith', '+2348065834740', '', '', '', 1, NULL, NULL, 0, '', '+234', '8065834740', 0);
INSERT INTO `ecw_customer_contacts_20221206`(`id`, `customer_id`, `department`, `position`, `name`, `phone`, `social`, `social_number`, `email`, `default`, `addtime`, `updatetime`, `userid`, `username`, `area_code`, `phone_new`, `is_auto`) VALUES (18673, 17573, '', '', '', '+258875511101', '', '', '', 0, NULL, NULL, 0, '', '+258', '875511101', 0);
INSERT INTO `ecw_customer_contacts_20221206`(`id`, `customer_id`, `department`, `position`, `name`, `phone`, `social`, `social_number`, `email`, `default`, `addtime`, `updatetime`, `userid`, `username`, `area_code`, `phone_new`, `is_auto`) VALUES (18674, 17577, '', '', '姚现彩', '+8618669921331', '', '', '', 1, NULL, NULL, 0, '', '+86', '18669921331', 0);
INSERT INTO `ecw_customer_contacts_20221206`(`id`, `customer_id`, `department`, `position`, `name`, `phone`, `social`, `social_number`, `email`, `default`, `addtime`, `updatetime`, `userid`, `username`, `area_code`, `phone_new`, `is_auto`) VALUES (18675, 17578, '', '', 'gred', '+8613059123545', '2', '13059123545', 'gzyoubuy@gmail.com', 1, NULL, NULL, 0, '', '+86', '13059123545', 0);
......@@ -18471,7 +18471,7 @@ INSERT INTO `ecw_customer_contacts_20221206`(`id`, `customer_id`, `department`,
INSERT INTO `ecw_customer_contacts_20221206`(`id`, `customer_id`, `department`, `position`, `name`, `phone`, `social`, `social_number`, `email`, `default`, `addtime`, `updatetime`, `userid`, `username`, `area_code`, `phone_new`, `is_auto`) VALUES (18952, 17838, '', '', 'Lindy', '+8618812013485', NULL, '', 'chunleiyuju@aliyun.com', 1, NULL, 1634225018, 1740, 'lindy(18812013485)', '+86', '18812013485', 0);
INSERT INTO `ecw_customer_contacts_20221206`(`id`, `customer_id`, `department`, `position`, `name`, `phone`, `social`, `social_number`, `email`, `default`, `addtime`, `updatetime`, `userid`, `username`, `area_code`, `phone_new`, `is_auto`) VALUES (18953, 17839, '', '', 'Joan', '+8613731688890', '', '', '', 1, NULL, NULL, 0, '', '+86', '13731688890', 0);
INSERT INTO `ecw_customer_contacts_20221206`(`id`, `customer_id`, `department`, `position`, `name`, `phone`, `social`, `social_number`, `email`, `default`, `addtime`, `updatetime`, `userid`, `username`, `area_code`, `phone_new`, `is_auto`) VALUES (18954, 17840, '', '', 'Joy Vicky', '+2348092332305', '4', '', '', 1, NULL, NULL, 0, '', '+234', '8092332305', 0);
INSERT INTO `ecw_customer_contacts_20221206`(`id`, `customer_id`, `department`, `position`, `name`, `phone`, `social`, `social_number`, `email`, `default`, `addtime`, `updatetime`, `userid`, `username`, `area_code`, `phone_new`, `is_auto`) VALUES (18956, 17842, '', '', ' Rukay\'s Mart ', '+2348068472400', '', '', 'doggedrukky@yahoo.com', 1, NULL, NULL, 0, '', '+234', '8068472400', 0);
INSERT INTO `ecw_customer_contacts_20221206`(`id`, `customer_id`, `department`, `position`, `name`, `phone`, `social`, `social_number`, `email`, `default`, `addtime`, `updatetime`, `userid`, `username`, `area_code`, `phone_new`, `is_auto`) VALUES (18956, 17842, '', '', ' Rukay\s Mart ', '+2348068472400', '', '', 'doggedrukky@yahoo.com', 1, NULL, NULL, 0, '', '+234', '8068472400', 0);
INSERT INTO `ecw_customer_contacts_20221206`(`id`, `customer_id`, `department`, `position`, `name`, `phone`, `social`, `social_number`, `email`, `default`, `addtime`, `updatetime`, `userid`, `username`, `area_code`, `phone_new`, `is_auto`) VALUES (18957, 17843, '', '', 'Akeem', '+2348037263107', NULL, '', 'dexconnection@yahoo.com', 1, NULL, NULL, 0, '', '+234', '8037263107', 0);
INSERT INTO `ecw_customer_contacts_20221206`(`id`, `customer_id`, `department`, `position`, `name`, `phone`, `social`, `social_number`, `email`, `default`, `addtime`, `updatetime`, `userid`, `username`, `area_code`, `phone_new`, `is_auto`) VALUES (18958, 17844, '', '', '严利群', '+8618006772345', '', '', '', 1, NULL, NULL, 0, '', '+86', '18006772345', 0);
INSERT INTO `ecw_customer_contacts_20221206`(`id`, `customer_id`, `department`, `position`, `name`, `phone`, `social`, `social_number`, `email`, `default`, `addtime`, `updatetime`, `userid`, `username`, `area_code`, `phone_new`, `is_auto`) VALUES (18959, 17845, '', '', 'Mila ', '+86757-28108224', '', '', '', 1, NULL, NULL, 0, '', '+86', '757-28108224', 0);
......@@ -18617,7 +18617,7 @@ INSERT INTO `ecw_customer_contacts_20221206`(`id`, `customer_id`, `department`,
INSERT INTO `ecw_customer_contacts_20221206`(`id`, `customer_id`, `department`, `position`, `name`, `phone`, `social`, `social_number`, `email`, `default`, `addtime`, `updatetime`, `userid`, `username`, `area_code`, `phone_new`, `is_auto`) VALUES (19104, 17990, '', '', 'cindy', '+8613510697176', '2', '13510697176', '', 1, NULL, NULL, 0, '', '+86', '13510697176', 0);
INSERT INTO `ecw_customer_contacts_20221206`(`id`, `customer_id`, `department`, `position`, `name`, `phone`, `social`, `social_number`, `email`, `default`, `addtime`, `updatetime`, `userid`, `username`, `area_code`, `phone_new`, `is_auto`) VALUES (19105, 17991, '', '', 'Chioma Mbaka', '+2349042627909', '', '', '', 1, NULL, NULL, 0, '', '+234', '9042627909', 0);
INSERT INTO `ecw_customer_contacts_20221206`(`id`, `customer_id`, `department`, `position`, `name`, `phone`, `social`, `social_number`, `email`, `default`, `addtime`, `updatetime`, `userid`, `username`, `area_code`, `phone_new`, `is_auto`) VALUES (19106, 17992, '', '', 'Nasmatu Isah', '+2348134752708', NULL, '', 'www.nasmatuisah@gmail.com', 1, NULL, NULL, 0, '', '+234', '8134752708', 0);
INSERT INTO `ecw_customer_contacts_20221206`(`id`, `customer_id`, `department`, `position`, `name`, `phone`, `social`, `social_number`, `email`, `default`, `addtime`, `updatetime`, `userid`, `username`, `area_code`, `phone_new`, `is_auto`) VALUES (19107, 17993, '', '', 'onyidera\'', '+2347063069028', '', '', '', 1, NULL, NULL, 0, '', '+234', '7063069028', 0);
INSERT INTO `ecw_customer_contacts_20221206`(`id`, `customer_id`, `department`, `position`, `name`, `phone`, `social`, `social_number`, `email`, `default`, `addtime`, `updatetime`, `userid`, `username`, `area_code`, `phone_new`, `is_auto`) VALUES (19107, 17993, '', '', 'onyidera\', '+2347063069028', '', '', '', 1, NULL, NULL, 0, '', '+234', '7063069028', 0);
INSERT INTO `ecw_customer_contacts_20221206`(`id`, `customer_id`, `department`, `position`, `name`, `phone`, `social`, `social_number`, `email`, `default`, `addtime`, `updatetime`, `userid`, `username`, `area_code`, `phone_new`, `is_auto`) VALUES (19108, 17994, '', '', 'Eduardo', '+258848656820', '', '', '', 1, NULL, NULL, 0, '', '+258', '848656820', 0);
INSERT INTO `ecw_customer_contacts_20221206`(`id`, `customer_id`, `department`, `position`, `name`, `phone`, `social`, `social_number`, `email`, `default`, `addtime`, `updatetime`, `userid`, `username`, `area_code`, `phone_new`, `is_auto`) VALUES (19109, 17995, '', '', '双鱼', '+8613058966576', '2', '', '', 1, NULL, NULL, 0, '', '+86', '13058966576', 0);
INSERT INTO `ecw_customer_contacts_20221206`(`id`, `customer_id`, `department`, `position`, `name`, `phone`, `social`, `social_number`, `email`, `default`, `addtime`, `updatetime`, `userid`, `username`, `area_code`, `phone_new`, `is_auto`) VALUES (19110, 17996, '', '', 'Patricia', '+233556862689', '4', '', '', 1, NULL, NULL, 0, '', '+233', '556862689', 0);
......@@ -18897,7 +18897,7 @@ INSERT INTO `ecw_customer_contacts_20221206`(`id`, `customer_id`, `department`,
INSERT INTO `ecw_customer_contacts_20221206`(`id`, `customer_id`, `department`, `position`, `name`, `phone`, `social`, `social_number`, `email`, `default`, `addtime`, `updatetime`, `userid`, `username`, `area_code`, `phone_new`, `is_auto`) VALUES (19391, 18271, '', '', 'Armstrong ', '+2348103399241', '', '', 'armstrongidusuyi@gmail.com', 1, NULL, NULL, 0, '', '+234', '8103399241', 0);
INSERT INTO `ecw_customer_contacts_20221206`(`id`, `customer_id`, `department`, `position`, `name`, `phone`, `social`, `social_number`, `email`, `default`, `addtime`, `updatetime`, `userid`, `username`, `area_code`, `phone_new`, `is_auto`) VALUES (19392, 18272, '', '', 'Papa D', '+233504515518', '4', '', '', 1, NULL, NULL, 0, '', '+233', '504515518', 0);
INSERT INTO `ecw_customer_contacts_20221206`(`id`, `customer_id`, `department`, `position`, `name`, `phone`, `social`, `social_number`, `email`, `default`, `addtime`, `updatetime`, `userid`, `username`, `area_code`, `phone_new`, `is_auto`) VALUES (19393, 18273, '', '', '铁艺烤漆', '+8617662744394', NULL, '', '', 1, NULL, NULL, 0, '', '+86', '17662744394', 0);
INSERT INTO `ecw_customer_contacts_20221206`(`id`, `customer_id`, `department`, `position`, `name`, `phone`, `social`, `social_number`, `email`, `default`, `addtime`, `updatetime`, `userid`, `username`, `area_code`, `phone_new`, `is_auto`) VALUES (19394, 18274, '', '', 'bunny\'place ', '+2348061660078', NULL, '', 'mummygirl10@yahoo.com', 1, NULL, NULL, 0, '', '+234', '8061660078', 0);
INSERT INTO `ecw_customer_contacts_20221206`(`id`, `customer_id`, `department`, `position`, `name`, `phone`, `social`, `social_number`, `email`, `default`, `addtime`, `updatetime`, `userid`, `username`, `area_code`, `phone_new`, `is_auto`) VALUES (19394, 18274, '', '', 'bunny\place ', '+2348061660078', NULL, '', 'mummygirl10@yahoo.com', 1, NULL, NULL, 0, '', '+234', '8061660078', 0);
INSERT INTO `ecw_customer_contacts_20221206`(`id`, `customer_id`, `department`, `position`, `name`, `phone`, `social`, `social_number`, `email`, `default`, `addtime`, `updatetime`, `userid`, `username`, `area_code`, `phone_new`, `is_auto`) VALUES (19395, 18275, '', '', 'Engr Anthony', '+2348034707053', NULL, '', '', 1, NULL, NULL, 0, '', '+234', '8034707053', 0);
INSERT INTO `ecw_customer_contacts_20221206`(`id`, `customer_id`, `department`, `position`, `name`, `phone`, `social`, `social_number`, `email`, `default`, `addtime`, `updatetime`, `userid`, `username`, `area_code`, `phone_new`, `is_auto`) VALUES (19396, 18276, '', '', 'Peter', '+2349080149839', '', '', '', 1, NULL, NULL, 0, '', '+234', '9080149839', 0);
INSERT INTO `ecw_customer_contacts_20221206`(`id`, `customer_id`, `department`, `position`, `name`, `phone`, `social`, `social_number`, `email`, `default`, `addtime`, `updatetime`, `userid`, `username`, `area_code`, `phone_new`, `is_auto`) VALUES (19397, 18277, '', '', 'WLX-wendy维美斯', '+8615918418605', '', '', '', 1, NULL, NULL, 0, '', '+86', '15918418605', 0);
......@@ -19095,7 +19095,7 @@ INSERT INTO `ecw_customer_contacts_20221206`(`id`, `customer_id`, `department`,
INSERT INTO `ecw_customer_contacts_20221206`(`id`, `customer_id`, `department`, `position`, `name`, `phone`, `social`, `social_number`, `email`, `default`, `addtime`, `updatetime`, `userid`, `username`, `area_code`, `phone_new`, `is_auto`) VALUES (19591, 18464, '', '', 'Eternal ', '+8613923606784', '', '', '', 1, NULL, 1634225019, 1841, 'laicuilian(13923606784)', '+86', '13923606784', 0);
INSERT INTO `ecw_customer_contacts_20221206`(`id`, `customer_id`, `department`, `position`, `name`, `phone`, `social`, `social_number`, `email`, `default`, `addtime`, `updatetime`, `userid`, `username`, `area_code`, `phone_new`, `is_auto`) VALUES (19592, 18465, '', '', 'Christina ', '+8613530347680', '', '', '', 1, NULL, NULL, 0, '', '+86', '13530347680', 0);
INSERT INTO `ecw_customer_contacts_20221206`(`id`, `customer_id`, `department`, `position`, `name`, `phone`, `social`, `social_number`, `email`, `default`, `addtime`, `updatetime`, `userid`, `username`, `area_code`, `phone_new`, `is_auto`) VALUES (19593, 18466, '', '', '双圆Sally', '+8615910152639', NULL, '', 'sdsysally@hotmail.com', 1, NULL, NULL, 0, '', '+86', '15910152639', 0);
INSERT INTO `ecw_customer_contacts_20221206`(`id`, `customer_id`, `department`, `position`, `name`, `phone`, `social`, `social_number`, `email`, `default`, `addtime`, `updatetime`, `userid`, `username`, `area_code`, `phone_new`, `is_auto`) VALUES (19594, 18467, '', '', 'IbnZak\'s Enterprises', '+2348169707731', NULL, '', 'Ibn.zakariyah@gmail.com', 1, NULL, NULL, 0, '', '+234', '8169707731', 0);
INSERT INTO `ecw_customer_contacts_20221206`(`id`, `customer_id`, `department`, `position`, `name`, `phone`, `social`, `social_number`, `email`, `default`, `addtime`, `updatetime`, `userid`, `username`, `area_code`, `phone_new`, `is_auto`) VALUES (19594, 18467, '', '', 'IbnZak\s Enterprises', '+2348169707731', NULL, '', 'Ibn.zakariyah@gmail.com', 1, NULL, NULL, 0, '', '+234', '8169707731', 0);
INSERT INTO `ecw_customer_contacts_20221206`(`id`, `customer_id`, `department`, `position`, `name`, `phone`, `social`, `social_number`, `email`, `default`, `addtime`, `updatetime`, `userid`, `username`, `area_code`, `phone_new`, `is_auto`) VALUES (19595, 18468, '', '', 'EbukaOkafor', '+2348033058247', '', '', 'ebukaokafor10@yahoo.com', 1, NULL, NULL, 0, '', '+234', '8033058247', 0);
INSERT INTO `ecw_customer_contacts_20221206`(`id`, `customer_id`, `department`, `position`, `name`, `phone`, `social`, `social_number`, `email`, `default`, `addtime`, `updatetime`, `userid`, `username`, `area_code`, `phone_new`, `is_auto`) VALUES (19596, 18469, '', '', 'Moon', '+8613925238260', '', '', '', 1, NULL, NULL, 0, '', '+86', '13925238260', 0);
INSERT INTO `ecw_customer_contacts_20221206`(`id`, `customer_id`, `department`, `position`, `name`, `phone`, `social`, `social_number`, `email`, `default`, `addtime`, `updatetime`, `userid`, `username`, `area_code`, `phone_new`, `is_auto`) VALUES (19597, 18470, '', '', 'Fabiano Aguilar ', '+8615712368093', NULL, '', 'Fabiano_aguilar@yahoo.com', 1, NULL, NULL, 0, '', '+86', '15712368093', 0);
yudao-framework/yudao-spring-boot-starter-config/src/main/java/cn/iocoder/yudao/framework/apollo/core/event/Order/OrderApprovalTypeCheckEvent.java
View file @ 06684a34
......@@ -24,6 +24,11 @@ public class OrderApprovalTypeCheckEvent {
*/
private Integer approvalType;
/**
* 订单审批类型列表 {@link cn.iocoder.yudao.module.order.enums.OrderApprovalTypeEnum}
*/
private List<Integer> approvalTypeList;
/**
* 是否包含互斥审批类型： true 包含互斥审批或相同的审批不能进行重复审批 false 是没有包含互斥审批类型和当前审批类型
*/
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dal/mysql/order/OrderMapper.java
View file @ 06684a34
......@@ -2753,7 +2753,7 @@ public interface OrderMapper extends AbstractMapper<OrderDO> {
"and eo.status in (5,8,9) ",
"and eo.transport_id in (1,2,4)",
"and eo.abnormal_state=0 ",
"and eo.audit_type=0 ",
"and eo.audit_type not in(1,2,3,4,5,12,31,32) ",
"<when test = 'query.rucangTimeStart != null'>",
"AND eo.`rucang_time` &gt;= #{query.rucangTimeStart}",
"</when>",
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/listener/OrderApprovalTypeCheckListener.java
View file @ 06684a34
......@@ -29,24 +29,29 @@ public class OrderApprovalTypeCheckListener {
@EventListener(OrderApprovalTypeCheckEvent.class)
public void orderApprovalTypeCheckEvent(OrderApprovalTypeCheckEvent event) {
OrderApprovalTypeEnum approvalTypeEnum = OrderApprovalTypeEnum.valueOf(event.getApprovalType());
if (Objects.isNull(approvalTypeEnum)){
// 没有配置相关审批类型则不做校验
event.setResult(Boolean.FALSE);
return;
}
List<Integer> types = approvalTypeEnum.getMutualExclusionValues();
if (Objects.isNull(types)){
// 没有配置相关审批类型则不做校验
event.setResult(Boolean.FALSE);
return;
}
// 枚举配置中的互斥类型集合不能添加新值，这里需要重新定义新集合补充当前审批类型进行查询
List<Integer> typeList = null;
// 包含-1则表示订单不能有任何审批状态存在,所以不用区分类型，查询所有的进行中审批
if (!types.contains(-1)){
typeList = new ArrayList<>(types);
typeList.add(event.getApprovalType());
if (Objects.nonNull(event.getApprovalType())) {
OrderApprovalTypeEnum approvalTypeEnum = OrderApprovalTypeEnum.valueOf(event.getApprovalType());
if (Objects.isNull(approvalTypeEnum)) {
// 没有配置相关审批类型则不做校验
event.setResult(Boolean.FALSE);
return;
}
List<Integer> types = approvalTypeEnum.getMutualExclusionValues();
if (Objects.isNull(types)) {
// 没有配置相关审批类型则不做校验
event.setResult(Boolean.FALSE);
return;
}
// 包含-1则表示订单不能有任何审批状态存在,所以不用区分类型，查询所有的进行中审批
if (!types.contains(-1)) {
typeList = new ArrayList<>(types);
typeList.add(event.getApprovalType());
}
}else {
typeList = new ArrayList<>(event.getApprovalTypeList());
}
// 查询当前订单正在进行的审批
boolean result = orderApprovalService.countProcessingApproval(event.getOrderId(), event.getOrderItemIdList(), typeList);
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderServiceImpl.java
View file @ 06684a34
......@@ -1808,7 +1808,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
return;
}
OrderApprovalTypeCheckEvent approvalTypeCheckEvent = new OrderApprovalTypeCheckEvent(vo.getOrderId(), null, ORDER_UPDATE.getValue(), false);
OrderApprovalTypeCheckEvent approvalTypeCheckEvent = new OrderApprovalTypeCheckEvent(vo.getOrderId(), null, ORDER_UPDATE.getValue(), null, false);
applicationContext.publishEvent(approvalTypeCheckEvent);
if (approvalTypeCheckEvent.getResult()) {
throw exception(ORDER_IS_APPROVAL_IN_PROCESS);
......@@ -1868,7 +1868,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
this.updateOrderApply(updateReqVO, memberUserDO);
return;
}
OrderApprovalTypeCheckEvent approvalTypeCheckEvent = new OrderApprovalTypeCheckEvent(vo.getOrderId(), null, ORDER_UPDATE.getValue(), false);
OrderApprovalTypeCheckEvent approvalTypeCheckEvent = new OrderApprovalTypeCheckEvent(vo.getOrderId(), null, ORDER_UPDATE.getValue(), null, false);
applicationContext.publishEvent(approvalTypeCheckEvent);
if (approvalTypeCheckEvent.getResult()) {
throw exception(ORDER_IS_APPROVAL_IN_PROCESS);
......@@ -5127,7 +5127,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
throw exception(ORDER_APPROVAL_IS_NOT_EXISTS);
}
OrderApprovalTypeCheckEvent approvalTypeCheckEvent = new OrderApprovalTypeCheckEvent(specialApplyVO.getOrderId(), Objects.nonNull(specialApplyVO.getOrderItemId()) ?
Collections.singletonList(specialApplyVO.getOrderItemId()) : null, typeEnum.getValue(), false);
Collections.singletonList(specialApplyVO.getOrderItemId()) : null, typeEnum.getValue(), null, false);
applicationContext.publishEvent(approvalTypeCheckEvent);
if (approvalTypeCheckEvent.getResult()) {
throw exception(ORDER_IS_APPROVAL_IN_PROCESS);
......@@ -5330,7 +5330,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
throw exception(ORDER_APPROVAL_IS_NOT_EXISTS);
}
List<Long> orderItemIdList = specialBatchApplyVO.getBatchApplyOrderItemDetailVOList().stream().map(OrderSpecialBatchApplyOrderItemDetailVO::getOrderItemId).filter(Objects::nonNull).collect(Collectors.toList());
OrderApprovalTypeCheckEvent approvalTypeCheckEvent = new OrderApprovalTypeCheckEvent(specialBatchApplyVO.getOrderId(), orderItemIdList, typeEnum.getValue(), false);
OrderApprovalTypeCheckEvent approvalTypeCheckEvent = new OrderApprovalTypeCheckEvent(specialBatchApplyVO.getOrderId(), orderItemIdList, typeEnum.getValue(), null, false);
applicationContext.publishEvent(approvalTypeCheckEvent);
if (approvalTypeCheckEvent.getResult()) {
throw exception(ORDER_IS_APPROVAL_IN_PROCESS);
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderSplit/OrderSplitServiceImpl.java
View file @ 06684a34
......@@ -195,7 +195,7 @@ public class OrderSplitServiceImpl extends AbstractService<OrderSplitMapper, Ord
if (orderDO.getTransportId() == 4 && OrderStatusEnum.IN_WAREHOUSE.getValue().equals(orderDO.getStatus()) && orderDO.getAirShipment() > 2) {
throw exception(AIR_ORDER_IS_READY_STOCK_NOT_SPLIT);
}
OrderApprovalTypeCheckEvent approvalTypeCheckEvent = new OrderApprovalTypeCheckEvent(orderDO.getOrderId(), null, ORDER_SPLIT.getValue(), false);
OrderApprovalTypeCheckEvent approvalTypeCheckEvent = new OrderApprovalTypeCheckEvent(orderDO.getOrderId(), null, ORDER_SPLIT.getValue(), null, false);
applicationContext.publishEvent(approvalTypeCheckEvent);
if (approvalTypeCheckEvent.getResult()) {
throw exception(ORDER_IS_APPROVAL_IN_PROCESS);
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderWarehouseAdjust/OrderWarehouseAdjustServiceImpl.java
View file @ 06684a34
......@@ -142,7 +142,7 @@ public class OrderWarehouseAdjustServiceImpl extends AbstractService<OrderWareho
}
orderQueryService.throwPendingExceptionOrProcessingApproval(orderId);
OrderApprovalTypeCheckEvent approvalTypeCheckEvent = new OrderApprovalTypeCheckEvent(orderDO.getOrderId(), null, WAREHOUSE_ADJUST.getValue(), false);
OrderApprovalTypeCheckEvent approvalTypeCheckEvent = new OrderApprovalTypeCheckEvent(orderDO.getOrderId(), null, WAREHOUSE_ADJUST.getValue(), null, false);
applicationContext.publishEvent(approvalTypeCheckEvent);
if (approvalTypeCheckEvent.getResult()) {
throw exception(ORDER_IS_APPROVAL_IN_PROCESS);
......
yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/box/BoxServiceImpl.java
View file @ 06684a34
......@@ -4669,7 +4669,7 @@ public class BoxServiceImpl extends AbstractService<BoxMapper, BoxDO> implements
.filter(t -> t.getAuditType() != 0)
.collect(Collectors.toList());
for (OrderDO orderDO : orderDOList) {
OrderApprovalTypeCheckEvent approvalTypeCheckEvent = new OrderApprovalTypeCheckEvent(orderDO.getOrderId(), null, orderApprovalTypeEnum.getValue(), false);
OrderApprovalTypeCheckEvent approvalTypeCheckEvent = new OrderApprovalTypeCheckEvent(orderDO.getOrderId(), null, orderApprovalTypeEnum.getValue(), null,false);
applicationContext.publishEvent(approvalTypeCheckEvent);
if (approvalTypeCheckEvent.getResult()) {
orderNoList.add(orderDO.getOrderNo());
......
yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/boxPreloadGoods/BoxPreloadGoodsServiceImpl.java
View file @ 06684a34
package cn.iocoder.yudao.module.shipment.service.boxPreloadGoods;
import cn.hutool.core.collection.CollectionUtil;
import cn.iocoder.yudao.framework.apollo.core.event.Order.OrderApprovalTypeCheckEvent;
import cn.iocoder.yudao.framework.common.exception.ServiceException;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.collectors.CollectorsUtil;
......@@ -72,6 +73,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.google.common.base.Joiner;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
......@@ -87,6 +89,8 @@ import java.util.stream.Stream;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.order.enums.ErrorCodeConstants.ORDER_HAS_PROCESSING_APPROVAL;
import static cn.iocoder.yudao.module.order.enums.ErrorCodeConstants.ORDER_IS_APPROVAL_IN_PROCESS;
import static cn.iocoder.yudao.module.order.enums.OrderApprovalTypeEnum.ORDER_UPDATE;
import static cn.iocoder.yudao.module.shipment.enums.ErrorCodeConstants.*;
/**
......@@ -122,7 +126,8 @@ public class BoxPreloadGoodsServiceImpl extends AbstractService<BoxPreloadGoodsM
BoxLoadInfoService boxLoadInfoService;
@Resource
OrderService orderService;
@Resource
private ApplicationContext applicationContext;
@Resource
OrderQueryService orderQueryService;
@Resource
......@@ -190,7 +195,11 @@ public class BoxPreloadGoodsServiceImpl extends AbstractService<BoxPreloadGoodsM
.eq(BoxPreloadGoodsDO::getIsRemove, 0)
);
OrderDO orderDO = orderService.getById(orderId);
OrderApprovalTypeCheckEvent approvalTypeCheckEvent = new OrderApprovalTypeCheckEvent(orderDO.getOrderId(), null, null, Arrays.asList(1,2,3,4,5,12,31,32) , false);
applicationContext.publishEvent(approvalTypeCheckEvent);
if (approvalTypeCheckEvent.getResult()) {
throw exception(ORDER_IS_APPROVAL_IN_PROCESS);
}
//如果都符合，下面展示互斥和关联订单的弹窗
Integer relationStatus = createReqVO.getRelationStatus();
//校验是否是互斥订单
......@@ -424,7 +433,11 @@ public class BoxPreloadGoodsServiceImpl extends AbstractService<BoxPreloadGoodsM
.eq(BoxPreloadGoodsDO::getIsRemove, 0)
);
OrderDO orderDO = orderService.getById(orderId);
OrderApprovalTypeCheckEvent approvalTypeCheckEvent = new OrderApprovalTypeCheckEvent(orderDO.getOrderId(), null, null, Arrays.asList(1,2,3,4,5,12,31,32) , false);
applicationContext.publishEvent(approvalTypeCheckEvent);
if (approvalTypeCheckEvent.getResult()) {
throw exception(ORDER_IS_APPROVAL_IN_PROCESS);
}
//校验是否符合预装。
checkInstallAvailable(boxDO, secId, loadList, orderDO, orderItemIdList);
......@@ -2254,6 +2267,11 @@ public class BoxPreloadGoodsServiceImpl extends AbstractService<BoxPreloadGoodsM
OrderConsigneeDO filterConsigneeDO = getFilterOrderConsigneeDO(boxDO, loadList);
OrderDO orderDO = orderService.getById(orderId);
OrderApprovalTypeCheckEvent approvalTypeCheckEvent = new OrderApprovalTypeCheckEvent(orderDO.getOrderId(), null, null, Arrays.asList(1,2,3,4,5,12,31,32) , false);
applicationContext.publishEvent(approvalTypeCheckEvent);
if (approvalTypeCheckEvent.getResult()) {
throw exception(ORDER_IS_APPROVAL_IN_PROCESS);
}
if(filterConsigneeDO != null) {
//校验收货人是否是同一个人
OrderConsigneeDO consigneeDO = boxService.getOrderConsignee(orderDO);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment