huangyujie
/
qihang-ecom-erp-open
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化tao订单

This commit is contained in:
启航 2026-01-26 09:38:00 +08:00
parent 5c35a114ae
commit 0c191559b1
2 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
service/src/main/java/cn/qihangerp/module/service/impl/TaoOrderServiceImpl.java
View File

@ -62,16 +62,20 @@ public class TaoOrderServiceImpl extends ServiceImpl<TaoOrderMapper, TaoOrder>
if(StringUtils.hasText(bo.getStartTime())){ if(StringUtils.hasText(bo.getStartTime())){
Matcher matcher = DATE_FORMAT.matcher(bo.getStartTime()); Matcher matcher = DATE_FORMAT.matcher(bo.getStartTime());
boolean b = matcher.find(); boolean b = matcher.find();
if(b){ if(!b){
bo.setStartTime(bo.getStartTime()+" 00:00:00"); // bo.setStartTime(bo.getStartTime()+" 00:00:00");
bo.setStartTime("");
} }
} }
if(StringUtils.hasText(bo.getEndTime())){ if(StringUtils.hasText(bo.getEndTime())){
Matcher matcher = DATE_FORMAT.matcher(bo.getEndTime()); Matcher matcher = DATE_FORMAT.matcher(bo.getEndTime());
boolean b = matcher.find(); boolean b = matcher.find();
if(b){ if(!b){
bo.setEndTime(bo.getEndTime()+" 23:59:59"); // bo.setEndTime(bo.getEndTime()+" 23:59:59");
bo.setEndTime("");
} }
}else{
bo.setEndTime(bo.getStartTime());
} }
LambdaQueryWrapper<TaoOrder> queryWrapper = new LambdaQueryWrapper<TaoOrder>() LambdaQueryWrapper<TaoOrder> queryWrapper = new LambdaQueryWrapper<TaoOrder>()

29
vue/src/views/tao/order/index.vue
View File

@ -19,13 +19,10 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="下单时间" prop="orderTime"> <el-form-item label="下单时间" prop="startTime">
<el-date-picker clearable <el-date-picker clearable @change="handleQuery"
v-model="orderTime" value-format="yyyy-MM-dd" v-model="queryParams.startTime" value-format="yyyy-MM-dd"
type="daterange" type="date" placeholder="下单时间">
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<!-- <el-form-item label="下单日期" prop="orderCreateTime">--> <!-- <el-form-item label="下单日期" prop="orderCreateTime">-->
@ -419,8 +416,11 @@ export default {
this.queryParams.startTime = this.orderTime[0] this.queryParams.startTime = this.orderTime[0]
this.queryParams.endTime = this.orderTime[1] this.queryParams.endTime = this.orderTime[1]
}else { }else {
this.queryParams.startTime = null if(!this.queryParams.startTime){
this.queryParams.endTime = null this.queryParams.startTime = null
this.queryParams.endTime = null
}
} }
this.loading = true; this.loading = true;
listOrder(this.queryParams).then(response => { listOrder(this.queryParams).then(response => {
@ -475,17 +475,16 @@ export default {
} }
}, },
handlePull() { handlePull() {
if (!this.orderTime) { if (!this.queryParams.startTime) {
this.$modal.msgError("请选择订单时间") this.$modal.msgError("请选择订单下单时间")
return return
} }
if (!this.queryParams.shopId) { if (!this.queryParams.shopId) {
this.$modal.msgSuccess("请先选择店铺"); this.$modal.msgSuccess("请先选择店铺");
return; return;
} }
const orderDate = this.orderTime[0]
this.pullLoading = true this.pullLoading = true
pullOrder({shopId: this.queryParams.shopId, updType: 0, orderDate: orderDate}).then(response => { pullOrder({shopId: this.queryParams.shopId, updType: 0, startTime: this.queryParams.startTime}).then(response => {
console.log('拉取淘宝订单接口返回=====', response) console.log('拉取淘宝订单接口返回=====', response)
if (response.code === 1401) { if (response.code === 1401) {
MessageBox.confirm('Token已过期，需要重新授权！请前往店铺列表重新获取授权！', '系统提示', { MessageBox.confirm('Token已过期，需要重新授权！请前往店铺列表重新获取授权！', '系统提示', {
@ -503,9 +502,11 @@ export default {
}); });
// return Promise.reject('无效的会话，或者会话已过期，请重新登录。') // return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
} else { } if(response.code === 200){
this.$modal.msgSuccess(JSON.stringify(response)); this.$modal.msgSuccess(JSON.stringify(response));
this.getList() this.getList()
}else{
this.$modal.msgError(response.msg)
} }
this.pullLoading = false this.pullLoading = false
}) })