From 82f707ece09a906007f3d760b6bb025896e3bba6 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 22 四月 2026 15:39:36 +0800
Subject: [PATCH] 门店
---
server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java | 195 +++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 172 insertions(+), 23 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java
index 4e9ea0d..01df4f5 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java
@@ -294,7 +294,7 @@
return BigDecimal.ZERO;
}
String rateStr = systemDictDataBiz.queryByCode(Constants.OPERATION_CONFIG, Constants.OP_INSURANCE_RATE).getCode();
- BigDecimal rate = new BigDecimal(rateStr);
+ BigDecimal rate = new BigDecimal(rateStr).divide(new BigDecimal("100"), 4, BigDecimal.ROUND_HALF_UP);
return declaredValue.multiply(rate).setScale(2, BigDecimal.ROUND_HALF_UP);
}
@@ -342,9 +342,11 @@
List<Category> categories = categoryMapper.selectBatchIds(categoryIds);
Map<Integer, String> categoryNameMap = new HashMap<>();
Map<Integer, String> categoryDetailMap = new HashMap<>();
+ Map<Integer, String> categoryOtherFieldMap = new HashMap<>();
for (Category c : categories) {
categoryNameMap.put(c.getId(), c.getName());
categoryDetailMap.put(c.getId(), c.getDetail());
+ categoryOtherFieldMap.put(c.getId(),c.getOtherField());
}
// 璁＄畻姣忛」鐗╁搧璐圭敤锛氬皬璁� = 鍗曚环 脳 鏁伴噺 脳 澶╂暟
@@ -364,7 +366,7 @@
ItemPriceVO vo = new ItemPriceVO();
vo.setCategoryId(item.getCategoryId());
vo.setCategoryName(categoryNameMap.getOrDefault(item.getCategoryId(), ""));
- vo.setDetail(categoryDetailMap.get(item.getCategoryId()));
+ vo.setDetail(categoryOtherFieldMap.get(item.getCategoryId()));
vo.setQuantity(item.getQuantity());
vo.setUnitPrice(unitPrice);
vo.setLocallyPrice(unitPrice);
@@ -420,8 +422,11 @@
String to = dto.getToLat() + "," + dto.getToLgt();
JSONObject distanceResult = MapUtil.direction("driving", from, to);
BigDecimal distance = distanceResult.getBigDecimal("distance");
- // distance 鍗曚綅涓虹背锛岃浆涓哄叕閲�
+ // distance 鍗曚綅涓虹背锛岃浆涓哄叕閲岋紙涓嶈冻1鍏噷鎸�1鍏噷璁＄畻锛�
BigDecimal distanceKm = distance.divide(new BigDecimal(1000), 2, RoundingMode.HALF_UP);
+ if (distanceKm.compareTo(BigDecimal.ONE) < 0) {
+ distanceKm = BigDecimal.ONE;
+ }
// 鏀堕泦鎵�鏈夌墿鍝佺被鍨婭D
List<Integer> categoryIds = new ArrayList<>();
@@ -459,9 +464,11 @@
List<Category> categories = categoryMapper.selectBatchIds(categoryIds);
Map<Integer, String> categoryNameMap = new HashMap<>();
Map<Integer, String> categoryDetailMap = new HashMap<>();
+ Map<Integer, String> categoryOtherFieldMap = new HashMap<>();
for (Category c : categories) {
categoryNameMap.put(c.getId(), c.getName());
categoryDetailMap.put(c.getId(), c.getDetail());
+ categoryOtherFieldMap.put(c.getId(),c.getOtherField());
}
// 3. 閫愰」璁＄畻杩愯垂锛氳捣姝ヤ环 + 瓒呭嚭閮ㄥ垎闃舵浠�
@@ -500,7 +507,7 @@
ItemPriceVO vo = new ItemPriceVO();
vo.setCategoryId(item.getCategoryId());
vo.setCategoryName(categoryNameMap.getOrDefault(item.getCategoryId(), ""));
- vo.setDetail(categoryDetailMap.get(item.getCategoryId()));
+ vo.setDetail(categoryOtherFieldMap.get(item.getCategoryId()));
vo.setQuantity(item.getQuantity());
vo.setUnitPrice(unitPrice);
vo.setLocallyPrice(locallyPrice);
@@ -645,8 +652,11 @@
// ========== 3. 鏌ヨ瀵勪欢搴楅摵淇℃伅 ==========
ShopInfo depositShop = shopInfoMapper.selectById(dto.getDepositShopId());
- if (depositShop == null) {
+ if (depositShop == null || Constants.equalsInteger(depositShop.getDeleted(), Constants.ONE)) {
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵勪欢搴楅摵涓嶅瓨鍦�");
+ }
+ if (depositShop.getStatus() == null || !Constants.equalsInteger(depositShop.getStatus(), Constants.ZERO)) {
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵勪欢搴楅摵宸插仠涓氾紝璇烽�夋嫨鍏朵粬闂ㄥ簵");
}
// ========== 4. 璁＄畻璐圭敤 ==========
@@ -663,9 +673,15 @@
}
// 鍙栦欢鐐癸細搴楅摵 or 鑷�夌偣锛岃嚦灏戞彁渚涗竴缁�
if (dto.getTakeShopId() != null) {
+ if (dto.getTakeShopId().equals(dto.getDepositShopId())) {
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "寮傚湴瀵勫瓨璁㈠崟瀛樹欢闂ㄥ簵鍜屽彇浠堕棬搴椾笉鑳界浉鍚�");
+ }
takeShop = shopInfoMapper.selectById(dto.getTakeShopId());
- if (takeShop == null) {
+ if (takeShop == null || Constants.equalsInteger(takeShop.getDeleted(), Constants.ONE)) {
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鍙栦欢搴楅摵涓嶅瓨鍦�");
+ }
+ if (takeShop.getStatus() == null || !Constants.equalsInteger(takeShop.getStatus(), Constants.ONE)) {
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鍙栦欢搴楅摵宸插仠涓氾紝璇烽�夋嫨鍏朵粬闂ㄥ簵");
}
takeLat = BigDecimal.valueOf(takeShop.getLatitude());
takeLgt = BigDecimal.valueOf(takeShop.getLongitude());
@@ -764,6 +780,7 @@
orders.setTakeLat(takeLat);
orders.setTakeLgt(takeLgt);
orders.setIsUrgent(dto.getIsUrgent());
+ orders.setDistance(priceResult.getDistance());
} else {
// 灏卞湴锛氬彇浠剁偣鍚屽瘎浠跺簵閾�
orders.setTakeShopId(dto.getDepositShopId());
@@ -775,7 +792,12 @@
// 鐗╁搧淇℃伅
orders.setGoodType(dto.getGoodType());
- orders.setGoodLevel(goodTypeCategory.getRelationId());
+ // 鏌ヨ鐗╁搧绾у埆 type = 3
+ Category levelCategory = categoryMapper.selectById(goodTypeCategory.getRelationId());
+ if(Objects.isNull(levelCategory)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鐗╁搧绛夌骇淇℃伅锛歿}"+goodTypeCategory.getName());
+ }
+ orders.setGoodLevel(Integer.valueOf(levelCategory.getDetail()));
// 鎷兼帴鐗╁搧淇℃伅锛氱墿鍝佺被鍨嬪悕绉般�佸昂瀵稿悕绉�*鏁伴噺锛堟暟缁勫瓧绗︿覆锛�
List<String> goodsParts = new ArrayList<>();
for (ItemPriceVO itemVO : priceResult.getItemList()) {
@@ -797,7 +819,6 @@
}
orders.setDeclaredFee(priceResult.getInsuranceFee());
orders.setPrice(priceResult.getItemPrice());
-
// 钖叕璁＄畻涓庡崰姣斿瓨鍌�
calculateAndSetFeeAllocation(orders, depositShop, takeShop);
@@ -1172,9 +1193,9 @@
item.setLuggageName(d.getLuggageName());
item.setLuggageDetail(d.getLuggageDetail());
item.setNum(d.getNum());
- double unitPriceYuan = d.getUnitPrice() != null ? Constants.getFormatMoney(d.getUnitPrice()) : 0;
- item.setUnitPriceYuan(unitPriceYuan);
- item.setSubtotal(unitPriceYuan * (d.getNum() != null ? d.getNum() : 0));
+ long unitPriceFen = d.getUnitPrice() != null ? d.getUnitPrice() : 0L;
+ item.setUnitPrice(unitPriceFen);
+ item.setSubtotal(unitPriceFen * (d.getNum() != null ? d.getNum() : 0));
items.add(item);
}
}
@@ -1307,8 +1328,9 @@
.eq(PricingRule::getCityId, cityId)
.eq(PricingRule::getFieldA, String.valueOf(fieldA))
.last("limit 1"));
- if (rule != null && StringUtils.isNotBlank(rule.getFieldC())) {
- return new BigDecimal(rule.getFieldC());
+ if (rule != null && StringUtils.isNotBlank(rule.getFieldB())) {
+ // fieldB 瀛樺偍鐨勬槸鐧惧垎姣旀暣鏁帮紙濡�15琛ㄧず15%锛夛紝杞崲涓哄皬鏁版瘮渚嬶紙0.15锛�
+ return new BigDecimal(rule.getFieldB()).divide(new BigDecimal("100"), 4, BigDecimal.ROUND_HALF_UP);
}
return BigDecimal.ZERO;
}
@@ -1357,16 +1379,22 @@
vo.setCode(o.getCode());
vo.setType(o.getType());
vo.setStatus(o.getStatus());
+ vo.setStatusName(Constants.OrderStatus.getDescByKey(o.getStatus(),
+ Constants.equalsInteger(o.getType(), Constants.ZERO)?o.getType():Objects.nonNull(o.getTakeShopId())?Constants.ONE:Constants.TWO)
+ );
vo.setCreateTime(o.getCreateTime());
vo.setExpectedTakeTime(o.getExpectedTakeTime());
+ vo.setMemberVerifyCode(o.getMemberVerifyCode());
// 瀛樹欢闂ㄥ簵锛堝叧鑱旀煡璇㈢洿鎺ュ彇鍊硷級
+ vo.setDepositShopId(o.getDepositShopId());
vo.setDepositShopName(o.getDepositShopName());
vo.setDepositShopLinkName(o.getDepositShopLinkName());
vo.setDepositShopPhone(o.getDepositShopLinkPhone());
// 鍙栦欢淇℃伅锛氭湁鍙栦欢闂ㄥ簵鍙栭棬搴楋紝鏃犲垯鍙栫敤鎴疯嚜閫夊彇浠剁偣
if (o.getTakeShopId() != null) {
+ vo.setTakeShopId(o.getTakeShopId());
vo.setTakeShopName(o.getTakeShopName());
vo.setTakeShopAddress(o.getTakeShopAddress());
} else {
@@ -1381,6 +1409,9 @@
// 璐圭敤锛堝垎锛�
vo.setDeclaredFee(o.getDeclaredFee());
vo.setEstimatedAmount(o.getEstimatedAmount());
+
+ // 璇勪环鐘舵��
+ vo.setCommentStatus(o.getCommentStatus());
// 鏌ヨ鐗╁搧鏄庣粏锛堜竴娆℃煡璇紝鍚屾椂鐢ㄤ簬鐗╁搧鍒楄〃鍜岄�炬湡璁＄畻锛�
List<OrdersDetail> details = ordersDetailMapper.selectList(
@@ -1454,6 +1485,9 @@
vo.setCode(o.getCode());
vo.setType(o.getType());
vo.setStatus(o.getStatus());
+ vo.setStatusName(Constants.OrderStatus.getDescByKey(o.getStatus(),
+ Constants.equalsInteger(o.getType(), Constants.ZERO)?o.getType():Objects.nonNull(o.getTakeShopId())?Constants.ONE:Constants.TWO)
+ );
vo.setCreateTime(o.getCreateTime());
vo.setExpectedTakeTime(o.getExpectedTakeTime());
@@ -1669,11 +1703,6 @@
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
- // 浠呭紓鍦板瘎瀛樺彲鍙栨秷
- if (!Constants.equalsInteger(order.getType(), Constants.ONE)) {
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "浠呭紓鍦板瘎瀛樿鍗曞彲鍙栨秷");
- }
-
Integer status = order.getStatus();
if (status == null) {
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "璁㈠崟鐘舵�佸紓甯�");
@@ -1681,7 +1710,7 @@
Date now = new Date();
- // 寰呮敮浠橈細鐩存帴鍙栨秷
+ // 寰呮敮浠橈細鐩存帴鍙栨秷锛堜笉闄愯鍗曠被鍨嬶級
if (Constants.equalsInteger(status, Constants.OrderStatus.waitPay.getStatus())) {
order.setStatus(Constants.OrderStatus.cancelled.getStatus());
order.setCancelTime(now);
@@ -1690,7 +1719,7 @@
return;
}
- // 寰呭瘎瀛橈細鐩存帴鍙栨秷锛屽叏棰濋��娆�
+ // 寰呭瘎瀛橈細鐩存帴鍙栨秷锛屽叏棰濋��娆撅紙涓嶉檺璁㈠崟绫诲瀷锛�
if (Constants.equalsInteger(status, Constants.OrderStatus.waitDeposit.getStatus())) {
// 璁板綍閫�娆句俊鎭�
OrdersRefund refund = new OrdersRefund();
@@ -1719,6 +1748,11 @@
return;
}
+ // 宸插瘎瀛�/宸叉帴鍗曪細浠呭紓鍦板瘎瀛樺彲鍙栨秷
+ if (!Constants.equalsInteger(order.getType(), Constants.ONE)) {
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "浠呭紓鍦板瘎瀛樿鍗曞彲鍙栨秷");
+ }
+
// 宸插瘎瀛�/宸叉帴鍗曪細杩涘叆鍙栨秷涓姸鎬�
if (Constants.equalsInteger(status, Constants.OrderStatus.deposited.getStatus())
|| Constants.equalsInteger(status, Constants.OrderStatus.accepted.getStatus())) {
@@ -1729,6 +1763,11 @@
// 閫氱煡瀛樹欢闂ㄥ簵锛氶��娆剧敵璇�
if (order.getDepositShopId() != null) {
sendShopNotice(order.getDepositShopId(), Constants.ShopOrderNotify.REFUNDING, orderId,
+ "orderNo", order.getCode());
+ }
+ // 閫氱煡鍙告満锛氳鍗曢��娆句腑锛堝凡鎺ュ崟鎯呭喌涓嬪徃鏈洪渶鍋滄鏈嶅姟锛�
+ if (order.getAcceptDriver() != null && Constants.equalsInteger(order.getStatus(), Constants.OrderStatus.accepted.getStatus())) {
+ sendDriverNotice(order.getAcceptDriver(), Constants.DriverOrderNotify.REFUNDING, orderId,
"orderNo", order.getCode());
}
return;
@@ -1817,6 +1856,27 @@
}
}
+ /**
+ * 鍙戦�佸徃鏈虹珯鍐呬俊閫氱煡
+ */
+ private void sendDriverNotice(Integer driverId, Constants.DriverOrderNotify notify, Integer orderId, String... params) {
+ DriverInfo driver = driverInfoMapper.selectById(driverId);
+ if (driver == null || driver.getMemberId() == null) {
+ return;
+ }
+ Notice notice = new Notice();
+ notice.setUserType(1); // 1=鍙告満
+ notice.setUserId(driver.getMemberId());
+ notice.setTitle(notify.getTitle());
+ notice.setContent(notify.format(params));
+ notice.setObjId(orderId);
+ notice.setObjType(0); // 0=璁㈠崟
+ notice.setStatus(0); // 0=鏈
+ notice.setIsdeleted(Constants.ZERO);
+ notice.setCreateDate(new Date());
+ noticeService.create(notice);
+ }
+
@Override
@Transactional(rollbackFor = {Exception.class, BusinessException.class})
public void handleStorageOrderPayNotify(String outTradeNo, String wxTradeNo) {
@@ -1836,6 +1896,7 @@
order.setPayStatus(Constants.ONE); // 宸叉敮浠�
order.setPayTime(now);
order.setWxExternalNo(wxTradeNo);
+ order.setPayAmount(order.getTotalAmount());
order.setUpdateTime(now);
// 鐢熸垚浼氬憳鏍搁攢鐮�
order.setMemberVerifyCode(generateVerifyCode());
@@ -1981,9 +2042,10 @@
@Override
@Transactional(rollbackFor = {Exception.class, BusinessException.class})
- public PayResponse payShopDeposit(Integer shopId) {
+ public PayResponse payShopDeposit(Integer memberId) {
// 1. 鏌ヨ闂ㄥ簵淇℃伅
- ShopInfo shopInfo = shopInfoMapper.selectById(shopId);
+ ShopInfo shopInfo = shopInfoMapper.selectOne(new QueryWrapper<ShopInfo>().lambda()
+ .eq(ShopInfo::getRegionMemberId,memberId));
if (shopInfo == null) {
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "闂ㄥ簵涓嶅瓨鍦�");
}
@@ -2007,7 +2069,7 @@
otherOrders.setMemberId(shopInfo.getRegionMemberId());
otherOrders.setPayAccount(shopInfo.getDepositAmount());
otherOrders.setPayStatus(Constants.ZERO);
- otherOrders.setCode("SD" + new java.text.SimpleDateFormat("yyyyMMddHHmmss").format(now) + shopId);
+ otherOrders.setCode("SD" + new java.text.SimpleDateFormat("yyyyMMddHHmmss").format(now) + shopInfo.getId());
otherOrders.setOutTradeNo(outTradeNo);
otherOrders.setDeleted(Constants.ZERO);
otherOrders.setCreateTime(now);
@@ -2158,6 +2220,14 @@
"orderNo", order.getCode(),
"amount", String.valueOf(Constants.getFormatMoney(
order.getTotalAmount() != null ? order.getTotalAmount() : 0L)));
+
+ // 閫氱煡鍙告満锛氳鍗曞凡缁撶畻
+ if (order.getAcceptDriver() != null) {
+ sendDriverNotice(order.getAcceptDriver(), Constants.DriverOrderNotify.SETTLED, order.getId(),
+ "orderNo", order.getCode(),
+ "amount", String.valueOf(Constants.getFormatMoney(
+ order.getDriverFee() != null ? order.getDriverFee() : 0L)));
+ }
}
}
@@ -2262,6 +2332,12 @@
// 閫氱煡瀛樹欢闂ㄥ簵鍜屽彇浠堕棬搴楋細璁㈠崟宸茶瘎浠�
notifyBothShops(order, Constants.ShopOrderNotify.EVALUATED,
"orderNo", order.getCode());
+
+ // 閫氱煡鍙告満锛氳鍗曞凡璇勪环
+ if (order.getAcceptDriver() != null) {
+ sendDriverNotice(order.getAcceptDriver(), Constants.DriverOrderNotify.EVALUATED, order.getId(),
+ "orderNo", order.getCode());
+ }
}
/**
@@ -2404,6 +2480,12 @@
notifyBothShops(order, Constants.ShopOrderNotify.FINISHED,
"orderNo", order.getCode(),
"settleDays", settleDays != null ? settleDays : "7");
+ // 閫氱煡鍙告満锛氳鍗曞凡瀹屾垚
+ if (order.getAcceptDriver() != null) {
+ sendDriverNotice(order.getAcceptDriver(), Constants.DriverOrderNotify.FINISHED, order.getId(),
+ "orderNo", order.getCode(),
+ "settleDays", settleDays != null ? settleDays : "7");
+ }
} else {
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "褰撳墠璁㈠崟鐘舵�佷笉鍏佽鏍搁攢");
}
@@ -2509,6 +2591,12 @@
notifyBothShops(order, Constants.ShopOrderNotify.FINISHED,
"orderNo", order.getCode(),
"settleDays", settleDays != null ? settleDays : "7");
+ // 閫氱煡鍙告満锛氳鍗曞凡瀹屾垚
+ if (order.getAcceptDriver() != null) {
+ sendDriverNotice(order.getAcceptDriver(), Constants.DriverOrderNotify.FINISHED, order.getId(),
+ "orderNo", order.getCode(),
+ "settleDays", settleDays != null ? settleDays : "7");
+ }
}
@Override
@@ -2555,6 +2643,12 @@
notifyBothShops(order, Constants.ShopOrderNotify.FINISHED,
"orderNo", order.getCode(),
"settleDays", settleDays != null ? settleDays : "7");
+ // 閫氱煡鍙告満锛氳鍗曞凡瀹屾垚
+ if (order.getAcceptDriver() != null) {
+ sendDriverNotice(order.getAcceptDriver(), Constants.DriverOrderNotify.FINISHED, order.getId(),
+ "orderNo", order.getCode(),
+ "settleDays", settleDays != null ? settleDays : "7");
+ }
}
@Override
@@ -3121,6 +3215,61 @@
}
@Override
+ public ActiveOrderTipVO getActiveOrderTip(Integer memberId) {
+ // 鏌ヨ鐘舵�佷负 0~5 鐨勬渶鏂颁竴鏉¤鍗�
+ QueryWrapper<Orders> wrapper = new QueryWrapper<>();
+ wrapper.eq("MEMBER_ID", memberId)
+ .in("STATUS", 0, 1, 2, 3, 4, 5)
+ .orderByDesc("CREATE_TIME")
+ .last("LIMIT 1");
+ Orders order = ordersMapper.selectOne(wrapper);
+ if (order == null) {
+ return null;
+ }
+
+ ActiveOrderTipVO vo = new ActiveOrderTipVO();
+ vo.setOrderId(order.getId());
+ vo.setStatus(order.getStatus());
+
+ // 鏋勫缓鎻愮ず鏂囨
+ boolean isLocal = Constants.equalsInteger(order.getType(), Constants.ZERO);
+ Integer status = order.getStatus();
+ String tip = null;
+
+ if (Constants.equalsInteger(status, Constants.OrderStatus.waitPay.getStatus())) {
+ // 寰呮敮浠橈細鎻愮ず鏀粯鍊掕鏃�
+ String minutes = "";
+ try {
+ minutes = operationConfigBiz.getConfig().getAutoCancelTime();
+ } catch (Exception ignored) {}
+ tip = "璇峰湪" + (StringUtils.isNotBlank(minutes) ? minutes : "") + "鍒嗛挓鍐呭畬鎴愭敮浠橈紝瓒呮椂璁㈠崟灏嗚嚜鍔ㄥ彇娑�";
+
+ // 璁＄畻鏀粯鍊掕鏃�
+ if (StringUtils.isNotBlank(minutes) && order.getCreateTime() != null) {
+ long timeoutMs = Long.parseLong(minutes) * 60 * 1000;
+ long deadline = order.getCreateTime().getTime() + timeoutMs;
+ long remain = deadline - System.currentTimeMillis();
+ vo.setPayCountdown(remain > 0 ? remain : -1L);
+ } else {
+ vo.setPayCountdown(-1L);
+ }
+ } else if (Constants.equalsInteger(status, Constants.OrderStatus.waitDeposit.getStatus())) {
+ tip = "璁㈠崟宸叉敮浠橈紝璇峰墠寰�闂ㄥ簵瀵勫瓨";
+ } else if (Constants.equalsInteger(status, Constants.OrderStatus.deposited.getStatus())) {
+ tip = isLocal ? "琛屾潕宸插瘎瀛橈紝璇峰嚟鍙栦欢鐮佸墠寰�鎸囧畾闂ㄥ簵鍙栦欢" : "闂ㄥ簵宸叉帴鍗曪紝姝ｅ湪涓烘偍瀹夋帓鍙栦欢鍙告満";
+ } else if (Constants.equalsInteger(status, Constants.OrderStatus.accepted.getStatus())) {
+ tip = isLocal ? "琛屾潕宸插瘎瀛橈紝璇峰嚟鍙栦欢鐮佸墠寰�鎸囧畾闂ㄥ簵鍙栦欢" : "宸叉湁鍙告満鎶㈠崟锛屾鍓嶅線鍙栦欢鍦扮偣";
+ } else if (Constants.equalsInteger(status, Constants.OrderStatus.delivering.getStatus())) {
+ tip = "鍙告満宸插彇浠讹紝姝ｈ繍寰�鐩殑鍦�";
+ } else if (Constants.equalsInteger(status, Constants.OrderStatus.arrived.getStatus())) {
+ tip = "琛屾潕宸查�佽揪鏈嶅姟鐐癸紝璇峰強鏃跺墠寰�鍙栦欢";
+ }
+
+ vo.setTip(tip);
+ return vo;
+ }
+
+ @Override
public EstimatedDeliveryResultVO calculateEstimatedDelivery(Integer cityId,
Double fromLat, Double fromLng,
Double toLat, Double toLng) {
--
Gitblit v1.9.3