ufo / ufo-platform · Commits

Go to a project

Authored by csgyoho
Commit b7470a7524f4d0b318ee40ff0cb1ec4e07f13469 2 parents d36aa576 e790f1dd

Merge branch 'test6.8.3' of http://git.yoho.cn/ufo/ufo-platform into test6.8.3

Inline Side-by-side
Showing 1 changed file with 3 additions and 3 deletions
@@ -569,7 +569,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService { @@ -569,7 +569,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
569 int result = 1; 569 int result = 1;
570 BuyerOrder buyerOrder = buyerOrderMapper.selectByOrderCode(req.getOrderCode()); 570 BuyerOrder buyerOrder = buyerOrderMapper.selectByOrderCode(req.getOrderCode());
571 if(null == buyerOrder) { 571 if(null == buyerOrder) {
572 - return result; 572 + return 0;
573 } 573 }
574 574
575 int operateType = OPERATE_TYPE_UPDATE_SELLERWAYBILLCODE; 575 int operateType = OPERATE_TYPE_UPDATE_SELLERWAYBILLCODE;
@@ -580,14 +580,14 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService { @@ -580,14 +580,14 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
580 ExpressRecord sellerExpressRecord = expressRecordMapper.selectByOrderCodeAndType(buyerOrder.getOrderCode(), 580 ExpressRecord sellerExpressRecord = expressRecordMapper.selectByOrderCodeAndType(buyerOrder.getOrderCode(),
581 buyerOrder.getSellerUid(), EXPRESS_TYPE_SELLER_TO_JUDGE); 581 buyerOrder.getSellerUid(), EXPRESS_TYPE_SELLER_TO_JUDGE);
582 if(null == sellerExpressRecord) { 582 if(null == sellerExpressRecord) {
583 - return result; 583 + return 0;
584 } 584 }
585 JSONObject jo = new JSONObject(); 585 JSONObject jo = new JSONObject();
586 jo.put("sellerWaybillCode", sellerExpressRecord.getWaybillCode()); 586 jo.put("sellerWaybillCode", sellerExpressRecord.getWaybillCode());
587 oldInfo = jo.toJSONString(); 587 oldInfo = jo.toJSONString();
588 result = expressRecordMapper.updateWaybillCode(buyerOrder.getOrderCode(), 588 result = expressRecordMapper.updateWaybillCode(buyerOrder.getOrderCode(),
589 buyerOrder.getSellerUid(), EXPRESS_TYPE_SELLER_TO_JUDGE, req.getSellerWaybillCode()); 589 buyerOrder.getSellerUid(), EXPRESS_TYPE_SELLER_TO_JUDGE, req.getSellerWaybillCode());
590 - }else if(buyerOrder.getStatus().byteValue() < 2) {//卖家发货前，更新收货人信息 590 + }else if(buyerOrder.getStatus().byteValue() < 4) {//卖家发货前，更新收货人信息
591 operateType = OPERATE_TYPE_UPDATE_RECEIVE_INFO; 591 operateType = OPERATE_TYPE_UPDATE_RECEIVE_INFO;
592 BuyerOrderMeta buyerMeta = buyerOrderMetaMapper.selectByOrderCodeAndKey(req.getOrderCode(), BUYER_ORDER_META_KEY_DELIVERY_ADDRESS); 592 BuyerOrderMeta buyerMeta = buyerOrderMetaMapper.selectByOrderCodeAndKey(req.getOrderCode(), BUYER_ORDER_META_KEY_DELIVERY_ADDRESS);
593 if(null == buyerMeta) { 593 if(null == buyerMeta) {