...
|
...
|
@@ -3277,26 +3277,11 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService, ApplicationCon |
|
|
cargoArr.add(cargoObj);
|
|
|
jsonObj.put("cargo", cargoArr);
|
|
|
|
|
|
//鉴定服务订单
|
|
|
AppraiseOrder appraiseOrder = appraiseOrderMapper.selectByOrderCode(buyerOrder.getOrderCode());
|
|
|
if(null != appraiseOrder && appraiseOrder.getStatus().equals(Constant.BUYER_ORDER_STATUS_APPRAISE_UNSURE.getByteVal())) {
|
|
|
jsonObj.replace("payMethod", PAY_METHOD_MONTHLY);
|
|
|
}else {
|
|
|
jsonObj.replace("payMethod", PAY_METHOD_FREIGHT_COLLECT);
|
|
|
}
|
|
|
|
|
|
//查询寄存信息
|
|
|
StorageDeposit deposit = storageDepositMapper.selectByOrderCode(buyerOrder.getOrderCode());
|
|
|
|
|
|
//收件人信息
|
|
|
if(null != appraiseOrder && (appraiseOrder.getStatus().equals(Constant.BUYER_ORDER_STATUS_JUDGE_PASS.getByteVal())
|
|
|
|| appraiseOrder.getStatus().equals(Constant.BUYER_ORDER_STATUS_JUDGE_NOT_PASS.getByteVal())
|
|
|
|| appraiseOrder.getStatus().equals(Constant.BUYER_ORDER_STATUS_APPRAISE_UNSURE.getByteVal()))) {
|
|
|
AppraiseOrderMeta meta = appraiseOrderMetaMapper.selectAddress(appraiseOrder.getOrderCode());
|
|
|
JSONObject metaValue = JSONObject.parseObject(meta.getMetaValue());
|
|
|
buildSfAddressInfo(metaValue, jsonObj, appraiseOrder.getUid());
|
|
|
jsonObj.put("receiverType", "buyer");
|
|
|
}else if(buyerOrder.getStatus().equals(Constant.BUYER_ORDER_STATUS_JUDGE_PASS.getByteVal())
|
|
|
if(buyerOrder.getStatus().equals(Constant.BUYER_ORDER_STATUS_JUDGE_PASS.getByteVal())
|
|
|
|| buyerOrder.getStatus().equals(Constant.BUYER_ORDER_STATUS_MINI_FAULT_ACCEPT.getByteVal())) {//收件人为买家
|
|
|
BuyerOrderMeta buyerMeta = buyerOrderMetaMapper.selectByOrderCodeAndKey(buyerOrder.getOrderCode(), BUYER_ORDER_META_KEY_DELIVERY_ADDRESS);
|
|
|
JSONObject metaValue = JSONObject.parseObject(buyerMeta.getMetaValue());
|
...
|
...
|
|