ufo / ufo-platform · Commits

Go to a project

Authored by qinchao
Commit 91f42107e8490c0b286b3641a1f474efd1f39d96 1 parent 3f833d86

add：订单状态拆分功能

Inline Side-by-side
Showing 4 changed files with 334 additions and 233 deletions
... ... @@ -27,12 +27,21 @@ public class BuyerOrderReq extends PageRequestBO{
private Integer sellerUid;
private String sellerWaybillCode;
//平台给客户的物流单号
private String platformWaybillCode;
private Integer productId;
private Integer storageId;
private String mobile;
//买家手机号
private String buyerMobile;
//卖家手机号
private String sellerMobile;
private Integer skup;
... ...
... ... @@ -88,6 +88,9 @@
<if test="buyerOrderReq.uid != null and buyerOrderReq.uid != 0 ">
and a.uid = #{buyerOrderReq.uid}
</if>
<if test="buyerOrderReq.sellerUid != null and buyerOrderReq.sellerUid != 0 ">
and a.seller_uid = #{buyerOrderReq.sellerUid}
</if>
<if test="buyerOrderReq.status != null ">
and a.status = #{buyerOrderReq.status}
</if>
... ... @@ -103,6 +106,15 @@
<if test="buyerOrderReq.mobile != null and buyerOrderReq.mobile != '' ">
and (a.uid = #{buyerOrderReq.sellerUid} or a.seller_uid = #{buyerOrderReq.sellerUid})
</if>
<if test="buyerOrderReq.buyerMobile != null and buyerOrderReq.buyerMobile != '' ">
and a.uid = #{buyerOrderReq.uid}
</if>
<if test="buyerOrderReq.sellerMobile != null and buyerOrderReq.sellerMobile != '' ">
and a.seller_uid = #{buyerOrderReq.sellerUid}
</if>
<if test="buyerOrderReq.platformWaybillCode != null and buyerOrderReq.platformWaybillCode != '' ">
and d2.waybill_code = #{buyerOrderReq.platformWaybillCode} and d2.express_type in (2,3,4)
</if>
<if test="buyerOrderReq.sellerWaybillCode != null and buyerOrderReq.sellerWaybillCode != '' ">
and d.waybill_code = #{buyerOrderReq.sellerWaybillCode} and d.express_type=1
</if>
... ... @@ -131,6 +143,10 @@
LEFT JOIN express_record d
ON(a.order_code=d.order_code)
</if>
<if test="buyerOrderReq.platformWaybillCode != null and buyerOrderReq.platformWaybillCode != ''">
LEFT JOIN express_record d2
ON(a.order_code=d2.order_code)
</if>
where 1=1
<include refid="Query_Order_Sql" />
</select>
... ... @@ -148,6 +164,10 @@
LEFT JOIN express_record d
ON(a.order_code=d.order_code)
</if>
<if test="buyerOrderReq.platformWaybillCode != null and buyerOrderReq.platformWaybillCode != ''">
LEFT JOIN express_record d2
ON(a.order_code=d2.order_code)
</if>
where 1=1
<include refid="Query_Order_Sql" />
order by a.create_time desc
... ...
... ... @@ -346,7 +346,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
//确认收货：调用前端接口，前端接口会更新状态的，不用更新状态
public JSONObject confirmReceive(BuyerOrderReq req){
if(null == req.getId() || null == req.getStatus()) {
if(null == req.getId()) {
return null;
}
... ... @@ -366,7 +366,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
}
public JSONObject judgeBegin(BuyerOrderReq req){
if(null == req.getId() || null == req.getStatus()) {
if(null == req.getId()) {
return null;
}
... ... @@ -386,7 +386,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
//鉴定通过
public JSONObject judgePass(BuyerOrderReq req){
if(null == req.getId() || null == req.getStatus()) {
if(null == req.getId()) {
return null;
}
... ... @@ -400,13 +400,14 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
}
String args = "orderAppraise.appraiseSuccess";
LOGGER.info("judgePass begin call enter interface is {}, orderCode is {}", buyerOrder.getOrderCode(), args);
JSONObject jsonObject = asyncCallJudgeResultUpdate(args, buyerOrder.getOrderCode());
return jsonObject;
}
//鉴定不通过
public JSONObject judgeReject(BuyerOrderReq req){
if(null == req.getId() || null == req.getStatus()) {
if(null == req.getId()) {
return null;
}
... ... @@ -420,6 +421,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
}
String args = "orderAppraise.appraiseFail";
LOGGER.info("judgeReject begin call enter interface is {}, orderCode is {}", buyerOrder.getOrderCode(), args);
JSONObject jsonObject = asyncCallJudgeResultUpdate(args, buyerOrder.getOrderCode());
return jsonObject;
}
... ... @@ -1239,6 +1241,22 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
req.setSellerUid(uid);//卖家uid
}
}
if(StringUtils.isNotEmpty(req.getBuyerMobile())) {
Integer uid = getUidByMobile(req.getBuyerMobile());
if(req.getUid()==null && null != uid) {
////买家uid ，如果前台没有传入uid，则根据手机号查询uid设置
req.setUid(uid);
}
}
if(StringUtils.isNotEmpty(req.getSellerMobile())) {
Integer uid = getUidByMobile(req.getSellerMobile());
if(req.getSellerUid()==null && null != uid) {
////卖家uid ，如果前台没有传入uid，则根据手机号查询uid设置
req.setSellerUid(uid);
}
}
}
... ...
... ... @@ -9,7 +9,7 @@
<body class="easyui-layout">
<input type="hidden" id="buyerOrderCode">
<input type="skup" id="skup">
<div region="north" style="height:300px;">
<div region="north" style="height:400px;">
<script>
document.write(addHead('鉴定中心', '列表管理'));
</script>
... ... @@ -22,10 +22,10 @@
<div id="tt" class="easyui-tabs">
<div id="tab_2" title="待收货" style="padding:20px;display:none;">
<div>
<label>订单编号：</label>
<label>&nbsp;&nbsp;&nbsp;订单编号：</label>
<input id="orderCode_2" type="text" class="easyui-textbox" style="width:150px">
<label>买家UID：</label>
<label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;买家UID：</label>
<input id="buyerUid_2" type="text" class="easyui-textbox" style="width:150px"/>
<label>卖家快递单号：</label>
... ... @@ -38,29 +38,37 @@
</select>
<br>
<label>商品编码：</label>
<br>
<label>&nbsp;&nbsp;&nbsp;商品编码：</label>
<input id="productId_2" type="text" class="easyui-textbox" style="width:150px"/>
<label> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;SKU：</label>
<input id="sku_2" type="text" class="easyui-textbox" style="width:150px"/>
<label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;卖家UID：</label>
<input id="sellerUid_2" type="text" class="easyui-textbox" style="width:150px"/>
<label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;手机号：</label>
<input id="mobile_2" type="text" class="easyui-textbox" style="width:150px"/>
<label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;SKU：</label>
<input id="sku_2" type="text" class="easyui-textbox" style="width:150px"/>
<label>&nbsp;&nbsp;&nbsp;SKU-P：</label>
<input id="skup_2" type="text" class="easyui-textbox" style="width:150px"/>
<a id="searchBtn_2" class="btn-info">查询</a>
<a id="allBtn_2" class="btn-success">全部</a>
<br>
<br>
<label>买家手机号：</label>
<input id="buyerMobile_2" type="text" class="easyui-textbox" style="width:150px"/>
<label>卖家手机号：</label>
<input id="sellerMobile_2" type="text" class="easyui-textbox" style="width:150px"/>
</div>
</div>
<div id="tab_0" title="待鉴定" style="padding:20px;display:none;">
<div>
<label>订单编号：</label>
<label>&nbsp;&nbsp;&nbsp;订单编号：</label>
<input id="orderCode_0" type="text" class="easyui-textbox" style="width:150px">
<label>买家UID：</label>
<label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;买家UID：</label>
<input id="buyerUid_0" type="text" class="easyui-textbox" style="width:150px"/>
<label>卖家快递单号：</label>
... ... @@ -73,31 +81,38 @@
<option value="3">平台鉴定中</option>
</select>
<br>
<br><br>
<label>商品编码：</label>
<label>&nbsp;&nbsp;&nbsp;商品编码：</label>
<input id="productId_0" type="text" class="easyui-textbox" style="width:150px"/>
<label> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;SKU：</label>
<label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;卖家UID：</label>
<input id="sellerUid_0" type="text" class="easyui-textbox" style="width:150px"/>
<label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;SKU：</label>
<input id="sku_0" type="text" class="easyui-textbox" style="width:150px"/>
<label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;手机号：</label>
<input id="mobile_0" type="text" class="easyui-textbox" style="width:150px"/>
<label>&nbsp;&nbsp;&nbsp;SKU-P：</label>
<input id="skup_0" type="text" class="easyui-textbox" style="width:150px"/>
<a id="searchBtn_0" class="btn-info">查询</a>
<a id="allBtn_0" class="btn-success">全部</a>
<br><br>
<label>买家手机号：</label>
<input id="buyerMobile_0" type="text" class="easyui-textbox" style="width:150px"/>
<label>卖家手机号：</label>
<input id="sellerMobile_0" type="text" class="easyui-textbox" style="width:150px"/>
</div>
</div>
<div id="tab_1" title="待发货" style="padding:20px;display:none;">
<div>
<label>订单编号：</label>
<label>&nbsp;&nbsp;&nbsp;订单编号：</label>
<input id="orderCode_1" type="text" class="easyui-textbox" style="width:150px">
<label>买家UID：</label>
<label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;买家UID：</label>
<input id="buyerUid_1" type="text" class="easyui-textbox" style="width:150px"/>
<label>卖家快递单号：</label>
... ... @@ -111,32 +126,39 @@
<option value="17">已取消(买家在卖家发货后取消订单)</option>
</select>
<br>
<label>商品编码：</label>
<input id="productId_1" type="text" class="easyui-textbox" style="width:250px"/>
<br><br>
<label> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;SKU：</label>
<label>&nbsp;&nbsp;&nbsp;商品编码：</label>
<input id="productId_1" type="text" class="easyui-textbox" style="width:150px"/>
<label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;卖家UID：</label>
<input id="sellerUid_1" type="text" class="easyui-textbox" style="width:150px"/>
<label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;SKU：</label>
<input id="sku_1" type="text" class="easyui-textbox" style="width:150px"/>
<label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;手机号：</label>
<input id="mobile_1" type="text" class="easyui-textbox" style="width:150px"/>
<label>&nbsp;&nbsp;&nbsp;SKU-P：</label>
<input id="skup_1" type="text" class="easyui-textbox" style="width:150px"/>
<a id="searchBtn_1" class="btn-info">查询</a>
<a id="allBtn_1" class="btn-success">全部</a>
<br><br>
<label>买家手机号：</label>
<input id="buyerMobile_1" type="text" class="easyui-textbox" style="width:150px"/>
<label>卖家手机号：</label>
<input id="sellerMobile_1" type="text" class="easyui-textbox" style="width:150px"/>
</div>
</div>
<div id="tab_3" title="完成" style="padding:20px;display:none;">
<div>
<label>订单编号：</label>
<label>&nbsp;&nbsp;&nbsp;订单编号：</label>
<input id="orderCode_3" type="text" class="easyui-textbox" style="width:150px">
<label>买家UID：</label>
<label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;买家UID：</label>
<input id="buyerUid_3" type="text" class="easyui-textbox" style="width:150px"/>
<label>卖家快递单号：</label>
... ... @@ -150,22 +172,33 @@
<option value="17">已取消(买家在卖家发货后取消订单)</option>
</select>
<br>
<br><br>
<label>商品编码：</label>
<label>&nbsp;&nbsp;&nbsp;商品编码：</label>
<input id="productId_3" type="text" class="easyui-textbox" style="width:150px"/>
<label> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;SKU：</label>
<input id="sku_3" type="text" class="easyui-textbox" style="width:150px"/>
<label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;卖家UID：</label>
<input id="sellerUid_3" type="text" class="easyui-textbox" style="width:150px"/>
<label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;手机号：</label>
<input id="mobile_3" type="text" class="easyui-textbox" style="width:150px"/>
<label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;SKU：</label>
<input id="sku_3" type="text" class="easyui-textbox" style="width:150px"/>
<label>&nbsp;&nbsp;&nbsp;SKU-P：</label>
<input id="skup_3" type="text" class="easyui-textbox" style="width:150px"/>
<a id="searchBtn_3" class="btn-info">查询</a>
<a id="allBtn_3" class="btn-success">全部</a>
<br><br>
<label>买家手机号：</label>
<input id="buyerMobile_3" type="text" class="easyui-textbox" style="width:150px"/>
<label>卖家手机号：</label>
<input id="sellerMobile_3" type="text" class="easyui-textbox" style="width:150px"/>
<label>平台快递单号：</label>
<input id="platformWaybillCode_3" type="text" class="easyui-textbox" style="width:150px"/>
</div>
</div>
</div>
... ... @@ -197,10 +230,12 @@ $(function() {
status : $("#status_2").myCombobox("getValue"),
orderCode : $("#orderCode_2").val(),
uid : $("#buyerUid_2").val(),
sellerUid : $("#sellerUid_2").val(),
productId : $("#productId_2").val(),
skup : $("#skup_2").val(),
sellerWaybillCode : $("#sellerWaybillCode_2").val(),
mobile : $("#mobile_2").val(),
buyerMobile : $("#buyerMobile_2").val(),
sellerMobile : $("#sellerMobile_2").val(),
depotNo : $("#depotNo").combobox("getValue")
});
}
... ... @@ -214,10 +249,12 @@ $(function() {
status : $("#status_0").myCombobox("getValue"),
orderCode : $("#orderCode_0").val(),
uid : $("#buyerUid_0").val(),
sellerUid : $("#sellerUid_0").val(),
productId : $("#productId_0").val(),
skup : $("#skup_0").val(),
sellerWaybillCode : $("#sellerWaybillCode_0").val(),
mobile : $("#mobile_0").val(),
buyerMobile : $("#buyerMobile_0").val(),
sellerMobile : $("#sellerMobile_0").val(),
depotNo : $("#depotNo").combobox("getValue")
});
}
... ... @@ -231,10 +268,12 @@ $(function() {
status : $("#status_1").myCombobox("getValue"),
orderCode : $("#orderCode_1").val(),
uid : $("#buyerUid_1").val(),
sellerUid : $("#sellerUid_1").val(),
productId : $("#productId_1").val(),
skup : $("#skup_1").val(),
sellerWaybillCode : $("#sellerWaybillCode_1").val(),
mobile : $("#mobile_1").val(),
buyerMobile : $("#buyerMobile_1").val(),
sellerMobile : $("#sellerMobile_1").val(),
depotNo : $("#depotNo").combobox("getValue")
});
}
... ... @@ -249,10 +288,13 @@ $(function() {
status : $("#status_3").myCombobox("getValue"),
orderCode : $("#orderCode_3").val(),
uid : $("#buyerUid_3").val(),
sellerUid : $("#sellerUid_3").val(),
productId : $("#productId_3").val(),
skup : $("#skup_3").val(),
sellerWaybillCode : $("#sellerWaybillCode_3").val(),
mobile : $("#mobile_3").val(),
platformWaybillCode:$("#platformWaybillCode_3").val(),
buyerMobile : $("#buyerMobile_3").val(),
sellerMobile : $("#sellerMobile_3").val(),
depotNo : $("#depotNo").combobox("getValue")
});
}
... ... @@ -283,11 +325,13 @@ $(function() {
onClick: function () {
$("#orderCode_2").textbox('setValue','');
$("#uid_2").textbox('setValue','');
$("#sellerUid_2").textbox('setValue','');
$("#sellerWaybillCode_2").textbox('setValue','');
$("#status_2").combobox('setValue','');
$("#productId_2").textbox('setValue','');
$("#sku_2").textbox('setValue','');
$("#mobile_2").textbox('setValue','');
$("#buyerMobile_2").textbox('setValue','');
$("#sellerMobile_2").textbox('setValue','');
$("#skup_2").textbox('setValue','');
$("#orderListTable").datagrid("load", {
statusStr: "2",
... ... @@ -301,11 +345,13 @@ $(function() {
onClick: function () {
$("#orderCode_0").textbox('setValue','');
$("#uid_0").textbox('setValue','');
$("#sellerUid_0").textbox('setValue','');
$("#sellerWaybillCode_0").textbox('setValue','');
$("#status_0").combobox('setValue','');
$("#productId_0").textbox('setValue','');
$("#sku_0").textbox('setValue','');
$("#mobile_0").textbox('setValue','');
$("#buyerMobile_0").textbox('setValue','');
$("#sellerMobile_0").textbox('setValue','');
$("#skup_0").textbox('setValue','');
$("#orderListTable").datagrid("load", {
statusStr: "31,3",
... ... @@ -319,11 +365,13 @@ $(function() {
onClick: function () {
$("#orderCode_1").textbox('setValue','');
$("#uid_1").textbox('setValue','');
$("#sellerUid_1").textbox('setValue','');
$("#sellerWaybillCode_1").textbox('setValue','');
$("#status_1").combobox('setValue','');
$("#productId_1").textbox('setValue','');
$("#sku_1").textbox('setValue','');
$("#mobile_1").textbox('setValue','');
$("#buyerMobile_1").textbox('setValue','');
$("#sellerMobile_1").textbox('setValue','');
$("#skup_1").textbox('setValue','');
$("#orderListTable").datagrid("load", {
statusStr: "32,13,17",
... ... @@ -338,11 +386,14 @@ $(function() {
onClick: function () {
$("#orderCode_3").textbox('setValue','');
$("#uid_3").textbox('setValue','');
$("#sellerUid_3").textbox('setValue','');
$("#sellerWaybillCode_3").textbox('setValue','');
$("#platformWaybillCode_3").textbox('setValue','');
$("#status_3").combobox('setValue','');
$("#productId_3").textbox('setValue','');
$("#sku_3").textbox('setValue','');
$("#mobile_3").textbox('setValue','');
$("#buyerMobile_3").textbox('setValue','');
$("#sellerMobile_3").textbox('setValue','');
$("#skup_3").textbox('setValue','');
$("#orderListTable").datagrid("load", {
statusStr: "4,13,17",
... ... @@ -612,189 +663,6 @@ function getTableColumn(platformWaybillShowFlag) {
}]
}
//放弃不用了
function getAlreadyJudged_BAK_List(){
$("#orderListTable").myDatagrid({
fit: true,
fitColumns: true,
striped: true,
url: contextPath + "/buyerOrder/queryOrderList",
method: 'POST',
queryParams: {
statusStr: "4,13",
depotNo: $("#depotNo").combobox("getValue")
},
loadFilter: function (data) {
var temp = defaultLoadFilter(data);
temp=null==temp?[]:temp;
temp.rows = temp.list;
return temp;
},
columns: [[{
title: "平台快递单号",
field: "platformWaybillCode",
width: 30,
align: "center"
}, {
title: "收货仓库",
field: "depotNo",
width: 20,
align: "center",
formatter: function (value, rowData, rowIndex) {
if (value == 0) {
return "北京";
}else if(value == 1){
return "南京";
}
}
}, {
title: "商品件数",
field: "productNum",
width: 20,
align: "center"
}, {
title: "SKU-P",
field: "skup",
width: 20,
align: "center"
}, {
title: "订单编号",
field: "orderCode",
width: 30,
align: "center"
}, {
title: "订单状态",
field: "status",
width: 20,
align: "center",
formatter: function (value, rowData, rowIndex) {
if (value == 4) {
return "鉴定通过";
}else if(value == 13){
return "鉴定不通过";
}
}
},{
title: "货号",
field: "productCode",
width: 20,
align: "center"
},{
title: "下单时间",
field: "createTimeStr",
width: 20,
align: "center"
},{
title: "操作",
field: "asdf",
width: 40,
align: "center",
formatter: function (value, rowData, rowIndex) {
var operateButton = '';
if (rowData.status == 4) {//鉴定通过
operateButton += "<a role='buyerReceiveInfo' dataId='"+ rowData.orderCode +"' style='margin-left:10px;background-color: #5cb85c !important;'>买家收货地址</a>" +
"<a role='viewExpress' dataId='"+ rowData.orderCode +"' style='margin-left:10px;background-color: #5cb85c !important; color: #fff !important;'>查看物流</a>";
if (rowData.containMp4Flag) {
operateButton += "<a role='queryForSuccess' dataId='"+ rowData.id + "' order_code='" + rowData.orderCode + "' skup='"+rowData.skup +"' style='margin-left:10px;background-color: #FFCC33 !important;'>查看视频</a>";
}
} else if (rowData.status == 13) {//鉴定不通过
operateButton += "<a role='rebackAddress' dataId='"+ rowData.orderCode +"' skup='"+ rowData.skup +"' style='margin-left:10px;background-color: #5cb85c !important;'>商品寄回地址</a>"+
"<a role='viewExpress' dataId='"+ rowData.orderCode + "' style='margin-left:10px;background-color: #5cb85c !important; color: #fff !important;'>查看物流</a>";
if (rowData.containMp4Flag) {
operateButton += "<a role='queryForSuccess' dataId='"+ rowData.id + "' order_code='" + rowData.orderCode + "' skup='"+rowData.skup +"' style='margin-left:10px;background-color: #FFCC33 !important;'>查看视频</a>";
}
}
return operateButton;
}
}]],
cache: false,
pagination: true,
pageSize: 10,
idField: "id",
singleSelect: true,
onLoadSuccess: function (data) {
$(this).datagrid("getPanel").find("a[role='buyerReceiveInfo']").linkbutton({
onClick: function () {
var buyerOrderCode = $(this).attr("dataId");
$("#buyerOrderCode").val(buyerOrderCode);
buyerReceiveInfoPage();
}
});
$(this).datagrid("getPanel").find("a[role='rebackAddress']").linkbutton({
onClick: function () {
var buyerOrderCode = $(this).attr("dataId");
$("#buyerOrderCode").val(buyerOrderCode);
var skup = $(this).attr("skup");
$("#skup").val(skup);
rebackAddressPage();
}
});
$(this).datagrid("getPanel").find("a[role='viewExpress']").linkbutton({
onClick: function () {
var buyerOrderCode = $(this).attr("dataId");
$("#buyerOrderCode").val(buyerOrderCode);
viewExpressPage(buyerOrderCode);
}
});
// 查看视频
$(this).datagrid("getPanel").find("a[role='queryForSuccess']").linkbutton({
onClick: function () {
var skup = $(this).attr("skup");
var order_code = $(this).attr("order_code");
$("#skup").val(skup);
addQueryPage(skup, order_code, $(this).attr("dataId"));
}
});
}
});
}
function buyerReceiveInfoPage() {
var div = $("<div id='buyerReceiveInfoDiv'>").appendTo($(document.body));
var url = contextPath + "/html/judgeCenter/buyerReceiveInfo.html";
$(div).myDialog({
width: "50%",
height: "60%",
title: "买家收货地址",
href: url,
modal: true,
collapsible: true,
cache: false,
buttons: [{
text: "取消",
iconCls: "icon-cancel",
handler: function () {
$(div).dialog("close");
}
}]
});
}
function rebackAddressPage() {
var div = $("<div id='rebackAddressDiv'>").appendTo($(document.body));
var url = contextPath + "/html/judgeCenter/rebackAddress.html";
$(div).myDialog({
width: "50%",
height: "60%",
title: "商品寄回地址",
href: url,
modal: true,
collapsible: true,
cache: false,
buttons: [{
text: "取消",
iconCls: "icon-cancel",
handler: function () {
$(div).dialog("close");
}
}]
});
}
function viewExpressPage() {
var div = $("<div id='viewExpressDiv'>").appendTo($(document.body));
var url = contextPath + "/html/judgeCenter/viewExpress.html";
... ... @@ -858,7 +726,7 @@ function judgeBegin(id) {
}
//鉴定通过
function judgePass() {
function judgePass(id) {
$.messager.confirm("鉴定通过提醒", "是否鉴定通过？", function(flag) {
if (flag) {
$.post(contextPath + "/buyerOrder/judgePass", {
... ... @@ -879,7 +747,7 @@ function judgePass() {
}
//鉴定不通过
function judgeReject() {
function judgeReject(id) {
$.messager.confirm("鉴定不通过提醒", "是否鉴定不通过？", function(flag) {
if (flag) {
$.post(contextPath + "/buyerOrder/judgeReject", {
... ... @@ -1277,6 +1145,192 @@ function getCountByJudgeStatus(){
});
}
/*
//废弃不用了
function getAlreadyJudged_BAK_List(){
$("#orderListTable").myDatagrid({
fit: true,
fitColumns: true,
striped: true,
url: contextPath + "/buyerOrder/queryOrderList",
method: 'POST',
queryParams: {
statusStr: "4,13",
depotNo: $("#depotNo").combobox("getValue")
},
loadFilter: function (data) {
var temp = defaultLoadFilter(data);
temp=null==temp?[]:temp;
temp.rows = temp.list;
return temp;
},
columns: [[{
title: "平台快递单号",
field: "platformWaybillCode",
width: 30,
align: "center"
}, {
title: "收货仓库",
field: "depotNo",
width: 20,
align: "center",
formatter: function (value, rowData, rowIndex) {
if (value == 0) {
return "北京";
}else if(value == 1){
return "南京";
}
}
}, {
title: "商品件数",
field: "productNum",
width: 20,
align: "center"
}, {
title: "SKU-P",
field: "skup",
width: 20,
align: "center"
}, {
title: "订单编号",
field: "orderCode",
width: 30,
align: "center"
}, {
title: "订单状态",
field: "status",
width: 20,
align: "center",
formatter: function (value, rowData, rowIndex) {
if (value == 4) {
return "鉴定通过";
}else if(value == 13){
return "鉴定不通过";
}
}
},{
title: "货号",
field: "productCode",
width: 20,
align: "center"
},{
title: "下单时间",
field: "createTimeStr",
width: 20,
align: "center"
},{
title: "操作",
field: "asdf",
width: 40,
align: "center",
formatter: function (value, rowData, rowIndex) {
var operateButton = '';
if (rowData.status == 4) {//鉴定通过
operateButton += "<a role='buyerReceiveInfo' dataId='"+ rowData.orderCode +"' style='margin-left:10px;background-color: #5cb85c !important;'>买家收货地址</a>" +
"<a role='viewExpress' dataId='"+ rowData.orderCode +"' style='margin-left:10px;background-color: #5cb85c !important; color: #fff !important;'>查看物流</a>";
if (rowData.containMp4Flag) {
operateButton += "<a role='queryForSuccess' dataId='"+ rowData.id + "' order_code='" + rowData.orderCode + "' skup='"+rowData.skup +"' style='margin-left:10px;background-color: #FFCC33 !important;'>查看视频</a>";
}
} else if (rowData.status == 13) {//鉴定不通过
operateButton += "<a role='rebackAddress' dataId='"+ rowData.orderCode +"' skup='"+ rowData.skup +"' style='margin-left:10px;background-color: #5cb85c !important;'>商品寄回地址</a>"+
"<a role='viewExpress' dataId='"+ rowData.orderCode + "' style='margin-left:10px;background-color: #5cb85c !important; color: #fff !important;'>查看物流</a>";
if (rowData.containMp4Flag) {
operateButton += "<a role='queryForSuccess' dataId='"+ rowData.id + "' order_code='" + rowData.orderCode + "' skup='"+rowData.skup +"' style='margin-left:10px;background-color: #FFCC33 !important;'>查看视频</a>";
}
}
return operateButton;
}
}]],
cache: false,
pagination: true,
pageSize: 10,
idField: "id",
singleSelect: true,
onLoadSuccess: function (data) {
$(this).datagrid("getPanel").find("a[role='buyerReceiveInfo']").linkbutton({
onClick: function () {
var buyerOrderCode = $(this).attr("dataId");
$("#buyerOrderCode").val(buyerOrderCode);
buyerReceiveInfoPage();
}
});
$(this).datagrid("getPanel").find("a[role='rebackAddress']").linkbutton({
onClick: function () {
var buyerOrderCode = $(this).attr("dataId");
$("#buyerOrderCode").val(buyerOrderCode);
var skup = $(this).attr("skup");
$("#skup").val(skup);
rebackAddressPage();
}
});
$(this).datagrid("getPanel").find("a[role='viewExpress']").linkbutton({
onClick: function () {
var buyerOrderCode = $(this).attr("dataId");
$("#buyerOrderCode").val(buyerOrderCode);
viewExpressPage(buyerOrderCode);
}
});
// 查看视频
$(this).datagrid("getPanel").find("a[role='queryForSuccess']").linkbutton({
onClick: function () {
var skup = $(this).attr("skup");
var order_code = $(this).attr("order_code");
$("#skup").val(skup);
addQueryPage(skup, order_code, $(this).attr("dataId"));
}
});
}
});
}
function buyerReceiveInfoPage() {
var div = $("<div id='buyerReceiveInfoDiv'>").appendTo($(document.body));
var url = contextPath + "/html/judgeCenter/buyerReceiveInfo.html";
$(div).myDialog({
width: "50%",
height: "60%",
title: "买家收货地址",
href: url,
modal: true,
collapsible: true,
cache: false,
buttons: [{
text: "取消",
iconCls: "icon-cancel",
handler: function () {
$(div).dialog("close");
}
}]
});
}
function rebackAddressPage() {
var div = $("<div id='rebackAddressDiv'>").appendTo($(document.body));
var url = contextPath + "/html/judgeCenter/rebackAddress.html";
$(div).myDialog({
width: "50%",
height: "60%",
title: "商品寄回地址",
href: url,
modal: true,
collapsible: true,
cache: false,
buttons: [{
text: "取消",
iconCls: "icon-cancel",
handler: function () {
$(div).dialog("close");
}
}]
});
}
*/
</script>
</body>
</html>
\ No newline at end of file
... ...