Skip to content

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

订单详情，数据插入

上级 c3c39e7e
显示空白字符变更
内嵌 并排
正在显示 包含 109 行增加 和 28 行删除
platform-admin/src/main/java/com/platform/vo/DeliveryOrderVo.java
浏览文件 @ 7d127a91
package com.platform.vo;
import io.swagger.models.auth.In;
import java.io.Serializable;
import java.math.BigDecimal;
......@@ -11,7 +13,7 @@ public class DeliveryOrderVo implements Serializable {
private Long orderNo;
private String itemImg;
private String itemTitle;
private String itemNum;
private Long itemNum;
private BigDecimal itemPrice;
private String itemSku;
private String sourceItemId;
......@@ -67,11 +69,11 @@ public class DeliveryOrderVo implements Serializable {
this.itemTitle = itemTitle;
}
public String getItemNum() {
public Long getItemNum() {
return itemNum;
}
public void setItemNum(String itemNum) {
public void setItemNum(Long itemNum) {
this.itemNum = itemNum;
}
......
platform-admin/src/main/java/com/platform/vo/OrderBasicVo.java
浏览文件 @ 7d127a91
......@@ -21,13 +21,40 @@ public class OrderBasicVo implements Serializable {
private String deliveryAddress;
private List<DeliveryOrderVo> deliveryOrderList;
private BigDecimal itemPrice;
private BigDecimal itemTotalPrice;
private BigDecimal expressCost;
private BigDecimal tax;
private BigDecimal fee;
private String couponId;
private BigDecimal realityPay;
private Date orderTime;
private Integer orderStatus;
public Integer getOrderStatus() {
return orderStatus;
}
public void setOrderStatus(Integer orderStatus) {
this.orderStatus = orderStatus;
}
public Date getOrderTime() {
return orderTime;
}
public void setOrderTime(Date orderTime) {
this.orderTime = orderTime;
}
public BigDecimal getItemTotalPrice() {
return itemTotalPrice;
}
public void setItemTotalPrice(BigDecimal itemTotalPrice) {
this.itemTotalPrice = itemTotalPrice;
}
public String getOrderId() {
return orderId;
}
......
platform-admin/src/main/resources/com/platform/dao/TbCfOrderListDao.xml
浏览文件 @ 7d127a91
......@@ -160,7 +160,9 @@
o.tax,
o.fee,
c.coupon_id,
o.reality_pay
o.reality_pay,
o.order_time,
o.order_status
from tb_cf_order o
LEFT JOIN tb_cf_finance f on f.order_id=o.order_id
LEFT JOIN tb_cf_coupon c on c.coupon_id=o.coupon_id
......
platform-admin/src/main/webapp/WEB-INF/page/sys/tbcforderlist.html
浏览文件 @ 7d127a91
......@@ -132,9 +132,10 @@
<div id="speedp"></div>
</div>
<!--订单详情页 -->
<div v-show="showOrderDesc" style="height: 100%;">
<div v-show="showOrderDesc":model="orderBasicVo" style="height: 100%;">
<i-Button type="primary" @click="reloadOrder" style="margin-bottom: 10px;">返回</i-Button>
<Steps :current="2" >
<Steps :current="basicOrderStatus" >
<Step title="买家下单" ></Step>
<Step title="买家付款"></Step>
<Step title="发货"></Step>
......@@ -143,14 +144,14 @@
</Steps>
<section class="order-time">
<h5>下单时间</h5>
<p>2019年12月26日 </p>
<p :data="basicData"> {{basicData}}</p>
<Col span="11">
<Card>
<div slot="title">
<div class="card-title">
<span>当前订单状态：商品已拍下，等待买家付款</span>
<div>
<i-Button size="small" type="primary">订单发货</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="info">备注订单</i-Button>
</div>
......@@ -176,10 +177,10 @@
<h4>费用信息</h4>
<i-Table :columns="costColumns" :data="costData"></i-Table>
</section>
<section class="order-recipients-information">
<!-- <section class="order-recipients-information">
<h4>操作日志</h4>
<i-Table :columns="operationColumns" :data="operationData"></i-Table>
</section>
</section>-->
</div>
<!--子订单列表(代购) -->
<div v-show="showLists" style="height: 100%;">
......
platform-admin/src/main/webapp/js/sys/tbcforderList.js
浏览文件 @ 7d127a91
......@@ -25,13 +25,13 @@ $(function () {
if(grid.colModel.formatter.arguments[2].orderStatus==10){
return '<button style="color: black;background-color: lightskyblue" class="orderdescbutton">&nbsp;查看订单</button>&nbsp;&nbsp;|&nbsp;&nbsp;<button style="color: red" οnclick="showAgent">关闭订单</button>';
}else if(grid.colModel.formatter.arguments[2].orderStatus==20){
return '<button style="color: black;background-color: lightskyblue" class="diybutton">&nbsp;查看订单</button>&nbsp;&nbsp;|&nbsp;&nbsp;<button class="diybutton" style="color: blue ">订单发货</button>';
return '<button style="color: black;background-color: lightskyblue" class="orderdescbutton">&nbsp;查看订单</button>&nbsp;&nbsp;|&nbsp;&nbsp;<button class="diybutton" style="color: blue ">订单发货</button>';
}else if(grid.colModel.formatter.arguments[2].orderStatus==40){
return '<button style="color: black;background-color: lightskyblue" class="diybutton">&nbsp;查看订单</button>&nbsp;&nbsp;|&nbsp;&nbsp;<button @click="showAgent" style="color: forestgreen" οnclick="modify(\''+ grid.colModel.formatter.arguments[2].ordersId+ '\');">订单追踪</button>';
return '<button style="color: black;background-color: lightskyblue" class="orderdescbutton">&nbsp;查看订单</button>&nbsp;&nbsp;|&nbsp;&nbsp;<button @click="showAgent" style="color: forestgreen" οnclick="modify(\''+ grid.colModel.formatter.arguments[2].ordersId+ '\');">订单追踪</button>';
}else if(grid.colModel.formatter.arguments[2].orderStatus==50){
return '<button style="color: black;background-color: lightskyblue" class="diybutton">&nbsp;查看订单</button>&nbsp;&nbsp;|&nbsp;&nbsp;<button @click="showAgent" style="color:forestgreen οnclick="modify(\''+ rows.id+ '\');">订单追踪</button>';
return '<button style="color: black;background-color: lightskyblue" class="orderdescbutton">&nbsp;查看订单</button>&nbsp;&nbsp;|&nbsp;&nbsp;<button @click="showAgent" style="color:forestgreen οnclick="modify(\''+ rows.id+ '\');">订单追踪</button>';
}else if(grid.colModel.formatter.arguments[2].orderStatus==60){
return '<button style="color: black;background-color: lightskyblue" class="diybutton">&nbsp;查看订单</button>&nbsp;&nbsp;|&nbsp;&nbsp;<button class="delbutton" style="color: red" >删除订单</button>';
return '<button style="color: black;background-color: lightskyblue" class="orderdescbutton">&nbsp;查看订单</button>&nbsp;&nbsp;|&nbsp;&nbsp;<button class="delbutton" style="color: red" >删除订单</button>';
}
}
}
......@@ -74,8 +74,6 @@ $(function () {
})
//'waitpaybutton' 等待支付的订单详情
$('#jqGrid').on('click','.orderdescbutton',e=>{
//获取订单ID及订单状态
let orderStatus
$(e.target).parent().siblings().each((index,item)=>{
......@@ -229,7 +227,8 @@ let vm = new Vue({
value: '',
//支付方式集合
payWayCodeList: [],
basicData:[],
basicOrderStatus:[],
//订单基本信息
basicInfoColumns: [
{
......@@ -242,6 +241,10 @@ let vm = new Vue({
}
],
basicInfoData: [
{
type: '订单编号',
data: 18
},
{
type: '用户名称',
data: 18
......@@ -285,7 +288,7 @@ let vm = new Vue({
],
recipientsData: [
{
recipients: '用户名称',
recipients: '12345',
phone: '12314',
email: '123124',
address: '124124'
......@@ -293,8 +296,8 @@ let vm = new Vue({
],
logisticsColumns: [
{
title: '订单独立id',
key: 'orderid'
title: '子订单id',
key: 'ordersid'
},
{
title: '订单编号',
......@@ -322,7 +325,7 @@ let vm = new Vue({
},
{
title: '代购状态',
key: 'orderstatus'
key: 'deliveryflag'
},
{
title: '物流单号',
......@@ -331,14 +334,14 @@ let vm = new Vue({
],
logisticsData: [
{
orderid: '用户名称',
ordersid: '用户名称',
orderno: '12314',
img: '123124',
name: '124124',
num: '124124',
price: '124124',
link: '124124',
orderstatus: '124124',
deliveryflag:'12121',
logisticno: '124124',
}
],
......@@ -370,7 +373,7 @@ let vm = new Vue({
constnum: 1,
}, {
costtype: '现金券',
constnum: 1,
constnum: '无',
}, {
costtype: '优惠活动',
constnum: 1,
......@@ -379,7 +382,7 @@ let vm = new Vue({
constnum: 1,
},
],
operationColumns: [
/* operationColumns: [
{
title: '操作者',
key: 'operationname'
......@@ -414,7 +417,8 @@ let vm = new Vue({
DeliverStatus: '1',
remark: '1',
}
],
],*/
orderBasicVo:{},
},
methods: {
......@@ -571,8 +575,53 @@ let vm = new Vue({
url: "../tbcforder/orderBasic/" + orderId,
async: true,
successCallback: function (r) {
console.log(r)
vm.basicInfoData[0].data=r.orderBasicVo.userName
console.log(r.orderBasicVo)
vm.basicData=r.orderBasicVo.orderTime;
if(r.orderBasicVo.orderStatus==10){
vm.basicOrderStatus=0;
} else if(r.orderBasicVo.orderStatus==20){
vm.basicOrderStatus=1;
}else if(r.orderBasicVo.orderStatus==40){
vm.basicOrderStatus=2;
}else if(r.orderBasicVo.orderStatus==50){
vm.basicOrderStatus=3;
}else if(r.orderBasicVo.orderStatus==60){
vm.basicOrderStatus=4;
}
vm.basicInfoData[0].data=r.orderBasicVo.orderNo;
vm.basicInfoData[1].data=r.orderBasicVo.userName;
vm.basicInfoData[2].data=r.orderBasicVo.atcTime;
vm.basicInfoData[3].data=r.orderBasicVo.source;
vm.basicInfoData[4].data=r.orderBasicVo.country;
vm.basicInfoData[5].data=r.orderBasicVo.payId;
vm.basicInfoData[6].data=r.orderBasicVo.payWayCode;
vm.basicInfoData[7].data=r.orderBasicVo.couponTitle;
vm.recipientsData[0].recipients=r.orderBasicVo.deliveryName;
vm.recipientsData[0].phone=r.orderBasicVo.deliveryPhone
vm.recipientsData[0].email=r.orderBasicVo.email;
vm.recipientsData[0].address=r.orderBasicVo.deliveryAddress;
vm.logisticsData = []
r.orderBasicVo.deliveryOrderList.map(item=>{
vm.logisticsData.push({
ordersid: item.orderId,
orderno: item.orderNo,
img: item.itemImg ,
name: item.itemName,
num: item.itemNum,
price: item.itemPrice ,
sku: item.itemSku,
link: item.sourceItemId,
deliveryflag: item.deliveryFlag,
logisticno: item.pExpressNumber,
})
})
vm.costData[0].constnum=r.orderBasicVo.realityPay;
vm.costData[1].constnum=r.orderBasicVo.expressCost;
vm.costData[2].constnum=r.orderBasicVo.tax;
vm.costData[3].constnum=r.orderBasicVo.fee;
vm.costData[4].constnum=r.orderBasicVo.couponId;
vm.costData[6].constnum=r.orderBasicVo.couponTitle;
vm.costData[7].constnum=r.orderBasicVo.realityPay;
}
});
},
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论