From 0d75697eb6bd293480a7461b761f1d3f703a08bf Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 6 May 2019 11:35:19 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=88=B8][=E4=BF=AE=E6=94=B9][=E5=88=B8?= =?UTF-8?q?=E6=97=B6=E6=9C=89=E4=BB=B7=E5=88=B8=E5=88=A4=E6=96=AD=E5=95=86?= =?UTF-8?q?=E6=88=B7=E6=98=AF=E5=90=A6=E9=85=8D=E7=BD=AE=E4=BA=86=E5=88=86?= =?UTF-8?q?=E8=B4=A6=E8=B4=A6=E5=8F=B7]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/WxCouponServiceImpl.java | 8 ++++++-- .../src/main/resources/mapper/WxMerchantMapper.xml | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java index 72696425d..45c8f967e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -209,6 +209,7 @@ public class WxCouponServiceImpl implements WxCouponService { //有价券判断商户是否配置了分账账号 if (record.getSalePrice() > 0) { StringBuffer sb = new StringBuffer(); + boolean flag = false; for (int i = 0, size = merchantParamList.size(); i < size; i++) { JSONObject jsonObject = merchantParamList.get(i); Long id = jsonObject.getLong("id"); @@ -216,11 +217,14 @@ public class WxCouponServiceImpl implements WxCouponService { wxMerchant.setId(id); WxMerchant merchant = wxMerchantMapper.queryMerchantByMerchantIdOfSharingReceiver(wxMerchant); if (merchant.getId() == null) { + flag = true; sb.append("[").append(merchant.getName()).append("]"); } } - String message = sb.toString(); - return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "商户:" + message + "还未配置分账账户"); + if (flag) { + String message = sb.toString(); + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "商户:" + message + "还未配置分账账户"); + } } final IdWorker idWorker = IdWorker.get(); diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index 2ab18fa09..641b86fc3 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -211,7 +211,7 @@