Authored by qinchao

质检开始

... ... @@ -12,7 +12,8 @@ public enum Constant {
BUYER_ORDER_STATUS_ALLOCATING((byte)2,"卖家已发货"),
//平台已收货(卖家发货后,平台确认收货,进入平台已收货)
BUYER_ORDER_STATUS_PLATFORM_RECEIVE((byte)31,"平台已收货"),
//更新为质检中
BUYER_ORDER_STATUS_PLATFORM_RECEIVE((byte)31,"平台质检中"),
//有货平台鉴定中(平台已收货,点开始鉴定-->进入鉴定中)
BUYER_ORDER_STATUS_JUDGING((byte)3,"平台鉴定中"),
... ...
... ... @@ -11,9 +11,9 @@ public enum OperateTypeEnum {
OPERATE_TYPE_UPDATE_RECEIVE_INFO(2,"修改收货人信息"),
OPERATE_TYPE_CONFIRM_RECEIVE(3,"确认收货"),
OPERATE_TYPE_JUDGE_BEGIN(4,"开始鉴定"),
OPERATE_TYPE_JUDGE_PASS(5,"鉴定通过"),
OPERATE_TYPE_JUDGE_REJECT(6,"鉴定不通过"),
OPERATE_TYPE_JUDGE_BEGIN(4,"质检通过"),
OPERATE_TYPE_JUDGE_PASS(5,"鉴定通过(并且发货)"),
OPERATE_TYPE_JUDGE_REJECT(6,"鉴定不通过(并且发货)"),
OPERATE_TYPE_DELIVERY_GOODS(7,"发货给买家"),
OPERATE_TYPE_RETURN_CAUSE_OF_JUDGE_FAILURE(8,"发货给卖家(鉴定不通过)"),
... ...
... ... @@ -64,12 +64,37 @@ public class BuyerOrderController {
}
}
@RequestMapping(value = "/judgeBegin")
public ApiResponse judgeBegin(BuyerOrderReq req) {
LOGGER.info("judgeBegin in. req is {}", req);
JSONObject result = buyerOrderService.judgeBegin(req);
//质检通过
@RequestMapping(value = "/qualityCheckPass")
public ApiResponse qualityCheckPass(BuyerOrderReq req) {
LOGGER.info("qualityCheckPass in. req is {}", req);
JSONObject result = buyerOrderService.qualityCheckPass(req);
if(result.getIntValue("code") == 200) {
return new ApiResponse.ApiResponseBuilder().code(200).message("开始鉴定成功").build();
return new ApiResponse.ApiResponseBuilder().code(200).message("质检通过成功").build();
}else {
return new ApiResponse.ApiResponseBuilder().code(500).message(result.getString("message")).build();
}
}
//质检不通过
@RequestMapping(value = "/qualityCheckNotPass")
public ApiResponse qualityCheckNotPass(BuyerOrderReq req) {
LOGGER.info("qualityCheckNotPass in. req is {}", req);
JSONObject result = buyerOrderService.qualityCheckNotPass();
if(result.getIntValue("code") == 200) {
return new ApiResponse.ApiResponseBuilder().code(200).message("质检不通过成功").build();
}else {
return new ApiResponse.ApiResponseBuilder().code(500).message(result.getString("message")).build();
}
}
//瑕疵确认
@RequestMapping(value = "/minorFaultConfirm")
public ApiResponse minorFaultConfirm(BuyerOrderReq req) {
LOGGER.info("minorFaultConfirm in. req is {}", req);
JSONObject result = buyerOrderService.minorFaultConfirm();
if(result.getIntValue("code") == 200) {
return new ApiResponse.ApiResponseBuilder().code(200).message("瑕疵确认成功").build();
}else {
return new ApiResponse.ApiResponseBuilder().code(500).message(result.getString("message")).build();
}
... ... @@ -86,6 +111,19 @@ public class BuyerOrderController {
}
}
//发货给买家
/*@RequestMapping(value = "/deliverGoods")
public ApiResponse deliverGoods(BuyerOrderReq req) {
LOGGER.info("deliverGoods in. req is {}", req);
JSONObject result = buyerOrderService.deliverGoods(req);
if(result.getIntValue("code") == 200) {
return new ApiResponse.ApiResponseBuilder().code(200).message("更新成功").build();
}else {
return new ApiResponse.ApiResponseBuilder().code(500).message(result.getString("message")).build();
}
}*/
@RequestMapping(value = "/judgeReject")
public ApiResponse judgeReject(BuyerOrderReq req) {
LOGGER.info("judgeReject in. req is {}", req);
... ... @@ -110,18 +148,6 @@ public class BuyerOrderController {
}
*/
//发货给买家
@RequestMapping(value = "/deliverGoods")
public ApiResponse deliverGoods(BuyerOrderReq req) {
LOGGER.info("deliverGoods in. req is {}", req);
JSONObject result = buyerOrderService.deliverGoods(req);
if(result.getIntValue("code") == 200) {
return new ApiResponse.ApiResponseBuilder().code(200).message("更新成功").build();
}else {
return new ApiResponse.ApiResponseBuilder().code(500).message(result.getString("message")).build();
}
}
//寄回给卖家
@RequestMapping(value = "/returnBackOrderCauseOfJudgeFailure")
public ApiResponse returnBackOrderCauseOfJudgeFailure(BuyerOrderReq req) {
... ...
... ... @@ -30,15 +30,20 @@ public interface IBuyerOrderService {
*/
void cancelBuyerOrder(String orderCode);
JSONObject judgeBegin(BuyerOrderReq req);
JSONObject qualityCheckPass(BuyerOrderReq req);
JSONObject qualityCheckNotPass();
JSONObject minorFaultConfirm();
JSONObject judgePass(BuyerOrderReq req);
//JSONObject deliverGoods(BuyerOrderReq req);
JSONObject judgeReject(BuyerOrderReq req);
//JSONObject updateOrderStatus(BuyerOrderReq req);
JSONObject deliverGoods(BuyerOrderReq req);
JSONObject returnBackOrderCauseOfJudgeFailure(BuyerOrderReq req);
... ...
... ... @@ -130,15 +130,16 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
public Map<String, Integer> getCountByJudgeStatus(BuyerOrderReq req){
List<Byte> toBeReceivedList = Lists.newArrayList();
List<Byte> toBeJudgedList = Lists.newArrayList();
//List<Byte> toBeJudgedList = Lists.newArrayList();
List<Byte> toBeSendOutList = Lists.newArrayList();
List<Byte> alreadyJudgedList = Lists.newArrayList();
toBeReceivedList.add(Constant.BUYER_ORDER_STATUS_ALLOCATING.getByteVal());
toBeReceivedList.add(Constant.BUYER_ORDER_STATUS_PLATFORM_RECEIVE.getByteVal());
toBeJudgedList.add(Constant.BUYER_ORDER_STATUS_PLATFORM_RECEIVE.getByteVal());
toBeJudgedList.add(Constant.BUYER_ORDER_STATUS_JUDGING.getByteVal());
/*toBeJudgedList.add(Constant.BUYER_ORDER_STATUS_PLATFORM_RECEIVE.getByteVal());
toBeJudgedList.add(Constant.BUYER_ORDER_STATUS_JUDGING.getByteVal());*/
toBeSendOutList.add(Constant.BUYER_ORDER_STATUS_JUDGE_PASS.getByteVal());
toBeSendOutList.add(Constant.BUYER_ORDER_STATUS_JUDGING.getByteVal());
toBeSendOutList.add(Constant.BUYER_ORDER_STATUS_JUDGE_NOT_PASS.getByteVal());
toBeSendOutList.add(Constant.BUYER_ORDER_STATUS_BUYER_CANCEL_AFTER_SELLER_DELIVERY.getByteVal());
... ... @@ -147,13 +148,13 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
alreadyJudgedList.add(Constant.BUYER_ORDER_STATUS_BUYER_CANCEL_AFTER_SELLER_DELIVERY.getByteVal());
int toBeReceivedNum = buyerOrderMapper.selectCountByStatusAndDepotNo(toBeReceivedList, req.getDepotNo(),null);
int toBeJudgedNum = buyerOrderMapper.selectCountByStatusAndDepotNo(toBeJudgedList, req.getDepotNo(),null);
//int toBeJudgedNum = buyerOrderMapper.selectCountByStatusAndDepotNo(toBeJudgedList, req.getDepotNo(),null);
int toBeSendOutNum = buyerOrderMapper.selectCountByStatusAndDepotNo(toBeSendOutList, req.getDepotNo(),"haveNotExpress");
int alreadyJudgedNum = buyerOrderMapper.selectCountByStatusAndDepotNo(alreadyJudgedList, req.getDepotNo(),"haveExpress");
Map<String, Integer> resultMap = Maps.newHashMap();
resultMap.put("toBeReceivedNum", toBeReceivedNum);
resultMap.put("toBeJudgedNum", toBeJudgedNum);
//resultMap.put("toBeJudgedNum", toBeJudgedNum);
resultMap.put("toBeSendOutNum", toBeSendOutNum);
resultMap.put("alreadyJudgedNum", alreadyJudgedNum);
... ... @@ -170,8 +171,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
resultMap.put("num_5", buyerOrderMapper.selectCountByStatus(getStatusListByNavStatus(5)));//平台已发货
resultMap.put("num_6", buyerOrderMapper.selectCountByStatus(getStatusListByNavStatus(6)));//订单完成
resultMap.put("num_7", buyerOrderMapper.selectCountByStatus(getStatusListByNavStatus(7)));//已取消
resultMap.put("num_8", buyerOrderMapper.selectCountByStatus(getStatusListByNavStatus(8)));//平台已收货
resultMap.put("num_9", buyerOrderMapper.selectCountByStatus(getStatusListByNavStatus(9)));//平台鉴定通过
resultMap.put("num_8", buyerOrderMapper.selectCountByStatus(getStatusListByNavStatus(8)));//平台质检中
return resultMap;
}
... ... @@ -188,6 +188,9 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
if(CollectionUtils.isEmpty(orderList)) {
return null;
}
//查询质检情况
//查询buyer_order_goods
List<String> buyerOrderCodeList = orderList.stream().map(BuyerOrder::getOrderCode).collect(Collectors.toList());
... ... @@ -379,7 +382,8 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
}
}
public JSONObject judgeBegin(BuyerOrderReq req){
@Override
public JSONObject qualityCheckPass(BuyerOrderReq req){
if(null == req.getId()) {
return null;
}
... ... @@ -393,18 +397,32 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
throw new ServiceException(400,"错误:订单状态变化,不允许开始鉴定,请重新刷新列表");
}
String args = "ufo-gateway.judgeBegin";
String args = "ufo-gateway.qualityCheckPass";
JSONObject jsonObject = asyncCallConfirmReceive(args, buyerOrder.getOrderCode());
//记录操作日志
int operateType =OperateTypeEnum.OPERATE_TYPE_JUDGE_BEGIN.getCode();
UserHelper userHelper = new UserHelper();
saveOrderOperateRecord(buyerOrder.getOrderCode(), userHelper, operateType, "");
LOGGER.info("judgeBegin saveOrderOperateRecord operateType={} ,order code ={} ,userHelper = {} ,result json {}",operateType,buyerOrder.getOrderCode() ,userHelper,jsonObject);
LOGGER.info("qualityCheckPass saveOrderOperateRecord operateType={} ,order code ={} ,userHelper = {} ,result json {}",operateType,buyerOrder.getOrderCode() ,userHelper,jsonObject);
return jsonObject;
}
public JSONObject qualityCheckNotPass(){
//保存图片
//调用鉴定不通过接口
//记录操作日志
return null;
}
public JSONObject minorFaultConfirm(){
return null;
}
//鉴定通过
public JSONObject judgePass(BuyerOrderReq req){
if(null == req.getId()) {
... ... @@ -422,7 +440,10 @@ 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());
//JSONObject jsonObject = asyncCallJudgeResultUpdate(args, buyerOrder.getOrderCode());
//重新设置mobile
restMobileFromBuyer(req,buyerOrder.getOrderCode());
JSONObject jsonObject = asyncCallAppraise(args, buyerOrder.getOrderCode(), req);
//记录操作日志
int operateType =OperateTypeEnum.OPERATE_TYPE_JUDGE_PASS.getCode();
... ... @@ -433,6 +454,44 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
return jsonObject;
}
//发货
/*public JSONObject deliverGoods(BuyerOrderReq req){
if(null == req.getId() || null == req.getStatus()) {
return null;
}
BuyerOrder buyerOrder = buyerOrderMapper.selectById(req.getId());
if(null == buyerOrder) {
return null;
}
if(buyerOrder.getStatus().byteValue()!=Constant.BUYER_ORDER_STATUS_JUDGE_PASS.getByteVal()) {
throw new ServiceException(400,"错误:订单状态不是鉴定通过,不允许发货");
}
//查看是否存在寄回的物流信息,如果存在,则不允许再次寄回
ExpressRecord sellerExpressRecord = expressRecordMapper.selectByOrderCodeAndType(buyerOrder.getOrderCode(),
buyerOrder.getUid(), EXPRESS_TYPE_JUDGE_TO_BUYER);
if(null != sellerExpressRecord) {
throw new ServiceException(400,"错误:订单已存在物流单["+sellerExpressRecord.getWaybillCode()+"]不允许再次发货");
}
//调用前台接口
String args = "orderAppraise.deliverGoods";
//重新设置mobile
restMobileFromBuyer(req,buyerOrder.getOrderCode());
JSONObject jsonObject = asyncCallAppraise(args, buyerOrder.getOrderCode(), req);
//记录操作日志
int operateType =OperateTypeEnum.OPERATE_TYPE_DELIVERY_GOODS.getCode();
UserHelper userHelper = new UserHelper();
saveOrderOperateRecord(buyerOrder.getOrderCode(), userHelper, operateType, "");
LOGGER.info("deliverGoods saveOrderOperateRecord operateType={} ,order code ={} ,userHelper = {} ,result json {}",operateType,buyerOrder.getOrderCode() ,userHelper,jsonObject);
return jsonObject;
}
*/
//鉴定不通过
public JSONObject judgeReject(BuyerOrderReq req){
if(null == req.getId()) {
... ... @@ -450,7 +509,11 @@ 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());
//JSONObject jsonObject = asyncCallJudgeResultUpdate(args, buyerOrder.getOrderCode());
//重新设置mobile
resetMobileFromSeller(req,buyerOrder.getOrderCode());
JSONObject jsonObject = asyncCallAppraise(args, buyerOrder.getOrderCode(), req);
//记录操作日志
int operateType =OperateTypeEnum.OPERATE_TYPE_JUDGE_REJECT.getCode();
... ... @@ -461,14 +524,14 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
return jsonObject;
}
private JSONObject asyncCallJudgeResultUpdate(String args, String orderCode) {
/*private JSONObject asyncCallJudgeResultUpdate(String args, String orderCode) {
LOGGER.info("call asyncCallJudgeResultUpdate enter orderCode is {}, interface is {},result is {}", orderCode, args);
OrderRequest request = new OrderRequest();
request.setOrderCode(Long.valueOf(orderCode));
JSONObject jsonObject = serviceCaller.asyncCall(args, request, JSONObject.class).get(5, TimeUnit.SECONDS);
LOGGER.info("call asyncCallJudgeResultUpdate orderCode is {}, interface is {},result is {}", orderCode, args, jsonObject.toJSONString());
return jsonObject;
}
}*/
/*
public JSONObject updateOrderStatus(BuyerOrderReq req) {
... ... @@ -548,42 +611,6 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
}
}
//发货
public JSONObject deliverGoods(BuyerOrderReq req){
if(null == req.getId() || null == req.getStatus()) {
return null;
}
BuyerOrder buyerOrder = buyerOrderMapper.selectById(req.getId());
if(null == buyerOrder) {
return null;
}
if(buyerOrder.getStatus().byteValue()!=Constant.BUYER_ORDER_STATUS_JUDGE_PASS.getByteVal()) {
throw new ServiceException(400,"错误:订单状态不是鉴定通过,不允许发货");
}
//查看是否存在寄回的物流信息,如果存在,则不允许再次寄回
ExpressRecord sellerExpressRecord = expressRecordMapper.selectByOrderCodeAndType(buyerOrder.getOrderCode(),
buyerOrder.getUid(), EXPRESS_TYPE_JUDGE_TO_BUYER);
if(null != sellerExpressRecord) {
throw new ServiceException(400,"错误:订单已存在物流单["+sellerExpressRecord.getWaybillCode()+"]不允许再次发货");
}
//调用前台接口
String args = "orderAppraise.deliverGoods";
//重新设置mobile
restMobileFromBuyer(req,buyerOrder.getOrderCode());
JSONObject jsonObject = asyncCallAppraise(args, buyerOrder.getOrderCode(), req);
//记录操作日志
int operateType =OperateTypeEnum.OPERATE_TYPE_DELIVERY_GOODS.getCode();
UserHelper userHelper = new UserHelper();
saveOrderOperateRecord(buyerOrder.getOrderCode(), userHelper, operateType, "");
LOGGER.info("deliverGoods saveOrderOperateRecord operateType={} ,order code ={} ,userHelper = {} ,result json {}",operateType,buyerOrder.getOrderCode() ,userHelper,jsonObject);
return jsonObject;
}
public JSONObject returnBackOrderCauseOfJudgeFailure(BuyerOrderReq req){
if(null == req.getId() || null == req.getStatus()) {
... ...
... ... @@ -35,6 +35,7 @@
<select id="status_2" class="easyui-combobox" style="width:250px;" >
<option value="">全部</option>
<option value="2">卖家已发货</option>
<option value="31">平台质检中</option>
</select>
<br>
... ... @@ -63,7 +64,7 @@
<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 id="tab_0" title="待鉴定" style="padding:20px;display:none;">
<div>
<label>&nbsp;&nbsp;&nbsp;订单编号:</label>
<input id="orderCode_0" type="text" class="easyui-textbox" style="width:150px">
... ... @@ -77,7 +78,6 @@
<label>订单状态:</label>
<select id="status_0" class="easyui-combobox" style="width:250px;" >
<option value="">全部</option>
<option value="31">平台已收货</option>
<option value="3">平台鉴定中</option>
</select>
... ... @@ -105,7 +105,7 @@
<label>卖家手机号:</label>
<input id="sellerMobile_0" type="text" class="easyui-textbox" style="width:150px"/>
</div>
</div>
</div>-->
<div id="tab_1" title="待发货" style="padding:20px;display:none;">
<div>
... ... @@ -121,7 +121,7 @@
<label>订单状态:</label>
<select id="status_1" class="easyui-combobox" style="width:250px;" >
<option value="">全部</option>
<option value="32">平台鉴定通过</option>
<option value="3">平台鉴定中</option>
<option value="13">已取消(商品鉴定不通过)</option>
<option value="17">已取消(买家在卖家发货后取消订单)</option>
</select>
... ... @@ -209,19 +209,10 @@
</div>
<script>
const domain = document.location.href.indexOf('test3') > 0 ? 'http://java-ufo-platform.test3.ingress.dev.yohocorp.com' : '';
const tab_status_platform_receive="2,31";
const tab_status_platform_to_be_sending="3,13,17";
const tab_status_platform_finished="4,13,17";
$(function() {
console.log(window.parent.rollId);
var rollId = window.parent.rollId || '1';
if (rollId === '99') {
$('.tabs').find('li').eq(0).hide();
$('.tabs').find('li').eq(2).hide();
$('.tabs').find('li').eq(3).hide();
$('#tt').tabs('select', 1);
getToBeJudgedList();
}
//获取鉴定状态对应的记录数
getCountByJudgeStatus();
... ... @@ -238,7 +229,7 @@ $(function() {
iconCls : "icon-search",
onClick : function() {
$("#orderListTable").datagrid("load", {
statusStr : "2",
statusStr : tab_status_platform_receive,
status : $("#status_2").myCombobox("getValue"),
orderCode : $("#orderCode_2").val(),
uid : $("#buyerUid_2").val(),
... ... @@ -253,7 +244,7 @@ $(function() {
}
});
$("#searchBtn_0").linkbutton({
/*$("#searchBtn_0").linkbutton({
iconCls : "icon-search",
onClick : function() {
$("#orderListTable").datagrid("load", {
... ... @@ -270,12 +261,12 @@ $(function() {
depotNo : $("#depotNo").combobox("getValue")
});
}
});
});*/
$("#searchBtn_1").linkbutton({
iconCls : "icon-search",
onClick : function() {
$("#orderListTable").datagrid("load", {
statusStr : "32,13,17",
statusStr : tab_status_platform_to_be_sending,
platformExpressInfoFlag:"haveNotExpress",
status : $("#status_1").myCombobox("getValue"),
orderCode : $("#orderCode_1").val(),
... ... @@ -295,7 +286,7 @@ $(function() {
iconCls : "icon-search",
onClick : function() {
$("#orderListTable").datagrid("load", {
statusStr : "4,13,17",
statusStr : tab_status_platform_finished,
platformExpressInfoFlag:"haveExpress",
status : $("#status_3").myCombobox("getValue"),
orderCode : $("#orderCode_3").val(),
... ... @@ -315,7 +306,6 @@ $(function() {
getToBeReceiveList();
$("#tt").tabs({
onSelect:function(title,index){
console.log('select', title, index);
tabsSelected(index);
}
});
... ... @@ -324,10 +314,8 @@ $(function() {
if(index == 0){
getToBeReceiveList();
}else if(index == 1){
getToBeJudgedList();
}else if(index == 2){
getToBeSendOutList();
}else if(index == 3){
}else if(index == 2){
getAlreadyJudgedList();
}
}
... ... @@ -347,13 +335,13 @@ $(function() {
$("#sellerMobile_2").textbox('setValue','');
$("#skup_2").textbox('setValue','');
$("#orderListTable").datagrid("load", {
statusStr: "2",
statusStr: tab_status_platform_receive,
depotNo: $("#depotNo").combobox("getValue")
});
}
});
$("#allBtn_0").linkbutton({
/*$("#allBtn_0").linkbutton({
iconCls: "icon-import",
onClick: function () {
$("#orderCode_0").textbox('setValue','');
... ... @@ -371,7 +359,7 @@ $(function() {
depotNo: $("#depotNo").combobox("getValue")
});
}
});
});*/
$("#allBtn_1").linkbutton({
iconCls: "icon-import",
... ... @@ -387,7 +375,7 @@ $(function() {
$("#sellerMobile_1").textbox('setValue','');
$("#skup_1").textbox('setValue','');
$("#orderListTable").datagrid("load", {
statusStr: "32,13,17",
statusStr: tab_status_platform_to_be_sending,
platformExpressInfoFlag:"haveNotExpress",
depotNo: $("#depotNo").combobox("getValue")
});
... ... @@ -409,7 +397,7 @@ $(function() {
$("#sellerMobile_3").textbox('setValue','');
$("#skup_3").textbox('setValue','');
$("#orderListTable").datagrid("load", {
statusStr: "4,13,17",
statusStr: tab_status_platform_finished,
platformExpressInfoFlag:"haveExpress",
depotNo: $("#depotNo").combobox("getValue")
});
... ... @@ -419,20 +407,16 @@ $(function() {
});
function getToBeReceiveList() {
getToBeReceiveListOrJudgedList(false,"2",null);
getToBeReceiveListOrJudgedList(false,tab_status_platform_receive,null);
}
function getToBeJudgedList() {
console.log('运行了');
getToBeReceiveListOrJudgedList(false,"31,3",null,false);
}
function getToBeSendOutList() {
getToBeReceiveListOrJudgedList(false,"32,13,17","haveNotExpress");
getToBeReceiveListOrJudgedList(false,tab_status_platform_to_be_sending,"haveNotExpress");
}
function getAlreadyJudgedList(){
getToBeReceiveListOrJudgedList(true,"4,13,17","haveExpress");
getToBeReceiveListOrJudgedList(true,tab_status_platform_finished,"haveExpress");
}
function getToBeReceiveListOrJudgedList(platformWaybillShowFlag,paramStatusStr,platformExpressInfoFlag){
... ... @@ -470,19 +454,35 @@ function getToBeReceiveListOrJudgedList(platformWaybillShowFlag,paramStatusStr,p
confirmReceive(id);
}
});
//开始鉴定
$(this).datagrid("getPanel").find("a[role='judgeBegin']").linkbutton({
//质检通过-- 进入鉴定
$(this).datagrid("getPanel").find("a[role='qualityCheckPass']").linkbutton({
onClick: function () {
var id = $(this).attr("dataId");
qualityCheckPass(id);
}
});
//质检不通过-- 进入鉴定不通过状态
$(this).datagrid("getPanel").find("a[role='qualityCheckNotPass']").linkbutton({
onClick: function () {
var id = $(this).attr("dataId");
qualityCheckNotPass(id);
}
});
//瑕疵确认
$(this).datagrid("getPanel").find("a[role='minorFaultConfirm']").linkbutton({
onClick: function () {
var id = $(this).attr("dataId");
judgeBegin(id);
minorFaultConfirm(id);
}
});
//录入鉴定结果:通过
$(this).datagrid("getPanel").find("a[role='pass']").linkbutton({
onClick: function () {
//var buyerOrderCode = $(this).attr("orderCode");
//$("#buyerOrderCode").val(buyerOrderCode);
var buyerOrderCode = $(this).attr("orderCode");
$("#buyerOrderCode").val(buyerOrderCode);
judgePass($(this).attr("dataId"));
}
});
... ... @@ -490,8 +490,8 @@ function getToBeReceiveListOrJudgedList(platformWaybillShowFlag,paramStatusStr,p
//录入鉴定结果:不通过
$(this).datagrid("getPanel").find("a[role='reject']").linkbutton({
onClick: function () {
//var skup = $(this).attr("skup");
//$("#skup").val(skup);
var skup = $(this).attr("skup");
$("#skup").val(skup);
judgeReject($(this).attr("dataId"));
}
});
... ... @@ -517,13 +517,13 @@ function getToBeReceiveListOrJudgedList(platformWaybillShowFlag,paramStatusStr,p
});
//发货
$(this).datagrid("getPanel").find("a[role='sendOut']").linkbutton({
/*$(this).datagrid("getPanel").find("a[role='sendOut']").linkbutton({
onClick: function () {
var buyerOrderCode = $(this).attr("order_code");
$("#buyerOrderCode").val(buyerOrderCode);
addPassPage($(this).attr("dataId"));
}
});
});*/
//鉴定不通过造成的退回
$(this).datagrid("getPanel").find("a[role='reback_cause_of_judge_failure']").linkbutton({
... ... @@ -635,8 +635,16 @@ function getTableColumn(platformWaybillShowFlag) {
if (rowData.status == 2) {
return "<a role='confirm' dataId='"+ rowData.id +"' style='margin-left:10px;background-color: #5cb85c !important;'>确认收货</a>";
} else if (rowData.status == 31) {
return "<a role='judgeBegin' dataId='"+ rowData.id +"' style='margin-left:10px;background-color: #5cb85c !important;'>开始鉴定</a>";;
var operateButton ="";
if(rowData.qualityCheckType!=null && rowData.qualityCheckType == 2){
//已经有瑕疵确认了 ,只能查看
operateButton += "查看瑕疵";
}else{
operateButton += "<a role='qualityCheckPass' dataId='"+ rowData.id +"' style='margin-left:10px;background-color: #5cb85c !important;'>质检通过</a>";
operateButton += "<a role='qualityCheckNotPass' dataId='"+ rowData.id + "'" + " skup='"+rowData.skup +"' style='margin-left:10px;background-color: #d9534f !important; color: #fff !important;'>质检不通过</a>";
operateButton += "<a role='minorFaultConfirm' dataId='"+ rowData.id +"' style='margin-left:10px;background-color: #5bc0de !important;'>瑕疵确认</a>";
}
return operateButton ;
}else if (rowData.status == 3) {
var operateButton = "<a role='pass' dataId='"+ rowData.id + "'" + " orderCode='"+rowData.orderCode +"' style='margin-left:10px;background-color: #5cb85c !important;'>鉴定通过</a>"+
"<a role='reject' dataId='"+ rowData.id + "'" + " skup='"+rowData.skup +"' style='margin-left:10px;background-color: #d9534f !important; color: #fff !important;'>鉴定不通过</a>"+
... ... @@ -645,12 +653,6 @@ function getTableColumn(platformWaybillShowFlag) {
operateButton += "<a role='query' dataId='"+ rowData.id + "' order_code='" + rowData.orderCode + "' skup='"+rowData.skup +"' style='margin-left:10px;background-color: #FFCC33 !important;'>查看视频</a>";
}
return operateButton;
}else if (rowData.status == 32) {
var operateButton = "<a role='sendOut' dataId='"+ rowData.id + "'" + " order_code='"+rowData.orderCode +"' style='margin-left:10px;background-color: #5cb85c !important;'>发货</a>";
if (rowData.containMp4Flag) {
operateButton += "<a role='query' dataId='"+ rowData.id + "' order_code='" + rowData.orderCode + "' skup='"+rowData.skup +"' style='margin-left:10px;background-color: #FFCC33 !important;'>查看视频</a>";
}
return operateButton;
}else if (rowData.status == 4) {
var operateButton = "<a role='platform_waybill_viewExpress' dataId='"+ rowData.orderCode + "' style='margin-left:10px;background-color: #5cb85c !important;'>查看物流</a>";
if (rowData.containMp4Flag) {
... ... @@ -718,18 +720,18 @@ function confirmReceive(id){
}
});
}
//开始鉴定
function judgeBegin(id) {
$.messager.confirm("开始鉴定提醒", "是否开始鉴定?", function(flag) {
//质检通过
function qualityCheckPass(id) {
$.messager.confirm("质检通过提醒", "是否质检通过?", function(flag) {
if (flag) {
$.post(contextPath + "/buyerOrder/judgeBegin", {
$.post(contextPath + "/buyerOrder/qualityCheckPass", {
id : id
}, function(data) {
if (data.code == 200) {
$("#orderListTable").datagrid("reload");
window.self.$.messager.show({
title : "提示",
msg : "开始鉴定成功!"
msg : "质检通过成功!"
});
}else {
window.self.$.messager.alert("失败", "失败!", "error");
... ... @@ -739,46 +741,19 @@ function judgeBegin(id) {
});
}
//鉴定通过
function judgePass(id) {
$.messager.confirm("鉴定通过提醒", "是否鉴定通过?", function(flag) {
if (flag) {
$.post(contextPath + "/buyerOrder/judgePass", {
id : id
}, function(data) {
if (data.code == 200) {
$("#orderListTable").datagrid("reload");
window.self.$.messager.show({
title : "提示",
msg : "鉴定通过成功!"
});
}else {
window.self.$.messager.alert("失败", "失败!", "error");
}
});
}
});
//上传图片,并且调用接口
function qualityCheckNotPass(id) {
}
//鉴定不通过
function judgeReject(id) {
$.messager.confirm("鉴定不通过提醒", "是否鉴定不通过?", function(flag) {
if (flag) {
$.post(contextPath + "/buyerOrder/judgeReject", {
id : id
}, function(data) {
if (data.code == 200) {
$("#orderListTable").datagrid("reload");
window.self.$.messager.show({
title : "提示",
msg : "鉴定不通过完成!"
});
}else {
window.self.$.messager.alert("失败", "失败!", "error");
}
});
}
});
//瑕疵确认
function minorFaultConfirm(id) {
}
//鉴定通过,并且发货
function judgePass(id) {
addPassPage(id);
}
//鉴定通过后发货
... ... @@ -841,6 +816,38 @@ function addRebackPage(id) {
});
}
//鉴定不通过,并且发货
function judgeReject(id) {
var div = $("<div id='rejectDiv'>").appendTo($(document.body));
var url = contextPath + "/html/judgeCenter/reject.html?time_version=" + new Date().getTime();;
$(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");
}
},{
text: "寄回",
id: "rejectBtn",
iconCls: "icon-save",
onClick: function () {
$('#rejectBtn').linkbutton('disable');
sendBackGoods(id,true);
}
}]
});
}
//鉴定不通过后退回商品
function addRejectPage(id) {
var div = $("<div id='rejectDiv'>").appendTo($(document.body));
... ... @@ -865,7 +872,7 @@ function addRejectPage(id) {
iconCls: "icon-save",
onClick: function () {
$('#rejectBtn').linkbutton('disable');
sendBackGoods(id);
sendBackGoods(id,false);
}
}]
});
... ... @@ -1000,7 +1007,7 @@ function deliverGoods(id){
alert("收货人手机号为空!");
return;
}
$.post(contextPath + "/buyerOrder/deliverGoods", {
$.post(contextPath + "/buyerOrder/judgePass", {
id : id,
status : 4,
expressCompanyId : expressCompanyId,
... ... @@ -1064,7 +1071,12 @@ function reBackGoods(id){
}
//鉴定不通过寄回
function sendBackGoods(id){
function sendBackGoods(id,changeStateToReject){
var reqUrl="/buyerOrder/returnBackOrderCauseOfJudgeFailure";
if(changeStateToReject){
reqUrl="/buyerOrder/judgeReject";
}
var expressCompanyId = $("#expressCompany").myCombobox("getValue");
var waybillCode = $("#waybillCode").textbox("getValue");
var mobile = $("#sendBackInfo_mobile").val();
... ... @@ -1080,7 +1092,7 @@ function sendBackGoods(id){
alert("收货人手机号为空!");
return;
}
$.post(contextPath + "/buyerOrder/returnBackOrderCauseOfJudgeFailure", {
$.post(contextPath +reqUrl , {
id : id,
status : 13,
expressCompanyId : expressCompanyId,
... ... @@ -1127,15 +1139,9 @@ function getCountByJudgeStatus(){
}
});
var tab_toBeJudged = $('#tt').tabs('getTab',1); // 取得第一个tab
$('#tt').tabs('update', {
tab: tab_toBeJudged,
options: {
title: '待鉴定('+ result.data.toBeJudgedNum + ")"
}
});
var tab_toBeSendOutNum = $('#tt').tabs('getTab',2); // 取得第一个tab
var tab_toBeSendOutNum = $('#tt').tabs('getTab',1); // 取得第一个tab
$('#tt').tabs('update', {
tab: tab_toBeSendOutNum,
options: {
... ... @@ -1143,7 +1149,7 @@ function getCountByJudgeStatus(){
}
});
var tab_alreadyJudgedNum = $('#tt').tabs('getTab',3); // 取得第一个tab
var tab_alreadyJudgedNum = $('#tt').tabs('getTab',2); // 取得第一个tab
$('#tt').tabs('update', {
tab: tab_alreadyJudgedNum,
options: {
... ...
... ... @@ -27,9 +27,8 @@
<li><a href="javascript:switchOrderStatus(2);">待卖家发货(<span id="num_2"></span>)</a></li>
<li><a href="javascript:switchOrderStatus(3);">卖家已发货(<span id="num_3"></span>)</a></li>
<li><a href="javascript:switchOrderStatus(4);">平台鉴定中(<span id="num_4"></span>)</a></li>
<li><a href="javascript:switchOrderStatus(8);">平台已收货(<span id="num_8"></span>)</a></li>
<li><a href="javascript:switchOrderStatus(8);">平台质检中(<span id="num_8"></span>)</a></li>
<li><a href="javascript:switchOrderStatus(5);">平台已发货(<span id="num_5"></span>)</a></li>
<li><a href="javascript:switchOrderStatus(9);">平台鉴定通过(<span id="num_9"></span>)</a></li>
<li><a href="javascript:switchOrderStatus(6);">订单完成(<span id="num_6"></span>)</a></li>
<li><a href="javascript:switchOrderStatus(7);">已取消(<span id="num_7">)</span>)</a></li>
</ul>
... ... @@ -54,9 +53,8 @@
<option value="0">待买家付款</option>
<option value="1">待卖家发货</option>
<option value="2">卖家已发货</option>
<option value="31">平台已收货</option>
<option value="31">平台质检中</option>
<option value="3">平台鉴定中</option>
<option value="32">平台鉴定通过</option>
<option value="4">平台已发货</option>
<option value="5">订单完成</option>
<option value="11">已取消(卖家取消交易)</option>
... ... @@ -309,7 +307,6 @@ function getCountByNavStatus(){
$("#num_6").html(result.data.num_6);
$("#num_7").html(result.data.num_7);
$("#num_8").html(result.data.num_8);
$("#num_9").html(result.data.num_9);
}
else {
$.messager.alert("失败", result.message, "error");
... ...