From ccf8413a33e85589d0ed219bd1a0aff88e6a1e39 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 15 Dec 2021 14:48:58 +0800
Subject: [PATCH] Merge branch 'score-shop' into xc-prd
---
gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java | 49 +++++++++++++++++++++++++------------------------
1 files changed, 25 insertions(+), 24 deletions(-)
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java b/gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java
index cdabb62..671a7db 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java
@@ -69,27 +69,27 @@
Long id = queryJhyOrderListVo.getId();
List<JhyOrderItemsVo> jhyOrderItemsVos = jhyOrderItemsMapper.selectByOrderId(id);
queryJhyOrderListVo.setJhyOrderItemsVos(jhyOrderItemsVos);
-
- String orderAddr = queryJhyOrderListVo.getArea() + queryJhyOrderListVo.getAddress();
- Long userId = queryJhyOrderListVo.getUserId();
- List<AddressInfo> addressInfos = jhyOrderMapper.selectAddRessInfoByUserId(userId);
- if(CollUtil.isNotEmpty(addressInfos)){
- for(AddressInfo addressInfo : addressInfos){
- 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() : "");
- }
- }
- if (orderAddr.equals(addressInfo.getAddressArea() + address)) {
- queryJhyOrderListVo.setUnitName(addressInfo.getUnitName());
- queryJhyOrderListVo.setHouseNumber(addressInfo.getHouseNumber());
- }
- }
- }
+//
+// String orderAddr = queryJhyOrderListVo.getArea() + queryJhyOrderListVo.getAddress();
+// Long userId = queryJhyOrderListVo.getUserId();
+// List<AddressInfo> addressInfos = jhyOrderMapper.selectAddRessInfoByUserId(userId);
+// if(CollUtil.isNotEmpty(addressInfos)){
+// for(AddressInfo addressInfo : addressInfos){
+// 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() : "");
+// }
+// }
+// if (orderAddr.equals(addressInfo.getAddressArea() + address)) {
+// queryJhyOrderListVo.setUnitName(addressInfo.getUnitName());
+// queryJhyOrderListVo.setHouseNumber(addressInfo.getHouseNumber());
+// }
+// }
+// }
}
}
// if(CollUtil.isNotEmpty(maps)){
@@ -117,7 +117,7 @@
List<JhyOrderItemsVo> jhyOrderItemsList = jhyOrderItemsMapper.selectJhyOrderItemListByOrderId(id);
if(CollUtil.isNotEmpty(jhyOrderItemsList)){
for(JhyOrderItemsVo jhyOrderItemsVo : jhyOrderItemsList){
- BigDecimal multiply = jhyOrderItemsVo.getPrice().multiply(new BigDecimal(40));
+ BigDecimal multiply = jhyOrderItemsVo.getPrice().multiply(new BigDecimal(50));
jhyOrderItemsVo.setPrice(multiply);
jhyOrderItemsVo.setAllPrice(new BigDecimal(StrUtil.isEmpty(jhyOrderItemsVo.getScore())?"0":jhyOrderItemsVo.getScore()).setScale( 2, BigDecimal.ROUND_DOWN ));
}
@@ -154,14 +154,15 @@
Integer jhyUserCnt = jhyOrderMapper.selectJhyOrderCnt(userId);
Integer allCnt = scoreOrderMapper.selectScoreOrderCnt(null);
+ Integer userCnt = scoreOrderMapper.selectScoreOrderCnt(userId);
BigDecimal score = jhyOrderMapper.selectTotalScoreHasGet(userId);
StatisticsVo result = new StatisticsVo();
result.setTotalReduceCarbon(allCarbon.divide(BigDecimal.valueOf(1000), 2, BigDecimal.ROUND_DOWN));
result.setReduceCarbon(userCarbon.setScale(2, BigDecimal.ROUND_DOWN));
- result.setOrderCnt(qsUserCnt + jhyUserCnt);
- result.setTotalOrderCnt(qsAllCnt + jhyAllCnt);
+ result.setOrderCnt(qsUserCnt + jhyUserCnt + userCnt);
+ result.setTotalOrderCnt(qsAllCnt + jhyAllCnt + allCnt);
result.setTotalBuyCnt(allCnt);
result.setScore(score);
--
Gitblit v1.9.1