other_project/mallplus
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
wangpengfei
2023-03-27 18:16:58 +08:00
parent 48cc9d9483 314f499dfd
commit 75a7a53ef5
10 changed files with 210 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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<OrderExcelVo> 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<OrderExcelVo> excelVos = IOmsOrderService.listExcel2(omsOrderLocationQuery);
//定义导出的excel名字

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

@@ -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);
}
}

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

@@ -386,20 +386,20 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
public List<OrderExcelVo> listExcel(OmsOrderQuery omsOrderQuery) {
QueryWrapper<OmsOrder> 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<OrderExcelVo> 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<OmsOrderMapper, OmsOrder> i
public List<OrderExcelVo> listExcel2(OmsOrderLocationQuery omsOrderLocationQuery) {
QueryWrapper<OmsOrder> 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<OrderExcelVo> 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;
}

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

@@ -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"'
})

123
mallplusui-web-admin/config/index.js
View File

@@ -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')
module.exports = {
dev: {
// Paths
assetsSubDirectory: 'static',
assetsPublicPath: '/',
proxyTable: {},
// 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-
const path = require('path')
/**
* Source Maps
*/
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': ''
}
}
},
// https://webpack.js.org/configuration/devtool/#development
devtool: 'cheap-module-eval-source-map',
// 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-
// 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
},
/**
* Source Maps
*/
build: {
// Template for index.html
index: path.resolve(__dirname, '../dist/index.html'),
// https://webpack.js.org/configuration/devtool/#development
devtool: 'cheap-module-eval-source-map',
// Paths
assetsRoot: path.resolve(__dirname, '../dist'),
assetsSubDirectory: 'static',
assetsPublicPath: './',
// 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,
/**
* Source Maps
*/
cssSourceMap: true
},
productionSourceMap: true,
// https://webpack.js.org/configuration/devtool/#production
// devtool: '#source-map',
build: {
// Template for index.html
index: path.resolve(__dirname, '../dist/index.html'),
// 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'],
// Paths
assetsRoot: path.resolve(__dirname, '../dist'),
assetsSubDirectory: 'static',
assetsPublicPath: './',
// 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
}
}
/**
* Source Maps
*/
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'],
// 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
}
}

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

@@ -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,
@@ -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
View File

@@ -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,

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

@@ -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'
// 全局自定义组件

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

@@ -121,9 +121,14 @@
<el-card class="operate-container" shadow="never">
<i class="el-icon-tickets"></i>
<span>数据列表</span>
<el-button style="margin-top: -5px;" type="primary" class="btn-add" @click="doExport()" size="small">
导出Excel
</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>
<!-- <div class="batch-operate-container">
<el-checkbox v-model="printChecked" @change="batchSelection"
@@ -233,7 +238,8 @@
fetchList,
closeOrder,
deleteOrder,
orderData
orderData,
exportExcel
} from '@/api/order';
import {
formatDate
@@ -493,7 +499,37 @@
this.orderDatas(this.listQuery.status);
},
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)
//dom更新完才执行nextTick回调
this.$refs.orderTable.toggleRowSelection(this.list[index], false);
return;
}
}
this.multipleSelection = val;
},
handleViewOrder(index, row) {
this.$router.push({
@@ -729,9 +765,22 @@
default:
break;
}
},
// 批量发货
doBatch() {
},
// 导出
doExport() {
if (this.list.length == 0) {
this.$message({
message: '暂无数据可导出！',
type: 'warning',
duration: 1000
});
return
}
// const loading = this.$loading({
// lock: true,
@@ -739,24 +788,30 @@
// spinner: 'el-icon-loading',
// background: 'rgba(0, 0, 0, 0.7)'
// })
// exportExcel(this.listQuery).then((resp) => {
// loading.close()
// const blob = new Blob([resp], {
// type: 'application/vnd.ms-excel'
// })
// const fileName = '订单列表' + '.xls'
// const elink = document.createElement('a')
// elink.download = fileName
// 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()
// })
this.listQuery = {
status: 0,
orderSn: '00382',
receiverPhone: '',
createTimeStart: '',
createTimeEnd: ''
}
exportExcel(this.listQuery).then((resp) => {
// loading.close()
const blob = new Blob([resp], {
type: 'application/vnd.ms-excel;charset=utf-8'
})
const fileName = '订单列表' + '.xls'
const elink = document.createElement('a')
elink.download = fileName
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) {

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

@@ -193,7 +193,8 @@
fetchList,
orderData,
getValueszd,
getValueqhd
getValueqhd,
exportExcel
} from '@/api/orderStatistic';
import {
formatDate
@@ -400,29 +401,29 @@
// 导出
doExport() {
// const loading = this.$loading({
// lock: true,
// text: 'Loading',
// spinner: 'el-icon-loading',
// background: 'rgba(0, 0, 0, 0.7)'
// })
// exportExcel(this.listQuery).then((resp) => {
// loading.close()
// const blob = new Blob([resp], {
// type: 'application/vnd.ms-excel'
// })
// const fileName = '订单归集统计表' + '.xls'
// const elink = document.createElement('a')
// elink.download = fileName
// 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()
// })
const loading = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
exportExcel(this.listQuery).then((resp) => {
loading.close()
const blob = new Blob([resp], {
type: 'application/vnd.ms-excel'
})
const fileName = '订单归集统计表' + '.xls'
const elink = document.createElement('a')
elink.download = fileName
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()
})
}