...
|
...
|
@@ -2876,6 +2876,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService, ApplicationCon |
|
|
}
|
|
|
|
|
|
JSONObject data = body.getJSONObject("data");
|
|
|
data.put("payMethod", jsonReqObj.getInteger("payMethod"));
|
|
|
data.put("createTime", DateUtil.getCurrentTimeSeconds());
|
|
|
data.put("dContact", jsonReqObj.getString("dContact"));
|
|
|
data.put("dMobile", MobileHelper.coverMobile(jsonReqObj.getString("dMobile")));
|
...
|
...
|
@@ -2900,7 +2901,6 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService, ApplicationCon |
|
|
data.put("cargoInfo", "[衣服鞋帽]*1");
|
|
|
data.put("dWholeAddress", jsonReqObj.getString("dProvince") + jsonReqObj.getString("dCity") + jsonReqObj.getString("dDistrict") + jsonReqObj.getString("dAddress"));
|
|
|
data.put("cargoInfo", "[衣服鞋帽]*1");
|
|
|
data.put("payMethod", jsonReqObj.getInteger("payMethod"));
|
|
|
|
|
|
StorageDeposit deposit = storageDepositMapper.selectByOrderCode(req.getOrderCode());
|
|
|
data.put("region", RegionEnum.MAINLAND.getCode());
|
...
|
...
|
@@ -2948,7 +2948,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService, ApplicationCon |
|
|
throw new CommonException(500, "状态异常,当前状态是"+Constant.convertOrderStatusStr(order.getStatus()));
|
|
|
}
|
|
|
|
|
|
if(null != payMethod && !payMethod.equals(payMethodCache)) {
|
|
|
if(null != payMethodCache && !payMethod.equals(payMethodCache)) {
|
|
|
return null;
|
|
|
}
|
|
|
|
...
|
...
|
@@ -3415,9 +3415,9 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService, ApplicationCon |
|
|
jsonObj.put("cargo", cargoArr);
|
|
|
|
|
|
if(appraiseOrder.getStatus().equals(Constant.BUYER_ORDER_STATUS_APPRAISE_UNSURE.getByteVal())) {
|
|
|
jsonObj.replace("payMethod", PAY_METHOD_MONTHLY);
|
|
|
jsonObj.put("payMethod", PAY_METHOD_MONTHLY);
|
|
|
}else {
|
|
|
jsonObj.replace("payMethod", PAY_METHOD_FREIGHT_COLLECT);
|
|
|
jsonObj.put("payMethod", PAY_METHOD_FREIGHT_COLLECT);
|
|
|
}
|
|
|
|
|
|
//查询寄存信息
|
...
|
...
|
|