From 6c002508ad1de1d5e5c5fc37ee7a42bdabadf6e7 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 22 Nov 2021 10:16:37 +0800
Subject: [PATCH] 20211122
---
gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 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 88fa0f5..4ef021c 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
@@ -100,17 +100,24 @@
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() + order.getUnitName() + order.getHouseNumber();
+ String orderAddr = order.getArea()
+ + order.getAddress()
+ + (StrUtil.isEmpty(order.getUnitName())?"":order.getUnitName())
+ + (StrUtil.isEmpty(order.getHouseNumber())?"":order.getHouseNumber());
- if (orderAddr.equals(addressInfo.getAddressArea() + addressInfo.getDetailAddress() + addressInfo.getUnitName() + addressInfo.getHouseNumber())) {
+ if (orderAddr.equals(addressInfo.getAddressArea()
+ + addressInfo.getDetailAddress()
+ + (StrUtil.isEmpty(addressInfo.getHouseName())?"":addressInfo.getHouseName())
+ + (StrUtil.isEmpty(addressInfo.getUnitName())?"":addressInfo.getUnitName())
+ + (StrUtil.isEmpty(addressInfo.getHouseNumber())?"":addressInfo.getHouseNumber()))) {
throw new RestException(-3, "同一地址仅能有一单在进行中");
}
}
}
- jhyOrder.setAddress(addressInfo.getAddressArea()+addressInfo.getDetailAddress());
- jhyOrder.setUnitName(addressInfo.getUnitName());
- jhyOrder.setHouseNumber(addressInfo.getHouseNumber());
+ jhyOrder.setAddress(addressInfo.getDetailAddress()+(StrUtil.isEmpty(addressInfo.getHouseName())?"":addressInfo.getHouseName()));
+ jhyOrder.setUnitName(StrUtil.isEmpty(addressInfo.getUnitName())?"":addressInfo.getUnitName());
+ jhyOrder.setHouseNumber(StrUtil.isEmpty(addressInfo.getHouseNumber())?"":addressInfo.getHouseNumber());
jhyOrder.setUsername(addressInfo.getRelaName());
jhyOrder.setPhone(addressInfo.getMobilePhone());
jhyOrder.setLongitude(addressInfo.getLongitude());
@@ -240,6 +247,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, "剩余积分不足");
}
@@ -282,6 +290,8 @@
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("支付失败");
--
Gitblit v1.9.1