From 1413253e1fa4a1a9a2667b6a65668c6f3b4796f5 Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 4 Jun 2021 17:29:32 +0800 Subject: [PATCH] tt --- .../java/com/iformall/domain/po/WxMall.java | 5 ++- .../main/resources/mapper/TtCouponMapper.xml | 14 ++++++-- .../main/resources/mapper/WxMallMapper.xml | 4 ++- .../resources/mapper/WxMerchantMapper.xml | 14 ++++++-- .../controller/basic/WxMallController.java | 36 +++++++++++++++++++ 5 files changed, 67 insertions(+), 6 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java index 25480e5f8..5842e7a25 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java @@ -160,7 +160,7 @@ public class WxMall extends TenantEntity { } } - @io.swagger.annotations.ApiModelProperty(value="管理员姓名",name="adminName") + @io.swagger.annotations.ApiModelProperty(value="管理员Id",name="adminId") @TableField(exist = false) private Long adminId; @@ -179,6 +179,9 @@ public class WxMall extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="管理员登陆密码",name="adminPassword") private String adminPassword; + @io.swagger.annotations.ApiModelProperty(value="1:有效,0:禁止登录",name="adminStatus") + private Integer adminStatus; + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="查询-开始时间",name="startTime") private Date startTime; diff --git a/mallinkService/src/main/resources/mapper/TtCouponMapper.xml b/mallinkService/src/main/resources/mapper/TtCouponMapper.xml index d775bb05f..03fedde68 100644 --- a/mallinkService/src/main/resources/mapper/TtCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/TtCouponMapper.xml @@ -107,7 +107,12 @@ - and c.`mark` = #{mark} + + and (c.`mark` is null or m.`mark` <> 1) + + + and c.`mark` = 1 + @@ -161,7 +166,12 @@ and c.`status` = #{status} - and c.`mark` = #{mark} + + and (c.`mark` is null or m.`mark` <> 1) + + + and c.`mark` = 1 + and c.`business_id` = #{businessId} diff --git a/mallinkService/src/main/resources/mapper/WxMallMapper.xml b/mallinkService/src/main/resources/mapper/WxMallMapper.xml index 40e6f0c39..91199f7c2 100644 --- a/mallinkService/src/main/resources/mapper/WxMallMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMallMapper.xml @@ -46,6 +46,8 @@ + + @@ -232,7 +234,7 @@ select m.`id`,m.`tenant_id`,m.`parent_tenant_id`,m.`name`,m.`group`,m.`country`,m.`province`,m.`city`,m.`addr`, m.`service_phone`,m.`valid_start`, m.`valid_end`, - mui.`id` admin_id,mui.`username` admin_username,mui.`name` admin_name,mui.`phone` admin_phone + mui.`id` admin_id,mui.`username` admin_username,mui.`name` admin_name,mui.`phone` admin_phone,mui.status admin_status from wx_mall m left join mall_user_info mui on m.tenant_id = mui.tenant_id and mui.is_admin = 1 where 1=1 diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index 2c31db686..353413112 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -135,7 +135,12 @@ and m.`is_admin` = #{isAdmin} - and m.`mark` = #{mark} + + and (m.`mark` is null or m.`mark` <> 1) + + + and m.`mark` = 1 + and m.`is_del` = #{isDel} @@ -359,7 +364,12 @@ and m.`is_admin` = #{isAdmin} - and m.`mark` = #{mark} + + and (m.`mark` is null or m.`mark` <> 1) + + + and m.`mark` = 1 + and m.`is_del` = #{isDel} diff --git a/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxMallController.java b/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxMallController.java index 1fa3a3d05..707fabcbf 100644 --- a/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxMallController.java +++ b/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxMallController.java @@ -7,8 +7,11 @@ import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxMall; +import com.iformall.domain.po.base.TenantEntity; +import com.iformall.enums.EnumYesOrNo; import com.iformall.service.WxMallService; import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -40,6 +43,39 @@ public class WxMallController extends BaseController { } } + @ApiOperation("查询商场集团列表") + @PostMapping("addAadmin") + @SystemControllerLog(description = "商场基础数据") + public ResultData addAadmin(@RequestBody WxMall wxMall) { + logger.debug("[" + getIpAddr() + "] WxProjectConfigController::getMallList"); + try { + if(wxMall == null){ + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode()); + } + TenantEntity tenantEntity = ifParentTenantInfoAlone(); + wxMall.setParentTenantId(tenantEntity.getTenantId()); + if(StringUtils.isBlank(wxMall.getName())){ + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"名称不能为空"); + } + if(StringUtils.isBlank(wxMall.getAdminName())){ + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"管理员不能为空"); + } + if(StringUtils.isBlank(wxMall.getAdminPhone())){ + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"手机号不能为空"); + } + if(wxMall.getAdminStatus() == null){ + wxMall.setAdminStatus(EnumYesOrNo.YES.getCode()); + } + + + + return new ResultData(); + }catch (Exception e){ + logger.error(e.getMessage(),e); + return new ResultData(ErrorCode.SYS_SERVER_ERROR); + } + } + @ApiOperation("根据id更新接口") @PostMapping("update") @SystemControllerLog(description = "商城-更新")