diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsOrderController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsOrderController.java index ab9926d..eb431b9 100644 --- a/mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsOrderController.java +++ b/mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsOrderController.java @@ -90,9 +90,9 @@ public class OmsOrderController { return new CommonResult().failed(); } - @GetMapping("/exportExcel") + @PostMapping("/exportExcel") @ApiOperation(value = "订单列表导出") - public void exportExcel(OmsOrderQuery omsOrderQuery) { + public void exportExcel(@RequestBody OmsOrderQuery omsOrderQuery) { //得到所有要导出的数据 List excelVos = IOmsOrderService.listExcel(omsOrderQuery); //定义导出的excel名字 @@ -340,9 +340,9 @@ public class OmsOrderController { return new CommonResult().failed(); } - @GetMapping("/exportExcel2") + @PostMapping("/exportExcel2") @ApiOperation(value = "订单归集列表导出") - public void exportExcel2(OmsOrderLocationQuery omsOrderLocationQuery) { + public void exportExcel2(@RequestBody OmsOrderLocationQuery omsOrderLocationQuery) { //得到所有要导出的数据 List excelVos = IOmsOrderService.listExcel2(omsOrderLocationQuery); //定义导出的excel名字 diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsOrderReturnApplyController.java b/mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsOrderReturnApplyController.java index 7dd12de..e42fefb 100644 --- a/mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsOrderReturnApplyController.java +++ b/mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsOrderReturnApplyController.java @@ -268,4 +268,13 @@ public class OmsOrderReturnApplyController { return null; } + + + public void main(String[] args) { + String out_trade_no = ""; + String trade_no =""; + String refund_amount =""; + String returnRe = alipayRefund(out_trade_no,trade_no,refund_amount); + + } } diff --git a/mallplus-admin/src/main/java/com/zscat/mallplus/oms/service/impl/OmsOrderServiceImpl.java b/mallplus-admin/src/main/java/com/zscat/mallplus/oms/service/impl/OmsOrderServiceImpl.java index 7c7d045..b94e4c6 100644 --- a/mallplus-admin/src/main/java/com/zscat/mallplus/oms/service/impl/OmsOrderServiceImpl.java +++ b/mallplus-admin/src/main/java/com/zscat/mallplus/oms/service/impl/OmsOrderServiceImpl.java @@ -386,20 +386,20 @@ public class OmsOrderServiceImpl extends ServiceImpl i public List listExcel(OmsOrderQuery omsOrderQuery) { QueryWrapper qw = new QueryWrapper<>(); if (StringUtils.isNotBlank(omsOrderQuery.getOrderSn())) { - qw.like("order_sn", omsOrderQuery.getOrderSn()); + qw.like("omo.order_sn", omsOrderQuery.getOrderSn()); } if (StringUtils.isNotBlank(omsOrderQuery.getReceiverPhone())) { - qw.like("receiver_phone", omsOrderQuery.getReceiverPhone()); + qw.like("omo.receiver_phone", omsOrderQuery.getReceiverPhone()); } - qw.apply(StringUtils.isNotBlank(omsOrderQuery.getCreateTimeStart()), "date_format (create_time,'%Y-%m-%d') >= date_format('" + omsOrderQuery.getCreateTimeStart() + "','%Y-%m-%d')"). - apply(StringUtils.isNotBlank(omsOrderQuery.getCreateTimeEnd()), "date_format (create_time,'%Y-%m-%d') <= date_format('" + omsOrderQuery.getCreateTimeEnd() + "','%Y-%m-%d')" + qw.apply(StringUtils.isNotBlank(omsOrderQuery.getCreateTimeStart()), "date_format (omo.create_time,'%Y-%m-%d') >= date_format('" + omsOrderQuery.getCreateTimeStart() + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(omsOrderQuery.getCreateTimeEnd()), "date_format (omo.create_time,'%Y-%m-%d') <= date_format('" + omsOrderQuery.getCreateTimeEnd() + "','%Y-%m-%d')" ); List orders = new ArrayList<>(); if (StringUtils.isBlank(omsOrderQuery.getStatus())) { //查询全部订单 orders = orderMapper.listExcel(qw); } else { - orders = orderMapper.listExcel(qw.eq("status", omsOrderQuery.getStatus())); + orders = orderMapper.listExcel(qw.eq("omo.status", omsOrderQuery.getStatus())); } return orders; } @@ -408,20 +408,20 @@ public class OmsOrderServiceImpl extends ServiceImpl i public List listExcel2(OmsOrderLocationQuery omsOrderLocationQuery) { QueryWrapper qw = new QueryWrapper<>(); if (StringUtils.isNotBlank(omsOrderLocationQuery.getValueqhd())) { - qw.eq("receiver_detail_address", omsOrderLocationQuery.getValueqhd()); + qw.eq("omo.receiver_detail_address", omsOrderLocationQuery.getValueqhd()); } if (StringUtils.isNotBlank(omsOrderLocationQuery.getValueszd())) { - qw.eq("receiver_region", omsOrderLocationQuery.getValueszd()); + qw.eq("omo.receiver_region", omsOrderLocationQuery.getValueszd()); } if (StringUtils.isNotBlank(omsOrderLocationQuery.getReceiverPhone())) { - qw.like("receiver_phone", omsOrderLocationQuery.getReceiverPhone()); + qw.like("omo.receiver_phone", omsOrderLocationQuery.getReceiverPhone()); } List orders = new ArrayList<>(); if (StringUtils.isBlank(omsOrderLocationQuery.getStatus())) { //查询全部订单 orders = orderMapper.listExcel(qw); } else { - orders = orderMapper.listExcel(qw.eq("status", omsOrderLocationQuery.getStatus())); + orders = orderMapper.listExcel(qw.eq("omo.status", omsOrderLocationQuery.getStatus())); } return orders; } diff --git a/mallplusui-web-admin/config/dev.env.js b/mallplusui-web-admin/config/dev.env.js index 9253274..ad226ad 100644 --- a/mallplusui-web-admin/config/dev.env.js +++ b/mallplusui-web-admin/config/dev.env.js @@ -4,7 +4,7 @@ const prodEnv = require('./prod.env') module.exports = merge(prodEnv, { NODE_ENV: '"development"', - BASE_API: '"http://mall.yyundong.com/adminapi"', - // BASE_API: '"http://192.168.3.9:8085"' + // BASE_API: '"http://mall.yyundong.com/adminapi"', + BASE_API: '"http://192.168.3.9:8085"' // BASE_API: '"http://127.0.0.1:8085"' }) diff --git a/mallplusui-web-admin/config/index.js b/mallplusui-web-admin/config/index.js index c6663fa..59eea65 100644 --- a/mallplusui-web-admin/config/index.js +++ b/mallplusui-web-admin/config/index.js @@ -1,69 +1,80 @@ 'use strict' -// Template version: 1.3.1 -// see http://vuejs-templates.github.io/webpack for documentation. + // Template version: 1.3.1 + // see http://vuejs-templates.github.io/webpack for documentation. -const path = require('path') + const path = require('path') -module.exports = { - dev: { - // Paths - assetsSubDirectory: 'static', - assetsPublicPath: '/', - proxyTable: {}, + module.exports = { + dev: { + env: require('./dev.env'), + // Paths + assetsSubDirectory: 'static', + assetsPublicPath: '/', + proxyTable: { + '/api': { // 匹配所有以 '/api'开头的请求路径 + target: 'http://192.168.3.9:8085', // 代理目标的基础路径 + // target: 'https://260e7735j5.oicp.vip', // 代理目标的基础路径 + // target: process.env.VUE_APP_URL, // 代理目标的基础路径 + changeOrigin: true, // 支持跨域 + pathRewrite: { // 重写路径: 去掉路径中开头的'/api' + '^/api': '' + } + } + }, - // Various Dev Server settings - host: '127.0.0.1', // can be overwritten by process.env.HOST localhost - port: 8091, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined - autoOpenBrowser: false, - errorOverlay: true, - notifyOnErrors: true, - poll: false, // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions- + // Various Dev Server settings + host: '127.0.0.1', // can be overwritten by process.env.HOST localhost + port: 8091, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined + autoOpenBrowser: false, + errorOverlay: true, + notifyOnErrors: true, + poll: false, // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions- - /** - * Source Maps - */ + /** + * Source Maps + */ - // https://webpack.js.org/configuration/devtool/#development - devtool: 'cheap-module-eval-source-map', + // https://webpack.js.org/configuration/devtool/#development + devtool: 'cheap-module-eval-source-map', - // If you have problems debugging vue-files in devtools, - // set this to false - it *may* help - // https://vue-loader.vuejs.org/en/options.html#cachebusting - cacheBusting: true, + // If you have problems debugging vue-files in devtools, + // set this to false - it *may* help + // https://vue-loader.vuejs.org/en/options.html#cachebusting + cacheBusting: true, - cssSourceMap: true - }, + cssSourceMap: true + }, - build: { - // Template for index.html - index: path.resolve(__dirname, '../dist/index.html'), + build: { + // Template for index.html + index: path.resolve(__dirname, '../dist/index.html'), - // Paths - assetsRoot: path.resolve(__dirname, '../dist'), - assetsSubDirectory: 'static', - assetsPublicPath: './', + // Paths + assetsRoot: path.resolve(__dirname, '../dist'), + assetsSubDirectory: 'static', + assetsPublicPath: './', - /** - * Source Maps - */ + /** + * Source Maps + */ - productionSourceMap: true, - // https://webpack.js.org/configuration/devtool/#production - // devtool: '#source-map', + productionSourceMap: true, + // https://webpack.js.org/configuration/devtool/#production + // devtool: '#source-map', - // Gzip off by default as many popular static hosts such as - // Surge or Netlify already gzip all static assets for you. - // Before setting to `true`, make sure to: - // npm install --save-dev compression-webpack-plugin - productionGzip: true, - productionGzipExtensions: ['js', 'css'], + // Gzip off by default as many popular static hosts such as + // Surge or Netlify already gzip all static assets for you. + // Before setting to `true`, make sure to: + // npm install --save-dev compression-webpack-plugin + productionGzip: true, + productionGzipExtensions: ['js', 'css'], - // Run the build command with an extra argument to - // View the bundle analyzer report after build finishes: - // `npm run build --report` - // Set to `true` or `false` to always turn it on or off - bundleAnalyzerReport: process.env.npm_config_report - } -} + // Run the build command with an extra argument to + // View the bundle analyzer report after build finishes: + // `npm run build --report` + // Set to `true` or `false` to always turn it on or off + bundleAnalyzerReport: process.env.npm_config_report + } + } \ No newline at end of file diff --git a/mallplusui-web-admin/src/api/order.js b/mallplusui-web-admin/src/api/order.js index 849c033..5ed2982 100644 --- a/mallplusui-web-admin/src/api/order.js +++ b/mallplusui-web-admin/src/api/order.js @@ -70,7 +70,8 @@ export function orderData(params) { export function exportExcel(params) { return request({ - url: '/base/v1/basevehicleout/exportExcel', + baseURL: '/api', + url: '/oms/OmsOrder/exportExcel', method: 'post', responseType: 'blob', // 表明返回服务器返回的数据类型 data: params, @@ -78,4 +79,13 @@ export function exportExcel(params) { 'Content-Type': 'application/json' } }) -} \ No newline at end of file +} + + +// export function exportExcel(params) { +// return request({ +// url: '/oms/OmsOrder/exportExcel', +// method: 'get', +// params: params +// }) +// } \ No newline at end of file diff --git a/mallplusui-web-admin/src/api/orderStatistic.js b/mallplusui-web-admin/src/api/orderStatistic.js index 24c4774..a9c61b8 100644 --- a/mallplusui-web-admin/src/api/orderStatistic.js +++ b/mallplusui-web-admin/src/api/orderStatistic.js @@ -85,7 +85,7 @@ export function orderData(params) { export function exportExcel(params) { return request({ - url: '/base/v1/basevehicleout/exportExcel', + url: '/oms/OmsOrder/exportExcel2', method: 'post', responseType: 'blob', // 表明返回服务器返回的数据类型 data: params, diff --git a/mallplusui-web-admin/src/main.js b/mallplusui-web-admin/src/main.js index b9be3c1..3e365b5 100644 --- a/mallplusui-web-admin/src/main.js +++ b/mallplusui-web-admin/src/main.js @@ -10,6 +10,13 @@ import VCharts from 'v-charts' import '@/styles/index.scss' // global css import App from './App' +import Axios from 'axios' + +Vue.prototype.$axios = Axios +Axios.defaults.baseURL = '/api' +Axios.defaults.headers.post['Content-Type'] = 'application/json'; + + import router from './router' import store from './store' // 全局自定义组件 diff --git a/mallplusui-web-admin/src/views/oms/order/index1.vue b/mallplusui-web-admin/src/views/oms/order/index1.vue index dc10fcd..23fa3be 100644 --- a/mallplusui-web-admin/src/views/oms/order/index1.vue +++ b/mallplusui-web-admin/src/views/oms/order/index1.vue @@ -121,9 +121,14 @@ 数据列表 + 导出Excel + + 批量发货 +