ufo / ufo-platform · Commits

Go to a project

Authored by caoyan
Commit 150bd2d5d1eebfec005a09aa3f7d5fe63828847c 2 parents d6dfefb0 e031e0a6

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

Inline Side-by-side
Showing 2 changed files with 22 additions and 2 deletions
... ... @@ -865,7 +865,8 @@ public class AppraiseOrderServiceImpl implements IAppraiseOrderService {
if(appraiseOrder.getStatus().byteValue()==Constant.BUYER_ORDER_STATUS_JUDGE_PASS.getByteVal()
|| appraiseOrder.getStatus().byteValue()==Constant.BUYER_ORDER_STATUS_JUDGE_NOT_PASS.getByteVal()
|| appraiseOrder.getStatus().byteValue()==Constant.BUYER_ORDER_STATUS_APPRAISE_UNSURE.getByteVal()
|| appraiseOrder.getStatus().byteValue()==Constant.CANCEL_QUALITY_CHECK_FAKE.getByteVal()) {
|| appraiseOrder.getStatus().byteValue()==Constant.CANCEL_QUALITY_CHECK_FAKE.getByteVal()
|| appraiseOrder.getStatus().byteValue()==Constant.BUYER_ORDER_STATUS_JUDGE_PASS_WAIT_WAREHOUSE.getByteVal()) {
args = "orderAppraise.deliveryForAppraise";
}else{
throw new ServiceException(400,"错误：订单状态不合法，不允许平台寄回");
... ...
... ... @@ -18,6 +18,7 @@ import java.util.stream.Collectors;
import javax.annotation.Resource;
import com.yoho.ufo.order.service.IAppraiseOrderService;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang3.StringUtils;
... ... @@ -395,6 +396,9 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService, ApplicationCon
//瑕疵确认未通过
private static final Byte QC_STATUS_MINI_FAULT_REJECT = 6;
@Autowired
private IAppraiseOrderService iAppraiseOrderService;
//待处理
private static final List<Byte> receivedList = Lists.newArrayList(Constant.BUYER_ORDER_STATUS_ALLOCATING.getByteVal(),//卖家已发货
... ... @@ -2044,10 +2048,17 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService, ApplicationCon
// }
BuyerOrder buyerOrder = buyerOrderMapper.selectByOrderCode(req.getOrderCode());
if(null == buyerOrder) {
AppraiseOrder appraiseOrder = appraiseOrderMapper.selectByOrderCode(req.getOrderCode());
if(null == buyerOrder && null == appraiseOrder) {
throw new ServiceException(400,"错误：订单为空");
}
if (null != appraiseOrder) {
buyerOrder = new BuyerOrder();
buyerOrder.setOrderCode(req.getOrderCode());
buyerOrder.setStatus(appraiseOrder.getStatus());
}
//查看是否存在寄回的物流信息，如果存在，则不允许再次寄回
List<ExpressRecord> sellerExpressRecordList = expressRecordMapper.selectByOrderCodeListAndType(Lists.newArrayList(buyerOrder.getOrderCode()), Lists.newArrayList(EXPRESS_TYPE_JUDGE_TO_BUYER, EXPRESS_TYPE_JUDGE_TO_SELLER,EXPRESS_TYPE_RETURN_BACK_TO_SELLER));
if(CollectionUtils.isNotEmpty(sellerExpressRecordList)) {
... ... @@ -2070,6 +2081,14 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService, ApplicationCon
BuyerOrder buyerOrder = checkForPlatformExpress(req);
String args = "orderAppraise.deliveryGoodsToBuyer";
StorageDeposit deposit = storageDepositMapper.selectByOrderCode(buyerOrder.getOrderCode());
if (DepositSourceEnum.SOURCE_SPOT_GOODS.getCode().equals(deposit.getSource())) {
AppraiseOrderReq reqEx = new AppraiseOrderReq();
reqEx.setOrderCode(req.getOrderCode());
reqEx.setWaybillCode(req.getWaybillCode());
reqEx.setPhoneUid(req.getPhoneUid());
return iAppraiseOrderService.sendBackGoodsToSeller(reqEx);
}
//鉴定通过后或者用户接受瑕疵，可直接发货
if( (Constant.BUYER_ORDER_STATUS_JUDGE_PASS.getByteVal()!=buyerOrder.getStatus().byteValue()
... ...