From 73433dd196aeb2c09353920cbc5d8598bafa666c Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Tue, 28 Jun 2022 17:05:37 +0800 Subject: [PATCH 1/2] fix export --- .../com/iformall/controller/WxCouponOrderController.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java index f7b08ce25..e6cb5f6d7 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java @@ -473,11 +473,7 @@ public class WxCouponOrderController extends BaseController { public ResultData getVerifiedExportUrl(@ModelAttribute WxCouponOrderBVo wxCouponOrder) { //只有B端管理员才能操作这个 WxMerchantBUser buser = this.getLoginBUser(); - WxMerchant merchantQ= new WxMerchant(); - merchantQ.updateTenantInfo(buser); - merchantQ.setId(buser.getMerchantId()); - WxMerchant merchant = wxMerchantService.findOne(merchantQ); - if (!(buser.getPhone().equals(merchant.getLinkPhone()))) { + if (buser.getIsAdmin() != EnumYesOrNo.YES.getCode()) { return new ResultData(ErrorCode.SYS_SERVER_ERROR.getCode(),"只有商户管理员才能进行此操作"); } if (wxCouponOrder == null) wxCouponOrder = new WxCouponOrderBVo(); From 1cb0ba22f2af028cddf13b1ba19fb713c2b11460 Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Tue, 28 Jun 2022 17:09:20 +0800 Subject: [PATCH 2/2] fix bug --- .../java/com/iformall/controller/WxCouponOrderController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java index e6cb5f6d7..1555fa118 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java @@ -479,7 +479,7 @@ public class WxCouponOrderController extends BaseController { if (wxCouponOrder == null) wxCouponOrder = new WxCouponOrderBVo(); wxCouponOrder.updateTenantInfo(getTenantInfo()); StringBuffer sb = new StringBuffer("/api/couponOrder/unLogin/verifiedExport?verifyMerchantId=").append(buser.getMerchantId()) - .append("&tenantId="+wxCouponOrder.getTenantId()); + .append("&tenantId="+buser.getTenantId()); if (null != wxCouponOrder.getVerifyStartDate()) { sb.append("&verifyStartDate=").append(wxCouponOrder.getVerifyStartDate()); }