From e3ef391443a7b792d10f3565b6a49d6e27e9a519 Mon Sep 17 00:00:00 2001 From: xhxu Date: Sun, 5 Jul 2020 14:45:18 +0800 Subject: [PATCH] ceshi --- .../java/com/iformall/service/impl/WxBillAllServiceImpl.java | 4 +++- .../com/iformall/service/impl/WxBillPropertyServiceImpl.java | 4 +++- .../com/iformall/service/impl/WxBillRentServiceImpl.java | 4 +++- .../com/iformall/service/impl/WxCouponInjectServiceImpl.java | 4 +++- .../src/main/java/com/iformall/utils/car/TJDUtil.java | 5 ++++- 5 files changed, 16 insertions(+), 5 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index fb0f0a2fc..919b2ce68 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -361,7 +361,9 @@ public class WxBillAllServiceImpl implements WxBillAllService { StringBuffer sb = new StringBuffer(); Set> sets = jsonObject.entrySet(); sets.forEach(x -> sb.append(x.getKey()).append(",")); - wxBillAllVo.setShopNumber(sb.deleteCharAt(sb.length() - 1).toString()); + if(StringUtils.isNotBlank(sb)){ + wxBillAllVo.setShopNumber(sb.deleteCharAt(sb.length() - 1).toString()); + } } } wxBillAllVo.setPayDateStr(DateUtils.format(wxBillAllVo.getPayDate())); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java index d1d526d86..14f822c72 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java @@ -349,7 +349,9 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { StringBuffer sb = new StringBuffer(); Set> sets = jsonObject.entrySet(); sets.forEach(x -> sb.append(x.getKey()).append(",")); - property.setShopNumber(sb.deleteCharAt(sb.length() - 1).toString()); + if(StringUtils.isNotBlank(sb)){ + property.setShopNumber(sb.deleteCharAt(sb.length() - 1).toString()); + } } } datalist.add(property); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java index 2083ee835..af52ac455 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java @@ -455,7 +455,9 @@ public class WxBillRentServiceImpl implements WxBillRentService { StringBuffer sb = new StringBuffer(); Set> sets = jsonObject.entrySet(); sets.forEach(x -> sb.append(x.getKey()).append(",")); - rent.setShopNumber(sb.deleteCharAt(sb.length() - 1).toString()); + if(StringUtils.isNotBlank(sb)){ + rent.setShopNumber(sb.deleteCharAt(sb.length() - 1).toString()); + } } } datalist.add(rent); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponInjectServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponInjectServiceImpl.java index 9dc9a97e4..d20737372 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponInjectServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponInjectServiceImpl.java @@ -220,7 +220,9 @@ public class WxCouponInjectServiceImpl implements WxCouponInjectService { sb.append(phone).append(","); } } - wxmsg.setPhones(sb.deleteCharAt(sb.length()-1).toString()); + if(StringUtils.isNotBlank(sb)){ + wxmsg.setPhones(sb.deleteCharAt(sb.length()-1).toString()); + } if(wxmsg.getPhones().equals("")){ return new ResultData(ErrorCode.MSG_NO_VALID_PHONE); } diff --git a/mallinkService/src/main/java/com/iformall/utils/car/TJDUtil.java b/mallinkService/src/main/java/com/iformall/utils/car/TJDUtil.java index 741c2d792..d7f459d93 100644 --- a/mallinkService/src/main/java/com/iformall/utils/car/TJDUtil.java +++ b/mallinkService/src/main/java/com/iformall/utils/car/TJDUtil.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.iformall.enums.EnumCouponUnit; import com.iformall.utils.MapUtil; +import org.apache.commons.lang3.StringUtils; import org.apache.http.Consts; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; @@ -156,7 +157,9 @@ public class TJDUtil { sb.append(entry.getKey()).append("=").append(entry.getValue()).append("&"); } } - sb.deleteCharAt(sb.length()-1);// ? + if(StringUtils.isNotBlank(sb)){ + sb.deleteCharAt(sb.length()-1);// ? + } sb.append(keysign); logger.debug("签名前的字符串输出:"+sb.toString()); String signValue = md5(sb.toString()).toUpperCase();