From c4d8357ad30bb39968279957d1fb594ef8dfdf5f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 10 Nov 2021 16:09:56 +0800
Subject: [PATCH] fix
---
gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java | 33 ++++++++++++++++++++-------------
1 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java b/gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java
index 1aefd95..dce33d3 100644
--- a/gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java
+++ b/gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java
@@ -87,29 +87,30 @@
jhyOrder.setOrderNo(orderNo);
jhyOrder.setArea(addressInfo.getAddressArea());
- StringBuffer address = new StringBuffer();
- address.append(addressInfo.getDetailAddress());
- if (StrUtil.isNotBlank(addressInfo.getTagName())) {
- address.append(StrUtil.isNotBlank(addressInfo.getHouseName()) ? addressInfo.getHouseName() : "");
- if (Constants.ADDRESS_TYPE_HOME.equals(addressInfo.getTagName())) {
- address.append(StrUtil.isNotBlank(addressInfo.getHouseNumber()) ? addressInfo.getHouseNumber() : "");
- address.append(StrUtil.isNotBlank(addressInfo.getUnitName()) ? addressInfo.getUnitName() : "");
- }
- }
+// StringBuffer address = new StringBuffer();
+// address.append(addressInfo.getDetailAddress());
+// if (StrUtil.isNotBlank(addressInfo.getTagName())) {
+// address.append(StrUtil.isNotBlank(addressInfo.getHouseName()) ? addressInfo.getHouseName() : "");
+// if (Constants.ADDRESS_TYPE_HOME.equals(addressInfo.getTagName())) {
+// address.append(StrUtil.isNotBlank(addressInfo.getHouseNumber()) ? addressInfo.getHouseNumber() : "");
+// address.append(StrUtil.isNotBlank(addressInfo.getUnitName()) ? addressInfo.getUnitName() : "");
+// }
+// }
List<JhyOrder> addressExist = jhyOrderMapper.selectJhyOrderListByStatus(StrUtil.split("1,2", ','), orderDto.getUserId());
if (CollUtil.isNotEmpty(addressExist)) {
for (JhyOrder order : addressExist) {
- String orderAddr = order.getArea() + order.getAddress();
+ String orderAddr = order.getArea() + order.getAddress() + order.getUnitName() + order.getHouseNumber();
- if (orderAddr.equals(addressInfo.getAddressArea() + address)) {
+ if (orderAddr.equals(addressInfo.getAddressArea() + addressInfo.getDetailAddress() + addressInfo.getHouseName() + addressInfo.getUnitName() + addressInfo.getHouseNumber())) {
throw new RestException(-3, "同一地址仅能有一单在进行中");
}
}
}
- jhyOrder.setAddress(address.toString());
-
+ jhyOrder.setAddress(addressInfo.getDetailAddress()+addressInfo.getHouseName());
+ jhyOrder.setUnitName(addressInfo.getUnitName());
+ jhyOrder.setHouseNumber(addressInfo.getHouseNumber());
jhyOrder.setUsername(addressInfo.getRelaName());
jhyOrder.setPhone(addressInfo.getMobilePhone());
jhyOrder.setLongitude(addressInfo.getLongitude());
@@ -158,6 +159,8 @@
detailsVo.setLongitude(order.getLongitude());
detailsVo.setLatitude(order.getLatitude());
detailsVo.setAddress(order.getArea() + order.getAddress());
+ detailsVo.setUnitName(order.getUnitName());
+ detailsVo.setHouseNumber(order.getHouseNumber());
detailsVo.setTotalPrice(total);
detailsVo.setItems(items);
return detailsVo;
@@ -237,6 +240,7 @@
JhyOrder order = jhyOrderMapper.selectByPrimaryKey(confirmDto.getOrderId());
AccountInfo jhyAccount = accountMapper.selectAccountInfoByUserId(order.getJhyId());
BigDecimal collectScore = StrUtil.isNotBlank(jhyAccount.getCollectScore()) ? new BigDecimal(jhyAccount.getCollectScore()) : BigDecimal.ZERO;
+ log.info("===={}======{}====", collectScore, totalScore);
if (totalScore.compareTo(collectScore) > 0) {
throw new RestException(-3, "剩余积分不足");
}
@@ -279,7 +283,10 @@
distribService.distribRecord(order.getId(), order.getUserId());
// 推荐返利
distribService.inviteAddOrderScore(order.getUserId(), order.getId().toString());
+ } catch (RestException e) {
+ throw new RestException(e.getMessage());
} catch (Exception e) {
+ log.error("异常", e);
throw new RestException("支付失败");
} finally {
redisUtil.del(key);
--
Gitblit v1.9.1