diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantController.java index abf35b910..20751ad81 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantController.java @@ -55,7 +55,7 @@ public class WxMerchantController extends BaseController { public ResultData addAccount(@RequestBody WxMerchant wxMerchant) { log.debug("[" + getIpAddr() + "] merchantProfitSharingReceiver::addAccount"); if (!hasPermission()) { - return new ResultData(ErrorCode.USER_NO_PERMISSION); + return new ResultData(ErrorCode.USER_NO_PERMISSION.getCode(),"当前微信绑定的手机号不是商户的联系方式手机号,不能操作"); } if (wxMerchant.getId() == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "商户ID不能为空"); @@ -82,7 +82,7 @@ public class WxMerchantController extends BaseController { public ResultData deleteByReceiverId(@ModelAttribute WxProfitSharingReceiver receiver) { log.debug("[" + getIpAddr() + "] WxMerchantController::deleteByReceiverId"); if (!hasPermission()) { - return new ResultData(ErrorCode.USER_NO_PERMISSION); + return new ResultData(ErrorCode.USER_NO_PERMISSION.getCode(),"当前微信绑定的手机号不是商户的联系方式手机号,不能操作"); } if (receiver.getId() == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "商户分账账户ID不能为空"); diff --git a/mallinkBApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java b/mallinkBApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java index a9a337137..ea59e5abd 100644 --- a/mallinkBApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java +++ b/mallinkBApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java @@ -110,6 +110,9 @@ public class TenantInfoImpl implements TenantInfo { if ("wx_msg_validationcode_model".equals(tableName)) { return true; } + if ("wx_component_verify_ticket".equals(tableName)) { + return true; + } // wx_profit_sharing_receiver // wx_profit_sharing_result return false; @@ -177,6 +180,9 @@ public class TenantInfoImpl implements TenantInfo { if ("mem_coupon_from_dsp".equals(tableName)) { return true; } + if ("wx_component_verify_ticket".equals(tableName)) { + return true; + } return false; } diff --git a/mallinkCApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java b/mallinkCApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java index 5de282bfa..c89baef3b 100644 --- a/mallinkCApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java +++ b/mallinkCApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java @@ -110,6 +110,9 @@ public class TenantInfoImpl implements TenantInfo { if ("wx_msg_validationcode_model".equals(tableName)) { return true; } + if ("wx_component_verify_ticket".equals(tableName)) { + return true; + } // wx_profit_sharing_receiver // wx_profit_sharing_result return false; @@ -183,6 +186,9 @@ public class TenantInfoImpl implements TenantInfo { if ("mem_coupon_from_dsp".equals(tableName)) { return true; } + if ("wx_component_verify_ticket".equals(tableName)) { + return true; + } return false; } 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 14dceb4ef..934a4b6c1 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -693,7 +693,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { try { return wxCouponSendService.sendCouponToUser(EnumCouponSendSendType.COUPON_VERIFY, wxOrder,EnumPayWay.PAY_WAY_NOT_UNPAY_VERRIFY); } catch (Exception e) { - logger.error("核销发券: " + e.getMessage()); + logger.error("核销发券: " + e.getMessage(),e); } } return false;