记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit 97e89335 authored by 胡佳晨's avatar 胡佳晨
Browse files
Options

Merge branch 'dev' into test

parents 6d97bbc2 06efa5a8
Show whitespace changes
Inline Side-by-side
Showing with 10 additions and 6 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/docu/db_liquidnet_admin_data.sql
View file @ 97e89335
...@@ -41,7 +41,7 @@ INSERT INTO test_ln_scene.sys_menu (menu_id, menu_name, parent_id, order_num, ur ...@@ -41,7 +41,7 @@ INSERT INTO test_ln_scene.sys_menu (menu_id, menu_name, parent_id, order_num, ur
INSERT INTO test_ln_scene.sys_menu (menu_id, menu_name, parent_id, order_num, url, target, menu_type, visible, is_refresh, perms, icon, create_by, create_time, update_by, update_time, remark) VALUES (2037, '下单结果主动查询', 2034, 3, '#', 'menuItem', 'F', '0', '1', 'kylin:performancesExpress:getResult', '#', 'admin', '2021-06-30 20:07:07', '', null, ''); INSERT INTO test_ln_scene.sys_menu (menu_id, menu_name, parent_id, order_num, url, target, menu_type, visible, is_refresh, perms, icon, create_by, create_time, update_by, update_time, remark) VALUES (2037, '下单结果主动查询', 2034, 3, '#', 'menuItem', 'F', '0', '1', 'kylin:performancesExpress:getResult', '#', 'admin', '2021-06-30 20:07:07', '', null, '');
INSERT INTO test_ln_scene.sys_menu (menu_id, menu_name, parent_id, order_num, url, target, menu_type, visible, is_refresh, perms, icon, create_by, create_time, update_by, update_time, remark) VALUES (2038, '运费估算', 2034, 4, '#', 'menuItem', 'F', '0', '1', 'kylin:performancesExpress:getFreight', '#', 'admin', '2021-06-30 20:07:07', '', null, ''); INSERT INTO test_ln_scene.sys_menu (menu_id, menu_name, parent_id, order_num, url, target, menu_type, visible, is_refresh, perms, icon, create_by, create_time, update_by, update_time, remark) VALUES (2038, '运费估算', 2034, 4, '#', 'menuItem', 'F', '0', '1', 'kylin:performancesExpress:getFreight', '#', 'admin', '2021-06-30 20:07:07', '', null, '');
INSERT INTO test_ln_scene.sys_menu (menu_id, menu_name, parent_id, order_num, url, target, menu_type, visible, is_refresh, perms, icon, create_by, create_time, update_by, update_time, remark) VALUES (2039, '路由信息主动查询', 2034, 5, '#', 'menuItem', 'F', '0', '1', 'kylin:performancesExpress:listOrderRoute', '#', 'admin', '2021-06-30 20:07:07', '', null, ''); INSERT INTO test_ln_scene.sys_menu (menu_id, menu_name, parent_id, order_num, url, target, menu_type, visible, is_refresh, perms, icon, create_by, create_time, update_by, update_time, remark) VALUES (2039, '路由信息主动查询', 2034, 5, '#', 'menuItem', 'F', '0', '1', 'kylin:performancesExpress:listOrderRoute', '#', 'admin', '2021-06-30 20:07:07', '', null, '');
# INSERT INTO test_ln_scene.sys_menu (menu_id, menu_name, parent_id, order_num, url, target, menu_type, visible, is_refresh, perms, icon, create_by, create_time, update_by, update_time, remark) VALUES (2040, '实际运费主动查询', 2034, 6, '#', 'menuItem', 'F', '0', '1', 'kylin:performancesExpress:getListFreight', '#', 'admin', '2021-06-30 20:07:07', '', null, ''); INSERT INTO test_ln_scene.sys_menu (menu_id, menu_name, parent_id, order_num, url, target, menu_type, visible, is_refresh, perms, icon, create_by, create_time, update_by, update_time, remark) VALUES (2040, '实际运费主动查询', 2034, 6, '#', 'menuItem', 'F', '0', '1', 'kylin:performancesExpress:getListFreight', '#', 'admin', '2021-06-30 20:07:07', '', null, '');
INSERT INTO test_ln_scene.sys_menu (menu_id, menu_name, parent_id, order_num, url, target, menu_type, visible, is_refresh, perms, icon, create_by, create_time, update_by, update_time, remark) VALUES (2041, '版本控制', 2000, 5, '#', 'menuItem', 'C', '0', '1', 'kylin:versionControl:view', '#', 'admin', '2021-06-30 20:01:36', '', null, ''); INSERT INTO test_ln_scene.sys_menu (menu_id, menu_name, parent_id, order_num, url, target, menu_type, visible, is_refresh, perms, icon, create_by, create_time, update_by, update_time, remark) VALUES (2041, '版本控制', 2000, 5, '#', 'menuItem', 'C', '0', '1', 'kylin:versionControl:view', '#', 'admin', '2021-06-30 20:01:36', '', null, '');
INSERT INTO test_ln_scene.sys_menu (menu_id, menu_name, parent_id, order_num, url, target, menu_type, visible, is_refresh, perms, icon, create_by, create_time, update_by, update_time, remark) VALUES (2042, '正在现场App', 2041, 0, '/kylin/zhengzaiAppVersion', 'menuItem', 'C', '0', '1', 'kylin:zhengzaiAppVersion:list', '#', 'admin', '2021-06-30 20:03:59', '', null, ''); INSERT INTO test_ln_scene.sys_menu (menu_id, menu_name, parent_id, order_num, url, target, menu_type, visible, is_refresh, perms, icon, create_by, create_time, update_by, update_time, remark) VALUES (2042, '正在现场App', 2041, 0, '/kylin/zhengzaiAppVersion', 'menuItem', 'C', '0', '1', 'kylin:zhengzaiAppVersion:list', '#', 'admin', '2021-06-30 20:03:59', '', null, '');
...@@ -54,10 +54,10 @@ INSERT INTO test_ln_scene.sys_menu (menu_id, menu_name, parent_id, order_num, ur ...@@ -54,10 +54,10 @@ INSERT INTO test_ln_scene.sys_menu (menu_id, menu_name, parent_id, order_num, ur
INSERT INTO test_ln_scene.sys_menu (menu_id, menu_name, parent_id, order_num, url, target, menu_type, visible, is_refresh, perms, icon, create_by, create_time, update_by, update_time, remark) VALUES (2048, '添加', 2047, 1, '#', 'menuItem', 'F', '0', '1', 'admin:upush:create', '#', 'admin', '2021-06-30 20:05:58', '', null, ''); INSERT INTO test_ln_scene.sys_menu (menu_id, menu_name, parent_id, order_num, url, target, menu_type, visible, is_refresh, perms, icon, create_by, create_time, update_by, update_time, remark) VALUES (2048, '添加', 2047, 1, '#', 'menuItem', 'F', '0', '1', 'admin:upush:create', '#', 'admin', '2021-06-30 20:05:58', '', null, '');
INSERT INTO test_ln_scene.sys_menu (menu_id, menu_name, parent_id, order_num, url, target, menu_type, visible, is_refresh, perms, icon, create_by, create_time, update_by, update_time, remark) VALUES (2049, '查看', 2047, 2, '#', 'menuItem', 'F', '0', '1', 'admin:upush:detail', '#', 'admin', '2021-06-30 20:07:07', '', null, ''); INSERT INTO test_ln_scene.sys_menu (menu_id, menu_name, parent_id, order_num, url, target, menu_type, visible, is_refresh, perms, icon, create_by, create_time, update_by, update_time, remark) VALUES (2049, '查看', 2047, 2, '#', 'menuItem', 'F', '0', '1', 'admin:upush:detail', '#', 'admin', '2021-06-30 20:07:07', '', null, '');
INSERT INTO dev_ln_scene.sys_menu (menu_id, menu_name, parent_id, order_num, url, target, menu_type, visible, is_refresh, perms, icon, create_by, create_time, update_by, update_time, remark) VALUES (2050, '打印快递单', 2034, 7, '#', 'menuItem', 'F', '0', '1', 'kylin:performancesExpress:printExpress', '#', 'admin', '2021-06-30 20:07:07', '', null, ''); INSERT INTO test_ln_scene.sys_menu (menu_id, menu_name, parent_id, order_num, url, target, menu_type, visible, is_refresh, perms, icon, create_by, create_time, update_by, update_time, remark) VALUES (2050, '打印快递单', 2034, 7, '#', 'menuItem', 'F', '0', '1', 'kylin:performancesExpress:printExpress', '#', 'admin', '2021-06-30 20:07:07', '', null, '');
INSERT INTO dev_ln_scene.sys_menu (menu_id, menu_name, parent_id, order_num, url, target, menu_type, visible, is_refresh, perms, icon, create_by, create_time, update_by, update_time, remark) VALUES (2051, '批量下单', 2033, 0, '#', 'menuItem', 'F', '0', '1', 'kylin:performancesExpress:batchPlaceOrder', '#', 'admin', '2021-06-30 20:05:58', '', null, ''); INSERT INTO test_ln_scene.sys_menu (menu_id, menu_name, parent_id, order_num, url, target, menu_type, visible, is_refresh, perms, icon, create_by, create_time, update_by, update_time, remark) VALUES (2051, '批量下单', 2033, 0, '#', 'menuItem', 'F', '0', '1', 'kylin:performancesExpress:batchPlaceOrder', '#', 'admin', '2021-06-30 20:05:58', '', null, '');
INSERT INTO dev_ln_scene.sys_menu (menu_id, menu_name, parent_id, order_num, url, target, menu_type, visible, is_refresh, perms, icon, create_by, create_time, update_by, update_time, remark) VALUES (2052, '批量取消', 2033, 1, '#', 'menuItem', 'F', '0', '1', 'kylin:performancesExpress:batchCancelOrder', '#', 'admin', '2021-06-30 20:07:07', '', null, ''); INSERT INTO test_ln_scene.sys_menu (menu_id, menu_name, parent_id, order_num, url, target, menu_type, visible, is_refresh, perms, icon, create_by, create_time, update_by, update_time, remark) VALUES (2052, '批量取消', 2033, 1, '#', 'menuItem', 'F', '0', '1', 'kylin:performancesExpress:batchCancelOrder', '#', 'admin', '2021-06-30 20:07:07', '', null, '');
INSERT INTO dev_ln_scene.sys_menu (menu_id, menu_name, parent_id, order_num, url, target, menu_type, visible, is_refresh, perms, icon, create_by, create_time, update_by, update_time, remark) VALUES (2053, '批量打印快递单', 2033, 2, '#', 'menuItem', 'F', '0', '1', 'kylin:performancesExpress:batchPrintExpress', '#', 'admin', '2021-06-30 20:07:07', '', null, ''); INSERT INTO test_ln_scene.sys_menu (menu_id, menu_name, parent_id, order_num, url, target, menu_type, visible, is_refresh, perms, icon, create_by, create_time, update_by, update_time, remark) VALUES (2053, '批量打印快递单', 2033, 2, '#', 'menuItem', 'F', '0', '1', 'kylin:performancesExpress:batchPrintExpress', '#', 'admin', '2021-06-30 20:07:07', '', null, '');
-- sys_role_menu -- sys_role_menu
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/utils/OrderUtils.java
View file @ 97e89335
...@@ -2,6 +2,7 @@ package com.liquidnet.service.kylin.utils; ...@@ -2,6 +2,7 @@ package com.liquidnet.service.kylin.utils;
import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo; import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderListVo; import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderListVo;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
...@@ -9,6 +10,7 @@ import org.springframework.stereotype.Component; ...@@ -9,6 +10,7 @@ import org.springframework.stereotype.Component;
import java.util.List; import java.util.List;
@Component @Component
@Slf4j
public class OrderUtils { public class OrderUtils {
@Autowired @Autowired
...@@ -31,6 +33,7 @@ public class OrderUtils { ...@@ -31,6 +33,7 @@ public class OrderUtils {
} }
BeanUtils.copyProperties(data, voItem); BeanUtils.copyProperties(data, voItem);
List<KylinOrderListVo> redisData = dataUtils.getOrderList(userId); List<KylinOrderListVo> redisData = dataUtils.getOrderList(userId);
log.info("STEP0 = "+redisData.size());
if (type == 1) { if (type == 1) {
redisVo.add(voItem); redisVo.add(voItem);
if (redisData.size() > 0) { if (redisData.size() > 0) {
...@@ -41,7 +44,7 @@ public class OrderUtils { ...@@ -41,7 +44,7 @@ public class OrderUtils {
} }
redisVo.addAll(redisData); redisVo.addAll(redisData);
log.info("STEP1 = "+redisVo.size());
switch (type) { switch (type) {
case 1: case 1:
for (int i = 0; i < redisVo.size(); i++) { for (int i = 0; i < redisVo.size(); i++) {
...@@ -70,6 +73,7 @@ public class OrderUtils { ...@@ -70,6 +73,7 @@ public class OrderUtils {
vo.add(redisVo.get(i)); vo.add(redisVo.get(i));
} }
} }
log.info("STEP2 = "+vo.size());
dataUtils.setOrderList(userId, vo); dataUtils.setOrderList(userId, vo);
return true; return true;
default: default:
......
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