diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/ad/mapper/AdMapper.xml b/ruoyi-service/src/main/java/com/ruoyi/bst/ad/mapper/AdMapper.xml index 3eb7daf..297422e 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/ad/mapper/AdMapper.xml +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/ad/mapper/AdMapper.xml @@ -86,11 +86,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into bst_ad + store_id, type, + belong, picture, url, - store_id, - belong, create_by, create_time, update_by, @@ -100,10 +100,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" url_type, - #{type}, - #{picture}, #{storeId}, + #{type}, #{belong}, + #{picture}, #{url}, #{createBy}, #{createTime}, diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/ad/service/impl/AdServiceImpl.java b/ruoyi-service/src/main/java/com/ruoyi/bst/ad/service/impl/AdServiceImpl.java index b5fa61a..cc88821 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/ad/service/impl/AdServiceImpl.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/ad/service/impl/AdServiceImpl.java @@ -79,11 +79,6 @@ public class AdServiceImpl implements AdService public int insertAd(Ad ad) { ad.setCreateTime(DateUtils.getNowDate()); - if (SecurityUtils.isSysAdmin()){ - ad.setBelong(AdBlong.ADMIN.getCode()); - }else { - ad.setBelong(AdBlong.STORE.getCode()); - } return adMapper.insertAd(ad); } diff --git a/ruoyi-web/src/main/java/com/ruoyi/web/bst/AdController.java b/ruoyi-web/src/main/java/com/ruoyi/web/bst/AdController.java index 7ffd514..23f1c50 100644 --- a/ruoyi-web/src/main/java/com/ruoyi/web/bst/AdController.java +++ b/ruoyi-web/src/main/java/com/ruoyi/web/bst/AdController.java @@ -3,6 +3,7 @@ package com.ruoyi.web.bst; import com.ruoyi.bst.ad.domain.Ad; import com.ruoyi.bst.ad.domain.AdQuery; import com.ruoyi.bst.ad.domain.AdVO; +import com.ruoyi.bst.ad.enums.AdBlong; import com.ruoyi.bst.ad.service.AdConverter; import com.ruoyi.bst.ad.service.AdService; import com.ruoyi.bst.ad.service.AdValidator; @@ -87,9 +88,11 @@ public class AdController extends BaseController public AjaxResult add(@RequestBody Ad ad) { ad.setStoreId(getUserId()); + ad.setBelong(AdBlong.ADMIN.getCode()); // 若当前商户不是超级管理员只能够创建一个广告 if (!SecurityUtils.isSysAdmin()){ AdVO vo = adService.selectOne(adConverter.toAdQueryByCreate(ad)); + ad.setBelong(AdBlong.ADMIN.getCode()); ServiceUtil.assertion(vo!=null,"该商户可创建广告已达上限"); } return toAjax(adService.insertAd(ad));