From c50f2002f8e47fae55b628caa244904018477cb7 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 19 Nov 2021 14:48:49 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 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 fd5d6e7..e0d804d 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
@@ -108,9 +108,9 @@
}
}
- jhyOrder.setAddress(addressInfo.getDetailAddress()+addressInfo.getHouseName());
- 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 +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, "剩余积分不足");
}
@@ -282,6 +283,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