diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 30ae40c..0e6e3d9 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -5,20 +5,13 @@ - - - - - - + - - - { - "keyToString": { - "Maven.wisdommining [clean].executor": "Run", - "Maven.wisdommining [package].executor": "Run", - "RequestMappingsPanelOrder0": "0", - "RequestMappingsPanelOrder1": "1", - "RequestMappingsPanelWidth0": "75", - "RequestMappingsPanelWidth1": "75", - "RunOnceActivity.ShowReadmeOnStart": "true", - "Spring Boot.WisdoMminingApplication.executor": "Debug", - "dart.analysis.tool.window.visible": "false", - "git-widget-placeholder": "master", - "kotlin-language-version-configured": "true", - "last_opened_file_path": "D:/Documents/IdeaProjects/wisdommining-serve/src/main/webapp/static/dist/order_logistics", - "node.js.detected.package.eslint": "true", - "node.js.detected.package.tslint": "true", - "node.js.selected.package.eslint": "(autodetect)", - "node.js.selected.package.tslint": "(autodetect)", - "nodejs_package_manager_path": "npm", - "project.structure.last.edited": "全局库", - "project.structure.proportion": "0.0", - "project.structure.side.proportion": "0.2", - "settings.editor.selected.configurable": "project.propVCSSupport.DirectoryMappings", - "show.migrate.to.gradle.popup": "false", - "vue.rearranger.settings.migration": "true" + +}]]> @@ -626,6 +619,7 @@ + 1623736948713 diff --git a/src/main/java/com/wisdo/mmining/controller/OrderController.java b/src/main/java/com/wisdo/mmining/controller/OrderController.java index 7d07c95..87d87b2 100644 --- a/src/main/java/com/wisdo/mmining/controller/OrderController.java +++ b/src/main/java/com/wisdo/mmining/controller/OrderController.java @@ -208,7 +208,7 @@ public class OrderController { modelAndView.addObject("orderId", orderId); modelAndView.addObject("type", type); modelAndView.addObject("order", order); - modelAndView.addObject("logistics", order.getLogistics()); + modelAndView.addObject("logistics", order.getLogistics() == null ? "[]" : order.getLogistics()); return modelAndView; } @@ -229,7 +229,7 @@ public class OrderController { modelAndView.addObject("orderId", orderId); modelAndView.addObject("type", type); modelAndView.addObject("order", order); - modelAndView.addObject("logistics", order.getLogistics()); + modelAndView.addObject("logistics", order.getLogistics() == null ? "[]" : order.getLogistics()); return modelAndView; } diff --git a/src/main/java/com/wisdo/mmining/controller/dto/GoodsDeDto.java b/src/main/java/com/wisdo/mmining/controller/dto/GoodsDeDto.java index 65070f7..d17ddde 100644 --- a/src/main/java/com/wisdo/mmining/controller/dto/GoodsDeDto.java +++ b/src/main/java/com/wisdo/mmining/controller/dto/GoodsDeDto.java @@ -7,4 +7,6 @@ public class GoodsDeDto { private Long id; private String name; private Integer num; + private Long specId; + private String spec; } diff --git a/src/main/resources/application-db.yml b/src/main/resources/application-db.yml index 36712a6..12d00e4 100644 --- a/src/main/resources/application-db.yml +++ b/src/main/resources/application-db.yml @@ -1,7 +1,7 @@ #开发环境 spring: datasource: - url: jdbc:mysql://192.168.0.142:3306/wisdo?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8 + url: jdbc:mysql://192.168.0.145:3306/wisdo?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8 # url: jdbc:mysql://146.56.198.32:3306/wisdo?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8 username: yshop # username: root diff --git a/src/main/webapp/WEB-INF/view/pages/order/order_edit_address.jsp b/src/main/webapp/WEB-INF/view/pages/order/order_edit_address.jsp index 0514f38..09eda6e 100644 --- a/src/main/webapp/WEB-INF/view/pages/order/order_edit_address.jsp +++ b/src/main/webapp/WEB-INF/view/pages/order/order_edit_address.jsp @@ -20,29 +20,35 @@
- +