Browse Source

Merge remote-tracking branch 'origin/master'

master
wangpengfei 2 years ago
parent
commit
75a7a53ef5
  1. 8
      mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsOrderController.java
  2. 9
      mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsOrderReturnApplyController.java
  3. 18
      mallplus-admin/src/main/java/com/zscat/mallplus/oms/service/impl/OmsOrderServiceImpl.java
  4. 4
      mallplusui-web-admin/config/dev.env.js
  5. 117
      mallplusui-web-admin/config/index.js
  6. 12
      mallplusui-web-admin/src/api/order.js
  7. 2
      mallplusui-web-admin/src/api/orderStatistic.js
  8. 7
      mallplusui-web-admin/src/main.js
  9. 93
      mallplusui-web-admin/src/views/oms/order/index1.vue
  10. 49
      mallplusui-web-admin/src/views/oms/order/orderStatistic.vue

8
mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsOrderController.java

@ -90,9 +90,9 @@ public class OmsOrderController {
return new CommonResult().failed(); return new CommonResult().failed();
} }
@GetMapping("/exportExcel") @PostMapping("/exportExcel")
@ApiOperation(value = "订单列表导出") @ApiOperation(value = "订单列表导出")
public void exportExcel(OmsOrderQuery omsOrderQuery) { public void exportExcel(@RequestBody OmsOrderQuery omsOrderQuery) {
//得到所有要导出的数据 //得到所有要导出的数据
List<OrderExcelVo> excelVos = IOmsOrderService.listExcel(omsOrderQuery); List<OrderExcelVo> excelVos = IOmsOrderService.listExcel(omsOrderQuery);
//定义导出的excel名字 //定义导出的excel名字
@ -340,9 +340,9 @@ public class OmsOrderController {
return new CommonResult().failed(); return new CommonResult().failed();
} }
@GetMapping("/exportExcel2") @PostMapping("/exportExcel2")
@ApiOperation(value = "订单归集列表导出") @ApiOperation(value = "订单归集列表导出")
public void exportExcel2(OmsOrderLocationQuery omsOrderLocationQuery) { public void exportExcel2(@RequestBody OmsOrderLocationQuery omsOrderLocationQuery) {
//得到所有要导出的数据 //得到所有要导出的数据
List<OrderExcelVo> excelVos = IOmsOrderService.listExcel2(omsOrderLocationQuery); List<OrderExcelVo> excelVos = IOmsOrderService.listExcel2(omsOrderLocationQuery);
//定义导出的excel名字 //定义导出的excel名字

9
mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsOrderReturnApplyController.java

@ -268,4 +268,13 @@ public class OmsOrderReturnApplyController {
return null; 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);
}
} }

18
mallplus-admin/src/main/java/com/zscat/mallplus/oms/service/impl/OmsOrderServiceImpl.java

@ -386,20 +386,20 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
public List<OrderExcelVo> listExcel(OmsOrderQuery omsOrderQuery) { public List<OrderExcelVo> listExcel(OmsOrderQuery omsOrderQuery) {
QueryWrapper<OmsOrder> qw = new QueryWrapper<>(); QueryWrapper<OmsOrder> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(omsOrderQuery.getOrderSn())) { if (StringUtils.isNotBlank(omsOrderQuery.getOrderSn())) {
qw.like("order_sn", omsOrderQuery.getOrderSn()); qw.like("omo.order_sn", omsOrderQuery.getOrderSn());
} }
if (StringUtils.isNotBlank(omsOrderQuery.getReceiverPhone())) { 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')"). 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 (create_time,'%Y-%m-%d') <= date_format('" + omsOrderQuery.getCreateTimeEnd() + "','%Y-%m-%d')" apply(StringUtils.isNotBlank(omsOrderQuery.getCreateTimeEnd()), "date_format (omo.create_time,'%Y-%m-%d') <= date_format('" + omsOrderQuery.getCreateTimeEnd() + "','%Y-%m-%d')"
); );
List<OrderExcelVo> orders = new ArrayList<>(); List<OrderExcelVo> orders = new ArrayList<>();
if (StringUtils.isBlank(omsOrderQuery.getStatus())) { if (StringUtils.isBlank(omsOrderQuery.getStatus())) {
//查询全部订单 //查询全部订单
orders = orderMapper.listExcel(qw); orders = orderMapper.listExcel(qw);
} else { } else {
orders = orderMapper.listExcel(qw.eq("status", omsOrderQuery.getStatus())); orders = orderMapper.listExcel(qw.eq("omo.status", omsOrderQuery.getStatus()));
} }
return orders; return orders;
} }
@ -408,20 +408,20 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
public List<OrderExcelVo> listExcel2(OmsOrderLocationQuery omsOrderLocationQuery) { public List<OrderExcelVo> listExcel2(OmsOrderLocationQuery omsOrderLocationQuery) {
QueryWrapper<OmsOrder> qw = new QueryWrapper<>(); QueryWrapper<OmsOrder> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(omsOrderLocationQuery.getValueqhd())) { 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())) { if (StringUtils.isNotBlank(omsOrderLocationQuery.getValueszd())) {
qw.eq("receiver_region", omsOrderLocationQuery.getValueszd()); qw.eq("omo.receiver_region", omsOrderLocationQuery.getValueszd());
} }
if (StringUtils.isNotBlank(omsOrderLocationQuery.getReceiverPhone())) { if (StringUtils.isNotBlank(omsOrderLocationQuery.getReceiverPhone())) {
qw.like("receiver_phone", omsOrderLocationQuery.getReceiverPhone()); qw.like("omo.receiver_phone", omsOrderLocationQuery.getReceiverPhone());
} }
List<OrderExcelVo> orders = new ArrayList<>(); List<OrderExcelVo> orders = new ArrayList<>();
if (StringUtils.isBlank(omsOrderLocationQuery.getStatus())) { if (StringUtils.isBlank(omsOrderLocationQuery.getStatus())) {
//查询全部订单 //查询全部订单
orders = orderMapper.listExcel(qw); orders = orderMapper.listExcel(qw);
} else { } else {
orders = orderMapper.listExcel(qw.eq("status", omsOrderLocationQuery.getStatus())); orders = orderMapper.listExcel(qw.eq("omo.status", omsOrderLocationQuery.getStatus()));
} }
return orders; return orders;
} }

4
mallplusui-web-admin/config/dev.env.js

@ -4,7 +4,7 @@ const prodEnv = require('./prod.env')
module.exports = merge(prodEnv, { module.exports = merge(prodEnv, {
NODE_ENV: '"development"', NODE_ENV: '"development"',
BASE_API: '"http://mall.yyundong.com/adminapi"', // BASE_API: '"http://mall.yyundong.com/adminapi"',
// BASE_API: '"http://192.168.3.9:8085"' BASE_API: '"http://192.168.3.9:8085"'
// BASE_API: '"http://127.0.0.1:8085"' // BASE_API: '"http://127.0.0.1:8085"'
}) })

117
mallplusui-web-admin/config/index.js

@ -1,69 +1,80 @@
'use strict' 'use strict'
// Template version: 1.3.1 // Template version: 1.3.1
// see http://vuejs-templates.github.io/webpack for documentation. // see http://vuejs-templates.github.io/webpack for documentation.
const path = require('path') const path = require('path')
module.exports = {
dev: {
// Paths module.exports = {
assetsSubDirectory: 'static', dev: {
assetsPublicPath: '/', env: require('./dev.env'),
proxyTable: {}, // 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 // Various Dev Server settings
host: '127.0.0.1', // can be overwritten by process.env.HOST localhost 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 port: 8091, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: false, autoOpenBrowser: false,
errorOverlay: true, errorOverlay: true,
notifyOnErrors: true, notifyOnErrors: true,
poll: false, // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions- poll: false, // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions-
/** /**
* Source Maps * Source Maps
*/ */
// https://webpack.js.org/configuration/devtool/#development // https://webpack.js.org/configuration/devtool/#development
devtool: 'cheap-module-eval-source-map', devtool: 'cheap-module-eval-source-map',
// If you have problems debugging vue-files in devtools, // If you have problems debugging vue-files in devtools,
// set this to false - it *may* help // set this to false - it *may* help
// https://vue-loader.vuejs.org/en/options.html#cachebusting // https://vue-loader.vuejs.org/en/options.html#cachebusting
cacheBusting: true, cacheBusting: true,
cssSourceMap: true cssSourceMap: true
}, },
build: { build: {
// Template for index.html // Template for index.html
index: path.resolve(__dirname, '../dist/index.html'), index: path.resolve(__dirname, '../dist/index.html'),
// Paths // Paths
assetsRoot: path.resolve(__dirname, '../dist'), assetsRoot: path.resolve(__dirname, '../dist'),
assetsSubDirectory: 'static', assetsSubDirectory: 'static',
assetsPublicPath: './', assetsPublicPath: './',
/** /**
* Source Maps * Source Maps
*/ */
productionSourceMap: true, productionSourceMap: true,
// https://webpack.js.org/configuration/devtool/#production // https://webpack.js.org/configuration/devtool/#production
// devtool: '#source-map', // devtool: '#source-map',
// Gzip off by default as many popular static hosts such as // Gzip off by default as many popular static hosts such as
// Surge or Netlify already gzip all static assets for you. // Surge or Netlify already gzip all static assets for you.
// Before setting to `true`, make sure to: // Before setting to `true`, make sure to:
// npm install --save-dev compression-webpack-plugin // npm install --save-dev compression-webpack-plugin
productionGzip: true, productionGzip: true,
productionGzipExtensions: ['js', 'css'], productionGzipExtensions: ['js', 'css'],
// Run the build command with an extra argument to // Run the build command with an extra argument to
// View the bundle analyzer report after build finishes: // View the bundle analyzer report after build finishes:
// `npm run build --report` // `npm run build --report`
// Set to `true` or `false` to always turn it on or off // Set to `true` or `false` to always turn it on or off
bundleAnalyzerReport: process.env.npm_config_report bundleAnalyzerReport: process.env.npm_config_report
} }
} }

12
mallplusui-web-admin/src/api/order.js

@ -70,7 +70,8 @@ export function orderData(params) {
export function exportExcel(params) { export function exportExcel(params) {
return request({ return request({
url: '/base/v1/basevehicleout/exportExcel', baseURL: '/api',
url: '/oms/OmsOrder/exportExcel',
method: 'post', method: 'post',
responseType: 'blob', // 表明返回服务器返回的数据类型 responseType: 'blob', // 表明返回服务器返回的数据类型
data: params, data: params,
@ -79,3 +80,12 @@ export function exportExcel(params) {
} }
}) })
} }
// export function exportExcel(params) {
// return request({
// url: '/oms/OmsOrder/exportExcel',
// method: 'get',
// params: params
// })
// }

2
mallplusui-web-admin/src/api/orderStatistic.js

@ -85,7 +85,7 @@ export function orderData(params) {
export function exportExcel(params) { export function exportExcel(params) {
return request({ return request({
url: '/base/v1/basevehicleout/exportExcel', url: '/oms/OmsOrder/exportExcel2',
method: 'post', method: 'post',
responseType: 'blob', // 表明返回服务器返回的数据类型 responseType: 'blob', // 表明返回服务器返回的数据类型
data: params, data: params,

7
mallplusui-web-admin/src/main.js

@ -10,6 +10,13 @@ import VCharts from 'v-charts'
import '@/styles/index.scss' // global css import '@/styles/index.scss' // global css
import App from './App' 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 router from './router'
import store from './store' import store from './store'
// 全局自定义组件 // 全局自定义组件

93
mallplusui-web-admin/src/views/oms/order/index1.vue

@ -121,9 +121,14 @@
<el-card class="operate-container" shadow="never"> <el-card class="operate-container" shadow="never">
<i class="el-icon-tickets"></i> <i class="el-icon-tickets"></i>
<span>数据列表</span> <span>数据列表</span>
<el-button style="margin-top: -5px;" type="primary" class="btn-add" @click="doExport()" size="small"> <el-button style="margin-top: -5px;" type="primary" class="btn-add" @click="doExport()" size="small">
导出Excel 导出Excel
</el-button> </el-button>
<el-button v-show="status==0||status==2" style="margin-top: -5px;" type="primary" class="btn-add"
@click="doBatch()" size="small">
批量发货
</el-button>
</el-card> </el-card>
<!-- <div class="batch-operate-container"> <!-- <div class="batch-operate-container">
<el-checkbox v-model="printChecked" @change="batchSelection" <el-checkbox v-model="printChecked" @change="batchSelection"
@ -233,7 +238,8 @@
fetchList, fetchList,
closeOrder, closeOrder,
deleteOrder, deleteOrder,
orderData orderData,
exportExcel
} from '@/api/order'; } from '@/api/order';
import { import {
formatDate formatDate
@ -493,7 +499,37 @@
this.orderDatas(this.listQuery.status); this.orderDatas(this.listQuery.status);
}, },
handleSelectionChange(val) { handleSelectionChange(val) {
console.log("val》》》》》", val)
for (var i = 0; i < val.length; i++) {
if (val[i].status != 2) {
this.$message({
message: '请选择待发货状态的订单',
type: 'warning',
duration: 1000
});
let index = this.list.findIndex((item) => {
return item.id === val[i].id
})
console.log("index》》》》》", index)
//domnextTick
this.$refs.orderTable.toggleRowSelection(this.list[index], false);
return;
}
}
this.multipleSelection = val; this.multipleSelection = val;
}, },
handleViewOrder(index, row) { handleViewOrder(index, row) {
this.$router.push({ this.$router.push({
@ -729,9 +765,22 @@
default: default:
break; break;
} }
},
//
doBatch() {
}, },
// //
doExport() { doExport() {
if (this.list.length == 0) {
this.$message({
message: '暂无数据可导出!',
type: 'warning',
duration: 1000
});
return
}
// const loading = this.$loading({ // const loading = this.$loading({
// lock: true, // lock: true,
@ -739,24 +788,30 @@
// spinner: 'el-icon-loading', // spinner: 'el-icon-loading',
// background: 'rgba(0, 0, 0, 0.7)' // background: 'rgba(0, 0, 0, 0.7)'
// }) // })
// exportExcel(this.listQuery).then((resp) => { this.listQuery = {
// loading.close() status: 0,
// const blob = new Blob([resp], { orderSn: '00382',
// type: 'application/vnd.ms-excel' receiverPhone: '',
// }) createTimeStart: '',
// const fileName = '' + '.xls' createTimeEnd: ''
// const elink = document.createElement('a') }
// elink.download = fileName exportExcel(this.listQuery).then((resp) => {
// elink.style.display = 'nonde' // loading.close()
// elink.href = URL.createObjectURL(blob) const blob = new Blob([resp], {
// document.body.appendChild(elink) type: 'application/vnd.ms-excel;charset=utf-8'
// elink.click() })
// URL.revokeObjectURL(elink.href) const fileName = '订单列表' + '.xls'
// document.body.removeChild(elink) const elink = document.createElement('a')
// }).catch(() => { elink.download = fileName
// loading.close() elink.style.display = 'nonde'
// }) elink.href = URL.createObjectURL(blob)
document.body.appendChild(elink)
elink.click()
URL.revokeObjectURL(elink.href)
document.body.removeChild(elink)
}).catch(() => {
// loading.close()
})
}, },
handleExportOption(val) { handleExportOption(val) {

49
mallplusui-web-admin/src/views/oms/order/orderStatistic.vue

@ -193,7 +193,8 @@
fetchList, fetchList,
orderData, orderData,
getValueszd, getValueszd,
getValueqhd getValueqhd,
exportExcel
} from '@/api/orderStatistic'; } from '@/api/orderStatistic';
import { import {
formatDate formatDate
@ -400,29 +401,29 @@
// //
doExport() { doExport() {
// const loading = this.$loading({ const loading = this.$loading({
// lock: true, lock: true,
// text: 'Loading', text: 'Loading',
// spinner: 'el-icon-loading', spinner: 'el-icon-loading',
// background: 'rgba(0, 0, 0, 0.7)' background: 'rgba(0, 0, 0, 0.7)'
// }) })
// exportExcel(this.listQuery).then((resp) => { exportExcel(this.listQuery).then((resp) => {
// loading.close() loading.close()
// const blob = new Blob([resp], { const blob = new Blob([resp], {
// type: 'application/vnd.ms-excel' type: 'application/vnd.ms-excel'
// }) })
// const fileName = '' + '.xls' const fileName = '订单归集统计表' + '.xls'
// const elink = document.createElement('a') const elink = document.createElement('a')
// elink.download = fileName elink.download = fileName
// elink.style.display = 'nonde' elink.style.display = 'nonde'
// elink.href = URL.createObjectURL(blob) elink.href = URL.createObjectURL(blob)
// document.body.appendChild(elink) document.body.appendChild(elink)
// elink.click() elink.click()
// URL.revokeObjectURL(elink.href) URL.revokeObjectURL(elink.href)
// document.body.removeChild(elink) document.body.removeChild(elink)
// }).catch(() => { }).catch(() => {
// loading.close() loading.close()
// }) })
} }

Loading…
Cancel
Save