From 15f3d746a7b86bb8f40a7bd5b32698263fa2a839 Mon Sep 17 00:00:00 2001
From: yechenhao <yechenhao>
Date: Fri, 29 May 2020 00:07:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=AE=A2=E6=88=B7=E5=AF=BC?=
 =?UTF-8?q?=E8=B4=AD=E5=85=B3=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/kiisoo/ic/customer/CustomerService.java   | 4 ++--
 .../kiisoo/ic/store/service/StorePromotionDataService.java  | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/kiisoo/ic/customer/CustomerService.java b/src/main/java/com/kiisoo/ic/customer/CustomerService.java
index 124f981..4e3c83f 100644
--- a/src/main/java/com/kiisoo/ic/customer/CustomerService.java
+++ b/src/main/java/com/kiisoo/ic/customer/CustomerService.java
@@ -230,12 +230,12 @@ public class CustomerService {
     private void handleAddCustomer(TurnBackDTO turnBackDTOS) throws Exception {
         log.info(new Gson().toJson(turnBackDTOS));
         OpCustomer opCustomer = null;
-        if (turnBackDTOS.getWxData().getUnionId() == null && turnBackDTOS.getWxData().getUserId() != null) {
+        if (StringUtils.isBlank(turnBackDTOS.getWxData().getUnionId())  && StringUtils.isNotBlank(turnBackDTOS.getWxData().getUserId())) {
             //此时说明是企业微信扫码添加
             QueryWrapper<OpCustomer> customerWrapper = new QueryWrapper<>();
             customerWrapper.eq("external_userid", turnBackDTOS.getWxData().getUserId()).last("limit 1");
             opCustomer = opCustomerDOMapper.selectOne(customerWrapper);
-        } else if (turnBackDTOS.getWxData().getUnionId() != null && turnBackDTOS.getUserId() != null) {
+        } else if (StringUtils.isNotBlank(turnBackDTOS.getWxData().getUnionId())  && StringUtils.isNotBlank(turnBackDTOS.getWxData().getUserId())) {
             //客户信息
             QueryWrapper<OpCustomer> customerWrapper = new QueryWrapper<>();
             customerWrapper.eq("wechat_uni_id", turnBackDTOS.getWxData().getUnionId()).last("limit 1");
diff --git a/src/main/java/com/kiisoo/ic/store/service/StorePromotionDataService.java b/src/main/java/com/kiisoo/ic/store/service/StorePromotionDataService.java
index ed76f74..a2d84e9 100644
--- a/src/main/java/com/kiisoo/ic/store/service/StorePromotionDataService.java
+++ b/src/main/java/com/kiisoo/ic/store/service/StorePromotionDataService.java
@@ -47,6 +47,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -335,6 +336,11 @@ public class StorePromotionDataService {
                 if (poiStore == null){
                     return;
                 }
+                Float replyPercentage = result.getReplyPercentage();
+                BigDecimal replyPercentageBigDecimal = new BigDecimal(replyPercentage).setScale(0, BigDecimal.ROUND_HALF_UP);
+                replyPercentage = replyPercentageBigDecimal.floatValue();
+                result.setReplyPercentage(replyPercentage);
+
                 result.setStoreName(poiStore.getName());
                 result.setStoreCode(poiStore.getCode());
                 result.setAddress(poiStore.getAddress());