Skip to content

C
chinafrica
提交 ffab217b authored 作者: luojie's avatar luojie
浏览文件
操作

订单修改完成度90%

上级 7d127a91
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 329 行增加 和 36 行删除
platform-admin/src/main/java/com/platform/controller/TbCfOrderController.java
浏览文件 @ ffab217b
...@@ -221,4 +221,14 @@ public class TbCfOrderController { ...@@ -221,4 +221,14 @@ public class TbCfOrderController {
orderBasicVo.setDeliveryOrderList(tbCfOrderListService.queryOrderDeliveryList(orderId)); orderBasicVo.setDeliveryOrderList(tbCfOrderListService.queryOrderDeliveryList(orderId));
return R.ok().put("orderBasicVo", orderBasicVo); return R.ok().put("orderBasicVo", orderBasicVo);
} }
/**
* 关闭订单
*/
@RequestMapping("/closeOrder")
@RequiresPermissions("tbcforder:closeOrder")
@ResponseBody
public R closeOrder(@RequestBody String orderId){
tbCfOrderListService.closeOrder(orderId);
return R.ok();
}
} }
platform-admin/src/main/java/com/platform/dao/TbCfOrderListDao.java
浏览文件 @ ffab217b
...@@ -34,4 +34,6 @@ public interface TbCfOrderListDao extends BaseDao<TbCfOrderListEntity> { ...@@ -34,4 +34,6 @@ public interface TbCfOrderListDao extends BaseDao<TbCfOrderListEntity> {
OrderBasicVo queryorderBasic(String orderId); OrderBasicVo queryorderBasic(String orderId);
int queryTotal(Map<String, Object> map); int queryTotal(Map<String, Object> map);
int closeOrder(String orderId);
} }
platform-admin/src/main/java/com/platform/service/TbCfOrderListService.java
浏览文件 @ ffab217b
...@@ -38,4 +38,6 @@ public interface TbCfOrderListService { ...@@ -38,4 +38,6 @@ public interface TbCfOrderListService {
OrderBasicVo queryorderBasic(String orderId); OrderBasicVo queryorderBasic(String orderId);
int queryTotal(Map<String, Object> map); int queryTotal(Map<String, Object> map);
int closeOrder(String orderId);
} }
platform-admin/src/main/java/com/platform/service/impl/TbCfOrderListServiceImpl.java
浏览文件 @ ffab217b
...@@ -52,4 +52,9 @@ public class TbCfOrderListServiceImpl implements TbCfOrderListService { ...@@ -52,4 +52,9 @@ public class TbCfOrderListServiceImpl implements TbCfOrderListService {
public int queryTotal(Map<String, Object> map) { public int queryTotal(Map<String, Object> map) {
return tbCfOrderListDao.queryTotal(map); return tbCfOrderListDao.queryTotal(map);
} }
@Override
public int closeOrder(String orderId) {
return tbCfOrderListDao.closeOrder(orderId);
}
} }
platform-admin/src/main/java/com/platform/vo/DeliveryOrderVo.java
浏览文件 @ ffab217b
...@@ -19,6 +19,33 @@ public class DeliveryOrderVo implements Serializable { ...@@ -19,6 +19,33 @@ public class DeliveryOrderVo implements Serializable {
private String sourceItemId; private String sourceItemId;
private Integer deliveryFlag; private Integer deliveryFlag;
private String pExpressNumber; private String pExpressNumber;
private String deliveryName;
private String deliveryPhone;
private String deliveryAddress;
public String getDeliveryName() {
return deliveryName;
}
public void setDeliveryName(String deliveryName) {
this.deliveryName = deliveryName;
}
public String getDeliveryPhone() {
return deliveryPhone;
}
public void setDeliveryPhone(String deliveryPhone) {
this.deliveryPhone = deliveryPhone;
}
public String getDeliveryAddress() {
return deliveryAddress;
}
public void setDeliveryAddress(String deliveryAddress) {
this.deliveryAddress = deliveryAddress;
}
public String getOrdersId() { public String getOrdersId() {
return ordersId; return ordersId;
......
platform-admin/src/main/resources/com/platform/dao/TbCfOrderListDao.xml
浏览文件 @ ffab217b
...@@ -112,7 +112,8 @@ ...@@ -112,7 +112,8 @@
<!--查询代购订单列表--> <!--查询代购订单列表-->
<select id="queryOrderDeliveryList" resultType="com.platform.vo.DeliveryOrderVo"> <select id="queryOrderDeliveryList" resultType="com.platform.vo.DeliveryOrderVo">
select
select
r.order_item_id ordersId, r.order_item_id ordersId,
r.order_id, r.order_id,
i.item_id, i.item_id,
...@@ -124,7 +125,10 @@ ...@@ -124,7 +125,10 @@
i.item_sku, i.item_sku,
i.source_item_id, i.source_item_id,
r.delivery_flag, r.delivery_flag,
p.p_express_number p.p_express_number,
o.delivery_name,
o.delivery_phone,
o.delivery_address
from tb_cf_item_order_r r from tb_cf_item_order_r r
LEFT JOIN tb_cf_order o on o.order_id=r.order_id LEFT JOIN tb_cf_order o on o.order_id=r.order_id
LEFT JOIN tb_cf_item_detail i on i.item_id = r.item_id LEFT JOIN tb_cf_item_detail i on i.item_id = r.item_id
...@@ -189,4 +193,9 @@ ...@@ -189,4 +193,9 @@
left join sys_user s on s.user_id=p.user_id left join sys_user s on s.user_id=p.user_id
WHERE 1=1 and f.pay_way_code!='null' WHERE 1=1 and f.pay_way_code!='null'
</select> </select>
<update id="closeOrder">
update tb_cf_order set order_status=60 where order_id=#{orderId}
</update>
</mapper> </mapper>
\ No newline at end of file
platform-admin/src/main/webapp/WEB-INF/page/sys/tbcforderlist.html
浏览文件 @ ffab217b
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
<html> <html>
<!--element-ui--> <!--element-ui-->
<link rel="stylesheet" href="${rc.contextPath}/statics/css/index.css"> <link rel="stylesheet" href="${rc.contextPath}/statics/css/index.css">
<link rel="stylesheet" type="text/css" href="${rc.contextPath}/statics/css/table.css"/>
<!--<link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">--> <!--<link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">-->
<head> <head>
<title></title> <title></title>
...@@ -50,18 +51,27 @@ ...@@ -50,18 +51,27 @@
} }
.table > thead > tr > th, .table > tbody > tr > th, .table > tfoot > tr > th, .table > thead > tr > td, .table > tbody > tr > td, .table > tfoot > tr > td { .table > thead > tr > th, .table > tbody > tr > th, .table > tfoot > tr > th, .table > thead > tr > td, .table > tbody > tr > td, .table > tfoot > tr > td {
border-top: 2px solid #e7eaec; border-top: 2px solid #e7eaec;
line-height: 0.85000; line-height: 0.7700;
padding: 13px; padding: 11px;
vertical-align: middle; vertical-align: middle;
} }
.table-responsive { .table-responsive {
min-height: .01%; min-height: .01%;
overflow-x: hidden; overflow-x: hidden;
} }
.table-bordered > thead > tr > th, .table-bordered > thead > tr > td {
background-color: moccasin;
border-bottom-width: 1px;
}
.ui-jqgrid .ui-jqgrid-htable .ui-th-div {
height: 17px;
margin-top: 5px;
display: contents;
}
</style> </style>
</head> </head>
<body> <body>
<div id="rrapp" v-cloak style="width:1680px; <div id="rrapp" v-cloak style="width:1700px;
height: -webkit-calc(100% - 15px); height: -webkit-calc(100% - 15px);
height: -moz-calc(100% - 15px); height: -moz-calc(100% - 15px);
height: calc(100% - 15px);"> height: calc(100% - 15px);">
...@@ -133,8 +143,7 @@ ...@@ -133,8 +143,7 @@
</div> </div>
<!--订单详情页 --> <!--订单详情页 -->
<div v-show="showOrderDesc":model="orderBasicVo" style="height: 100%;"> <div v-show="showOrderDesc":model="orderBasicVo" style="height: 100%;">
<i-Button type="primary" @click="reloadOrder" style="margin-bottom: 10px;">返回</i-Button> <br/>
<Steps :current="basicOrderStatus" > <Steps :current="basicOrderStatus" >
<Step title="买家下单" ></Step> <Step title="买家下单" ></Step>
<Step title="买家付款"></Step> <Step title="买家付款"></Step>
...@@ -143,21 +152,80 @@ ...@@ -143,21 +152,80 @@
<Step title="评论"></Step> <Step title="评论"></Step>
</Steps> </Steps>
<section class="order-time"> <section class="order-time">
<h5>下单时间</h5> <br/>
<p :data="basicData"> {{basicData}}</p> <h5 style="margin-left: 20px">下单时间：</h5>
<div style="margin-left: 80px;font-size: 18px">
<p :data="basicData"> {{basicData}}</p>
</div>
<div align="right" style="border: whitesmoke">
<i-Button type="primary" @click="reloadOrder" style="margin-bottom: 10px;">返回</i-Button>
</div>
<Col span="11"> <Col span="11">
<Card> <!-- 等待付款-->
<Card v-show="waitPay">
<div slot="title">
<div class="card-title" >
<span>当前订单状态：买家已下单，等待付款</span>
<div >
<i-Button size="small" type="warning">关闭交易</i-Button>
<i-Button size="small" type="info">备注订单</i-Button>
</div>
</div>
</div>
<p>买家可以在24h之内支付订单，否则系统将自动关闭订单。如果商品被恶意拍下，您可以后台取消订单哟~ </p>
</Card>
<!--已付款等待发货 -->
<Card v-show="waitShip">
<div slot="title"> <div slot="title">
<div class="card-title"> <div class="card-title" >
<span>当前订单状态：商品已拍下，等待买家付款</span> <span>当前订单状态：订单已付款,等待发货</span>
<div> <div >
<i-Button size="small" type="primary" @click="showAgent(orderBasicVo.ordersId)">订单发货</i-Button> <i-Button size="small" type="primary" @click="showAgent(orderBasicVo.ordersId)">订单发货</i-Button>
<i-Button size="small" type="warning">关闭交易</i-Button> <i-Button size="small" type="warning">关闭交易</i-Button>
<i-Button size="small" type="info">备注订单</i-Button> <i-Button size="small" type="info">备注订单</i-Button>
</div> </div>
</div> </div>
</div> </div>
<p>买家还有23小时59分00秒支付订单，否则系统将自动关闭订单。如果商品被恶意拍下，您可以后台取消订单哟~ </p> <td><p>订单已付款,请尽快处理~</p></td>
<td><p>只有当订单中的子订单全部发货才会跳到下一步哦~</p></td>
</Card>
<!--订单已发货 -->
<Card v-show="sendShip">
<div slot="title">
<div class="card-title" >
<span>当前订单状态：订单已全部发货</span>
<div >
<i-Button size="small" type="warning">关闭交易</i-Button>
<i-Button size="small" type="info">备注订单</i-Button>
</div>
</div>
</div>
<p>订单已全部发货,工作人员记得跟踪一下哦~</p>
</Card>
<Card v-show="tranSuccessful">
<div slot="title">
<div class="card-title" >
<span>当前订单状态：订单交易成功！</span>
<div >
<i-Button size="small" type="warning">关闭交易</i-Button>
<i-Button size="small" type="info">备注订单</i-Button>
</div>
</div>
</div>
<p>订单已交易成功~</p>
</Card>
<Card v-show="orderClose">
<div slot="title">
<div class="card-title" >
<span>当前订单状态：订单交易关闭</span>
<div >
<i-Button size="small" type="warning">删除订单</i-Button>
<i-Button size="small" type="info">备注订单</i-Button>
</div>
</div>
</div>
<p>订单已关闭,仅可查看详情或删除订单~</p>
</Card> </Card>
</Col> </Col>
</section> </section>
...@@ -184,9 +252,25 @@ ...@@ -184,9 +252,25 @@
</div> </div>
<!--子订单列表(代购) --> <!--子订单列表(代购) -->
<div v-show="showLists" style="height: 100%;"> <div v-show="showLists" style="height: 100%;">
<table id="showLists" width="1680px" height="20px" border="2px"> <p style="margin-left: 10px;font-size: 15px">收件人信息：</p>
<table class="table" id ="tableId" style="align:center" >
<thread>
<tr style="background-color: mistyrose">
<th>收件人</th>
<th>收件人手机</th>
<th>收件人地址</th>
</tr>
</thread>
<tr align="center">
<td>{{deliveryName}}</td>
<td>{{deliveryPhone}}</td>
<td>{{deliveryAddress}}</td>
</tr>
</table>
<p style="margin-left: 10px;font-size: 15px">子订单信息：</p>
<table class="table" id="showLists" width="1680px" >
<thread> <thread>
<tr > <tr style="background-color: mistyrose">
<th>订单唯一ID</th> <th>订单唯一ID</th>
<th>订单编号</th> <th>订单编号</th>
<th>商品名称</th> <th>商品名称</th>
...@@ -211,7 +295,7 @@ ...@@ -211,7 +295,7 @@
<td>$ {{item.itemPrice}}</td> <td>$ {{item.itemPrice}}</td>
<td>{{item.itemNum}}</td> <td>{{item.itemNum}}</td>
<td> <td>
<span style="color:green;cursor: pointer;" @click="toProductLink(item.sourceItemId)">商品链接</span> <span style="color:blue;cursor: pointer;" @click="toProductLink(item.sourceItemId)">商品链接</span>
</td> </td>
<td>{{item.deliveryFlag}}</td> <td>{{item.deliveryFlag}}</td>
<td>{{item.pExpressNumber}}</td> <td>{{item.pExpressNumber}}</td>
......
platform-admin/src/main/webapp/js/common.js
浏览文件 @ ffab217b
...@@ -139,11 +139,7 @@ function eyeImages(data) { ...@@ -139,11 +139,7 @@ function eyeImages(data) {
* @param name * @param name
*/ */
function handleResetForm(vue, name) { function handleResetForm(vue, name) {
if( vue.$refs[name].resetFields()=='undefined'){
console.log(error)
}else{
vue.$refs[name].resetFields(); vue.$refs[name].resetFields();
}
}; };
......
platform-admin/src/main/webapp/statics/css/table.css 0 → 100644
浏览文件 @ ffab217b
/*表格样式。*/
.table {
width:100%;
padding: 0px;
margin: 0px;
font-family:Arial, Tahoma, Verdana, Sans-Serif,宋体;
border-left:1px solid #ADD8E6;
border-collapse:collapse;
}
/*表头样式。*/
.table th {
font-size:15px;
font-weight:600;
color: #303030;
border-right: 1px solid #ADD8E6;
border-bottom: 1px solid #ADD8E6;
border-top: 1px solid #ADD8E6;
letter-spacing: 2px;
text-align: left;
padding: 10px 0px 10px 0px;
white-space:nowrap;
text-align:center;
overflow: hidden;
}
/*单元格样式。*/
.table td {
border-right: 1px solid #ADD8E6;
border-bottom: 1px solid #ADD8E6;
background: #fff;
font-size:15px;
padding: 3px 3px 3px 6px;
color: #303030;
word-break:break-all;
word-wrap:break-word;
white-space:normal;
}
/*蓝色单元格样式，主要用于隔行变色。*/
.table td.color{
background:#edf7f9;
}
/*表格中超级链接样式。*/
.table td a:link{
font-weight:400 ;
color:#2259D7 ;
text-decoration:none ;
word-break:break-all;
word-wrap:break-word;
white-space:normal;
}
.table td a:visited {
font-weight:400 ;
color:#2259D7 ;
text-decoration:none ;
word-break:break-all;
word-wrap:break-word;
white-space:normal;
}
.table td a:hover {
font-weight:400 ;
text-decoration:underline ;
color: #303030;
word-break:break-all;
word-wrap:break-word;
white-space:normal;
}
.table td a:active {
font-weight:400 ;
text-decoration:none ;
color:#2259D7 ;
word-break:break-all;
word-wrap:break-word;
white-space:normal;
}
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论