ufo / ufo-platform · Commits

Go to a project

Authored by qinchao
Commit 2256dd01d8fb132ea129dcb5087fb77623f69bc2 2 parents dcb42a54 5cc716f1

Merge branch 'hotfix_0312_鉴定待发货添加新的状态' into test6.8.7

Inline Side-by-side
Showing 2 changed files with 6 additions and 11 deletions
... ... @@ -2085,14 +2085,12 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
}
JSONObject jsonObject = updateBuyerReceiveInfo(req, buyerMeta.getMetaValue(), buyerOrder.getUid());
if(jsonObject.getIntValue("code") != 200) {
LOGGER.warn("updateReceiveInfo buyer update address not successful response, req {} result is {}",req, jsonObject);
return 0;
}
LOGGER.info("updateReceiveInfo buyer update address successful response, req {} result is {}",req, jsonObject);
oldInfo = buyerMeta.getMetaValue();
}
}else if(buyerOrder.getStatus().byteValue() == Constant.BUYER_ORDER_STATUS_PLATFORM_RECEIVE.getByteVal()) {
}else if(buyerOrder.getStatus().byteValue() == Constant.BUYER_ORDER_STATUS_BUYER_PAYED.getByteVal()
||buyerOrder.getStatus().byteValue() == Constant.BUYER_ORDER_STATUS_PLATFORM_RECEIVE.getByteVal()) {
//平台鉴定前，更新收货人信息
LOGGER.info("updateReceiveInfo change address before judge ,buyerOrder = {}",buyerOrder);
operateType = OperateTypeEnum.OPERATE_TYPE_UPDATE_RECEIVE_INFO.getCode();
... ... @@ -2102,10 +2100,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
}
JSONObject jsonObject = updateBuyerReceiveInfo(req, buyerMeta.getMetaValue(), buyerOrder.getUid());
if(jsonObject.getIntValue("code") != 200) {
LOGGER.warn("updateReceiveInfo update buyer address not successful response, req {} result is {}",req, jsonObject);
return 0;
}
LOGGER.info("updateReceiveInfo buyer update address successful response, req {} result is {}",req, jsonObject);
oldInfo = buyerMeta.getMetaValue();
}
... ...
... ... @@ -165,7 +165,7 @@ $(function() {
iconCls : "icon-search",
onClick : function() {
var status = $("#status").val();
if(status==2||status==31){
if(status==1||status==2||status==31){
updateOrderInfo(orderCode);
}else{
alert("订单状态不允许更改数据！");
... ... @@ -323,7 +323,7 @@ function getOrderInfo(orderCode){
//收货信息
//鉴定前，买家可联系客服修改收货信息
if(result.data.status==2 ||result.data.status==31){
if(result.data.status==1 ||result.data.status==2 ||result.data.status==31){
$("#receiveName").html('<input id="input_receiveName" type="text" class="easyui-textbox" value="' + result.data.receiveName + '"/>');
$("#receiveMobile").html('<input id="input_receiveMobile" type="text" class="easyui-textbox" value="' + result.data.receiveMobile + '"/>');
$("#receiveAddressDetail").html('<input id="input_receiveAddressDetail" type="text" class="easyui-textbox" value="' + result.data.receiveAddressDetail + '"/>');
... ...