From 0e5aaeba97021c289485a652ec6af0bb37f92af7 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Tue, 30 Nov 2021 20:29:46 +0800
Subject: [PATCH] fix 40 to 50
---
gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 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 0f52a1a..41d1839 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.getHouseName() + 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.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());
@@ -149,7 +156,7 @@
BigDecimal total = BigDecimal.ZERO;
for (JhyOrderItems item : items) {
- item.setPrice(item.getPrice().multiply(BigDecimal.valueOf(40)));
+ item.setPrice(item.getPrice().multiply(BigDecimal.valueOf(50)));
total = total.add(StrUtil.isNotBlank(item.getScore()) ? new BigDecimal(item.getScore()) : BigDecimal.ZERO);
}
@@ -229,7 +236,7 @@
orderItems.setItemType(item.getId());
orderItems.setTitle(environmentalInfo.getTitle());
orderItems.setPrice(new BigDecimal(environmentalInfo.getPrice()));
- BigDecimal total = orderItems.getPrice().multiply(BigDecimal.valueOf(40)).multiply(weight);
+ BigDecimal total = orderItems.getPrice().multiply(BigDecimal.valueOf(50)).multiply(weight);
orderItems.setScore(total.setScale(0, BigDecimal.ROUND_DOWN).toString());
orderItems.setWeight(weight);
jhyOrderItemsMapper.insert(orderItems);
@@ -283,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