From caa737bfdcfad536fda4f6d8b5db9480b7996d25 Mon Sep 17 00:00:00 2001 From: hupeng Date: Mon, 6 May 2019 18:53:39 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=88=86=E8=B4=A6][=E4=BF=AE=E5=A4=8D]:?= =?UTF-8?q?=E5=8D=A1=E6=B6=88=E8=B4=B9=E6=97=B6,=E5=A6=82=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E9=85=8D=E7=BD=AE=E5=95=86=E6=88=B7=E8=B4=A6=E5=8F=B7?= =?UTF-8?q?,=E6=8F=90=E7=A4=BA=E4=B8=8D=E6=94=AF=E6=8C=81=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/common/ErrorCode.java | 6 +++--- .../com/iformall/service/impl/WxCouponOrderServiceImpl.java | 2 +- .../service/impl/WxProfitSharingOrderServiceImpl.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java index d331571b5..6c1374d18 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -246,13 +246,13 @@ public enum ErrorCode{ PROFIT_SHARING_RECEIVER_DEL_FAILED(12038, "分账账户删除失败"), PROFIT_SHARING_NUM_UP_LIMIT(12039, "分账次数超限"), PROFIT_SHARING_QUERY_UNKNOWN_TYPE(12040, "分账查询类型不支持"), - PROFIT_SHARING_UNSUPPORTED(12041, "支付方式不支持"), + PROFIT_SHARING_RECEIVER_UNKNOWN(12041, "收款方账户异常"), /** * 核销 */ VERIFY_ERROR(12050, "核销异常"), MSG_REPEAT_SEND(12061, "短信重复发送"), - VERIFY_COUPON_ORDER_MERANT_IS_NULL(12062, "卡券核销商户无权限"), + VERIFY_COUPON_ORDER_MERCHANT_IS_NULL(12062, "卡券核销失败,请查看适用门店"), /** * 解单 @@ -271,7 +271,7 @@ public enum ErrorCode{ * 短信 * * */ - MSG_SERVER_NOT_FIND(12100,"您还未接入短信运营商,请联系平台管理员"), + MSG_SERVER_NOT_FIND(12100,"您还未接入短信运营商,请联系平台管理员"), MSG_TEMPLATE_REPEAT(12101,"您添加的短信模板已存在"), MSG_SIGNATURE_CONTENT_ERROR(12102,"短信签名或内容错误"), MSG_TEMPLATE_CREATE_ERROR(12103,"创建模板失败"), diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index dfc141a03..314517839 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -301,7 +301,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { List couponMerchantList = wxCouponMerchantMapper.findList(wxCouponMerchant); if (!couponMerchantList.stream().anyMatch(cm->cm.getMerchantId().equals(wxMerchantBUser.getMerchantId()))){ logger.error("券: coupon-" + wxCoupon.getId() + "核销: couponMerchantId-" + wxMerchantBUser.getMerchantId()); - throw new MallinkException(ErrorCode.VERIFY_COUPON_ORDER_MERANT_IS_NULL); + throw new MallinkException(ErrorCode.VERIFY_COUPON_ORDER_MERCHANT_IS_NULL); } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java index 5b0e340cc..f0e867280 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java @@ -262,7 +262,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ if (sharingOrderDto.getType().equals(EnumProfitSharingOrderType.PROFIT_SHARING_SINGLE.getCode())) sharingOrderDto.setType(EnumProfitSharingOrderType.PROFIT_SHARING_SINGLE_FINISH.getCode()); if (sharingOrderDto.getType().equals(EnumProfitSharingOrderType.PROFIT_SHARING_MULTI.getCode())) - return new ResultData(ErrorCode.PROFIT_SHARING_UNSUPPORTED); + return new ResultData(ErrorCode.PROFIT_SHARING_RECEIVER_UNKNOWN); return finishSharingOrder(sharingOrderDto); }