From 47eed4a12fb0c1a908fde765932b77113b1afb07 Mon Sep 17 00:00:00 2001 From: xhxu Date: Sat, 14 May 2022 20:23:43 +0800 Subject: [PATCH] //add merchant --- .../V2022051400001__merchant_b_user_add_isadmin.sql | 2 ++ .../com/iformall/controller/WxMerchantController.java | 11 ++++++----- .../java/com/iformall/domain/po/WxMerchantBUser.java | 3 +++ .../iformall/service/impl/WxCouponServiceImpl.java | 3 ++- .../main/resources/mapper/WxMerchantBUserMapper.xml | 7 ++++++- 5 files changed, 19 insertions(+), 7 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V2022051400001__merchant_b_user_add_isadmin.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V2022051400001__merchant_b_user_add_isadmin.sql b/mallinkAdmin/src/main/resources/db/migration/V2022051400001__merchant_b_user_add_isadmin.sql new file mode 100644 index 000000000..b0fc870fd --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V2022051400001__merchant_b_user_add_isadmin.sql @@ -0,0 +1,2 @@ +ALTER TABLE `mallink`.`wx_merchant_b_user` +ADD COLUMN `is_admin` smallint(2) DEFAULT 1 AFTER `status`; \ No newline at end of file diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantController.java index fcf1a6d2a..7e9114bd4 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantController.java @@ -5,10 +5,7 @@ import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.domain.po.*; import com.iformall.douyin.pay.enums.AppAddSubMerchantUrlType; -import com.iformall.enums.EnumAppPlat; -import com.iformall.enums.EnumMsgSend; -import com.iformall.enums.EnumPayWay; -import com.iformall.enums.EnumProfitSharingType; +import com.iformall.enums.*; import com.iformall.service.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -151,7 +148,7 @@ public class WxMerchantController extends BaseController { } } - @RedisCache(expireTime = 30) + @RedisCache() @ApiOperation("获取进件/余额页面") @GetMapping("/getTtReceiverUrl") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) @@ -160,6 +157,10 @@ public class WxMerchantController extends BaseController { if(urlType == null || id == null){ return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"请检查传递参数"); } + if(!EnumYesOrNo.YES.getCode().equals(getLoginBUser().getIsAdmin())){ + return new ResultData(ErrorCode.SYS_AUTH_ERROR); + } + WxMerchant merchant = wxMerchantService.selectById(id); if(merchant == null){ return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"请检查传递参数"); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.java index afe88b928..3d81ccb13 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.java @@ -44,6 +44,9 @@ public class WxMerchantBUser extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "绑定状态1未绑定商户0已绑定商户", name = "status") private Integer status; + @io.swagger.annotations.ApiModelProperty(value = "是否是管理员", name = "isAdmin") + private Integer isAdmin; + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value = "b用户ID", name = "buserId") private transient Long buserId; 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 b2cb3871d..f24dfe495 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -373,7 +373,8 @@ public class WxCouponServiceImpl implements WxCouponService { } else { return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "请填写有效时间类型"); } - if(!this.validCouponDate(record)) { + if(!EnumCouponType.COUPON_DOUYIN.getCode().equals(record.getType()) + && !this.validCouponDate(record)) { return new ResultData(ResultData.ERROR,"券有效使用日期必须在30天以内。"); } } diff --git a/mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml index 76b2002bc..51f713ff1 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml @@ -15,10 +15,12 @@ + + - `id`,`tenant_id`,`parent_tenant_id`,`phone`,`user_pwd`,`merchant_id`,`create_date`,`update_date`,`app_id`,`token`,`expire_time`,`name`,`status` + `id`,`tenant_id`,`parent_tenant_id`,`phone`,`user_pwd`,`merchant_id`,`create_date`,`update_date`,`app_id`,`token`,`expire_time`,`name`,`status`,`is_admin` @@ -76,6 +78,9 @@ and `status` = #{status} + + and `is_admin` = #{isAdmin} + and id in