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

优化tao退款管理

This commit is contained in:
老齐 2024-06-20 09:07:49 +08:00
parent b279e919db
commit 90443ce3ec
9 changed files with 28 additions and 395 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
oms-api/src/main/java/com/qihang/oms/controller/RefundController.java
View File

@ -33,9 +33,8 @@ public class RefundController extends BaseController
private final KafkaTemplate<String,Object> kafkaTemplate;
/**
* 查询店铺订单列表
* 列表
*/
@PreAuthorize("@ss.hasPermi('shop:order:list')")
@GetMapping("/list")
public TableDataInfo list(ErpSaleAfterRefund bo, PageQuery pageQuery)
{

3
oms-api/src/main/java/com/qihang/oms/service/impl/ErpSaleAfterRefundServiceImpl.java
View File

@ -12,6 +12,7 @@ import com.qihang.oms.service.ErpSaleAfterRefundService;
import com.qihang.oms.mapper.ErpSaleAfterRefundMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
/**
* @author TW
@ -27,6 +28,8 @@ public class ErpSaleAfterRefundServiceImpl extends ServiceImpl<ErpSaleAfterRefun
public PageResult<ErpSaleAfterRefund> queryPageList(ErpSaleAfterRefund bo, PageQuery pageQuery) {
LambdaQueryWrapper<ErpSaleAfterRefund> queryWrapper = new LambdaQueryWrapper<ErpSaleAfterRefund>()
.eq(bo.getShopId()!=null,ErpSaleAfterRefund::getShopId,bo.getShopId())
.eq(StringUtils.hasText(bo.getRefundNum()),ErpSaleAfterRefund::getRefundNum,bo.getRefundNum())
.eq(StringUtils.hasText(bo.getOriginalOrderId()),ErpSaleAfterRefund::getOriginalOrderId,bo.getOriginalOrderId())
;
Page<ErpSaleAfterRefund> pages = mapper.selectPage(pageQuery.build(), queryWrapper);

2
open-api/tao-api/src/main/java/com/qihang/tao/domain/OmsTaoRefund.java
View File

@ -14,7 +14,7 @@ public class OmsTaoRefund implements Serializable {
/**
*
*/
private Long id;
private String id;
/**
* 退款id

2
vue/src/views/refund/pull/index.vue
View File

@ -20,7 +20,7 @@
</template>
<script>
import TaoRefund from "@/views/tao/refund/index";
import TaoRefund from "@/views/shop/tao/refund/index";
import JdRefund from "@/views/jd/refund/index";
import DouRefund from "@/views/dou/refund/index.vue";
import PddRefund from "@/views/pdd/refund/index.vue";

2
vue/src/views/refund/shopRefund/index.vue
View File

@ -19,7 +19,7 @@
</template>
<script>
import TaoRefund from "@/views/tao/refund/index";
import TaoRefund from "@/views/shop/tao/refund/index";
import JdRefund from "@/views/jd/refund/index";
import DouRefund from "@/views/dou/refund/index.vue";
import PddRefund from "@/views/pdd/refund/index.vue";

4
vue/src/views/sale/refund/index.vue
View File

@ -9,9 +9,9 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="原始订单号" prop="orderNum">
<el-form-item label="原始订单号" prop="originalOrderId">
<el-input
v-model="queryParams.orderNum"
v-model="queryParams.originalOrderId"
placeholder="请输入原始订单号"
clearable
@keyup.enter.native="handleQuery"

18
vue/src/views/shop/refund/index.vue
View File

@ -4,25 +4,27 @@
<el-tab-pane label="淘宝天猫" name="taoRefund">
<tao-refund></tao-refund>
</el-tab-pane>
<el-tab-pane label="京东" name="jdRefund" lazy>
<el-tab-pane label="京东POP" name="jdRefund" lazy>
<refund-jd></refund-jd>
</el-tab-pane>
<el-tab-pane label="拼多多" name="pddOrder" lazy>
<pdd-refund></pdd-refund>
</el-tab-pane>
<el-tab-pane label="抖店" name="douOrder" lazy>
<dou-refund></dou-refund>
</el-tab-pane>
<el-tab-pane label="视频号小店" name="weiRefund" lazy>
<refund-wei></refund-wei>
</el-tab-pane>
<!-- <el-tab-pane label="抖店" name="douOrder" lazy>-->
<!-- <dou-refund></dou-refund>-->
<!-- </el-tab-pane>-->
<!-- <el-tab-pane label="拼多多" name="pddOrder" lazy>-->
<!-- <pdd-refund></pdd-refund>-->
<!-- </el-tab-pane>-->
</el-tabs>
</div>
</template>
<script>
import TaoRefund from "@/views/tao/refund/index";
import TaoRefund from "@/views/shop/tao/refund/index";
import RefundJd from "@/views/jd/refund/index";
import RefundWei from "@/views/shop/wei/refund/index";
import DouRefund from "@/views/dou/refund/index.vue";

15
vue/src/views/tao/refund/index.vue → vue/src/views/shop/tao/refund/index.vue
View File

@ -57,7 +57,7 @@
<el-col :span="1.5">
<el-button
:loading="pullLoading"
type="danger"
type="success"
plain
icon="el-icon-download"
size="mini"
@ -72,7 +72,7 @@
size="mini"
:disabled="multiple"
@click="handlePushOms"
>手动将选中退款推送到OMS</el-button>
>手动推送退款</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@ -265,10 +265,13 @@ export default {
};
},
created() {
listShop({platform:1}).then(response => {
this.shopList = response.rows;
});
this.getList();
listShop({platform: 4}).then(response => {
this.shopList = response.rows;
if (this.shopList && this.shopList.length > 0) {
this.queryParams.shopId = this.shopList[0].id
}
this.getList();
});
},
methods: {
/** 查询淘宝退款订单列表 */

374
vue/src/views/tao/orderAddress/index.vue
View File

@ -1,374 +0,0 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="订单id" prop="orderId">
<el-input
v-model="queryParams.orderId"
placeholder="请输入订单id"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="${comment}" prop="contactPerson">
<el-input
v-model="queryParams.contactPerson"
placeholder="请输入${comment}"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="${comment}" prop="mobile">
<el-input
v-model="queryParams.mobile"
placeholder="请输入${comment}"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="${comment}" prop="province">
<el-input
v-model="queryParams.province"
placeholder="请输入${comment}"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="${comment}" prop="city">
<el-input
v-model="queryParams.city"
placeholder="请输入${comment}"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="${comment}" prop="area">
<el-input
v-model="queryParams.area"
placeholder="请输入${comment}"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="${comment}" prop="areaCode">
<el-input
v-model="queryParams.areaCode"
placeholder="请输入${comment}"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="${comment}" prop="town">
<el-input
v-model="queryParams.town"
placeholder="请输入${comment}"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="${comment}" prop="townCode">
<el-input
v-model="queryParams.townCode"
placeholder="请输入${comment}"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="${comment}" prop="address">
<el-input
v-model="queryParams.address"
placeholder="请输入${comment}"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['tao:orderAddress:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['tao:orderAddress:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['tao:orderAddress:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['tao:orderAddress:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="orderAddressList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="${comment}" align="center" prop="id" />
<el-table-column label="订单id" align="center" prop="orderId" />
<el-table-column label="${comment}" align="center" prop="contactPerson" />
<el-table-column label="${comment}" align="center" prop="mobile" />
<el-table-column label="${comment}" align="center" prop="province" />
<el-table-column label="${comment}" align="center" prop="city" />
<el-table-column label="${comment}" align="center" prop="area" />
<el-table-column label="${comment}" align="center" prop="areaCode" />
<el-table-column label="${comment}" align="center" prop="town" />
<el-table-column label="${comment}" align="center" prop="townCode" />
<el-table-column label="${comment}" align="center" prop="address" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['tao:orderAddress:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['tao:orderAddress:remove']"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改淘宝订单地址对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="订单id" prop="orderId">
<el-input v-model="form.orderId" placeholder="请输入订单id" />
</el-form-item>
<el-form-item label="${comment}" prop="contactPerson">
<el-input v-model="form.contactPerson" placeholder="请输入${comment}" />
</el-form-item>
<el-form-item label="${comment}" prop="mobile">
<el-input v-model="form.mobile" placeholder="请输入${comment}" />
</el-form-item>
<el-form-item label="${comment}" prop="province">
<el-input v-model="form.province" placeholder="请输入${comment}" />
</el-form-item>
<el-form-item label="${comment}" prop="city">
<el-input v-model="form.city" placeholder="请输入${comment}" />
</el-form-item>
<el-form-item label="${comment}" prop="area">
<el-input v-model="form.area" placeholder="请输入${comment}" />
</el-form-item>
<el-form-item label="${comment}" prop="areaCode">
<el-input v-model="form.areaCode" placeholder="请输入${comment}" />
</el-form-item>
<el-form-item label="${comment}" prop="town">
<el-input v-model="form.town" placeholder="请输入${comment}" />
</el-form-item>
<el-form-item label="${comment}" prop="townCode">
<el-input v-model="form.townCode" placeholder="请输入${comment}" />
</el-form-item>
<el-form-item label="${comment}" prop="address">
<el-input v-model="form.address" placeholder="请输入${comment}" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listOrderAddress, getOrderAddress, delOrderAddress, addOrderAddress, updateOrderAddress } from "@/api/tao/orderAddress";
export default {
name: "OrderAddress",
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 淘宝订单地址表格数据
orderAddressList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
orderId: null,
contactPerson: null,
mobile: null,
province: null,
city: null,
area: null,
areaCode: null,
town: null,
townCode: null,
address: null
},
// 表单参数
form: {},
// 表单校验
rules: {
orderId: [
{ required: true, message: "订单id不能为空", trigger: "blur" }
],
}
};
},
created() {
this.getList();
},
methods: {
/** 查询淘宝订单地址列表 */
getList() {
this.loading = true;
listOrderAddress(this.queryParams).then(response => {
this.orderAddressList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
id: null,
orderId: null,
contactPerson: null,
mobile: null,
province: null,
city: null,
area: null,
areaCode: null,
town: null,
townCode: null,
address: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加淘宝订单地址";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids
getOrderAddress(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改淘宝订单地址";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
updateOrderAddress(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addOrderAddress(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除淘宝订单地址编号为"' + ids + '"的数据项？').then(function() {
return delOrderAddress(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('tao/orderAddress/export', {
...this.queryParams
}, `orderAddress_${new Date().getTime()}.xlsx`)
}
}
};
</script>