From 7bce49cefe05cfed4e90c0527a0513725130048d Mon Sep 17 00:00:00 2001 From: quantulr <35954003+quantulr@users.noreply.github.com> Date: Fri, 28 Jun 2024 17:24:56 +0800 Subject: [PATCH] update --- .idea/workspace.xml | 67 +++++++++++-------- .../config/shiro/ShiroConfiguration.java | 1 + .../java/com/wisdo/mmining/api/OrderApi.java | 20 ++++++ src/main/resources/application-db.yml | 12 ++-- src/main/resources/application.yml | 12 ++-- 5 files changed, 71 insertions(+), 41 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 78e417f..cdf5aca 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,8 +6,10 @@ - + + + - { - "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": "preferences.pluginManager", - "show.migrate.to.gradle.popup": "false", - "vue.rearranger.settings.migration": "true" + +}]]> @@ -521,8 +523,8 @@ - @@ -644,6 +646,13 @@ + + + + + + + 1623736948713 diff --git a/src/main/code/com/wisdo/mmining/config/shiro/ShiroConfiguration.java b/src/main/code/com/wisdo/mmining/config/shiro/ShiroConfiguration.java index f9871b7..3a0ce7a 100644 --- a/src/main/code/com/wisdo/mmining/config/shiro/ShiroConfiguration.java +++ b/src/main/code/com/wisdo/mmining/config/shiro/ShiroConfiguration.java @@ -222,6 +222,7 @@ public class ShiroConfiguration { // anon:不授权访问 filterChainDefinitionMap.put("/doLogin", "anon"); filterChainDefinitionMap.put("/login", "anon"); + filterChainDefinitionMap.put("/goodsOfOrder", "anon"); filterChainDefinitionMap.put("/qqApi/**","anon"); //错误跳转 filterChainDefinitionMap.put("/error/**", "anon"); diff --git a/src/main/java/com/wisdo/mmining/api/OrderApi.java b/src/main/java/com/wisdo/mmining/api/OrderApi.java index 5c3be31..30a8f16 100644 --- a/src/main/java/com/wisdo/mmining/api/OrderApi.java +++ b/src/main/java/com/wisdo/mmining/api/OrderApi.java @@ -170,6 +170,26 @@ public class OrderApi { return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS_MSG, wisdWxuser); } + @ApiOperation(value = "获取订单的商品列表") + @ApiImplicitParams({@ApiImplicitParam(name = "orderNumber", value = "订单号", paramType = "orderNumber")}) + @GetMapping("goodsOfOrder") + public Result getGoodsOfOrder(String orderNumber) { + WisdOeder wisdOeder = orderService.getOrderByNumber(orderNumber); + List orderDetailList = orderDetailService.getByOrderId(wisdOeder.getId()); + List wisdGoodsList = new ArrayList<>(); + for (WisdOrderDetail wisdOrderDetail : orderDetailList) { + WisdGoods wisdGoods = goodsService.getInfoById(wisdOrderDetail.getGoodsId()); + WisdGoodsSpec wisdGoodsSpec = goodsSpecService.getById(wisdOrderDetail.getSpecId()); + wisdGoods.setWisdGoodsSpec(wisdGoodsSpec); + wisdGoods.setGoodsNum(wisdOrderDetail.getGoodsNum()); + if (wisdOrderDetail.getSpecPrice() != null) { + wisdGoods.setSprice(wisdOrderDetail.getSpecPrice().doubleValue()); + } + wisdGoodsList.add(wisdGoods); + } + return new Result(ResultUtil.SUCCESS, ResultUtil.SUCCESS, wisdGoodsList); + } + @ApiOperation(value = "提交订单") @PostMapping("addOrder") public Result addOrder(@RequestBody WisdOeder wisdOeder, HttpServletRequest request) { diff --git a/src/main/resources/application-db.yml b/src/main/resources/application-db.yml index 871fdc7..1ea64bc 100644 --- a/src/main/resources/application-db.yml +++ b/src/main/resources/application-db.yml @@ -1,12 +1,12 @@ #开发环境 spring: datasource: -# url: jdbc:mysql://192.168.0.137: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 -# password: Qwer1234. - password: Sphc666888! + url: jdbc:mysql://192.168.0.233: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 + password: Qwer1234. +# password: Sphc666888! type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.cj.jdbc.Driver druid: diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 51b5e61..700c540 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,6 +1,6 @@ server: -# port: 9000 - port: 9090 + port: 9000 +# port: 9090 servlet: context-path: /wisdommining spring: @@ -39,8 +39,8 @@ spring: # port: 6379 redis: database: 10 -# host: localhost - host: 146.56.198.32 + host: localhost +# host: 146.56.198.32 timeout: 100000 jedis: pool: @@ -49,8 +49,8 @@ spring: max-idle: 8 min-idle: 0 port: 6379 - password: Zsd@2021! -# password: +# password: Zsd@2021! + password: mybatis-plus: