merge

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/mall/bo/TopStoreQueryBo.java

@@ -49,4 +49,6 @@ public class TopStoreQueryBo extends BaseEntity {
 	/** 合作商户ID */
 	@ApiModelProperty("合作商户ID")
 	private Long merId;
+	@ApiModelProperty("店铺ID")
+	private Long storeId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/mall/service/impl/TopStoreServiceImpl.java

@@ -67,6 +67,7 @@ public class TopStoreServiceImpl extends ServiceImpl<TopStoreMapper, TopStore> i
         lqw.eq(StrUtil.isNotBlank(bo.getAddress()), TopStore::getAddress, bo.getAddress());
         lqw.in(bo.getStatus() != null, TopStore::getStatus, bo.getStatus());
         lqw.eq(bo.getMerId() != null, TopStore::getMerId, bo.getMerId());
+        lqw.eq(bo.getStoreId() != null, TopStore::getStoreId, bo.getStoreId());
         List<TopStoreVo> list = entity2Vo(this.list(lqw));
         for(TopStoreVo vo : list){
             TopMerchantVo merchantVo = iTopMerchantService.queryById(vo.getMerId());
@@ -97,7 +98,7 @@ public class TopStoreServiceImpl extends ServiceImpl<TopStoreMapper, TopStore> i
 
     @Override
     public Boolean insertByAddBo(TopStoreAddBo bo) {
-        if(Validator.isEmpty(bo.getMerId())||Validator.isEmpty(bo.getStoreName())){
+        if(Validator.isEmpty(bo.getStoreName())){
             throw new CustomException("参数缺失");
         }
         if (getOne(new LambdaQueryWrapper<TopStore>().eq(TopStore::getStoreName, bo.getStoreName()).eq(TopStore::getMerId, bo.getMerId()).last("limit 1")) != null) {
@@ -114,9 +115,6 @@ public class TopStoreServiceImpl extends ServiceImpl<TopStoreMapper, TopStore> i
 
     @Override
     public Boolean updateByEditBo(TopStoreEditBo bo) {
-        if(Validator.isEmpty(bo.getStoreId())||Validator.isEmpty(bo.getMerId())){
-            throw new CustomException("参数错误");
-        }
         if(Validator.isNotEmpty(bo.getStoreName())){
             if (getOne(new LambdaQueryWrapper<TopStore>().ne(TopStore::getStoreId, bo.getStoreId()).eq(TopStore::getMerId, bo.getMerId()).eq(TopStore::getStoreName, bo.getStoreName()).last("limit 1")) != null) {
                 throw new CustomException("该店铺名已被使用");