fix mall

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/mall/TopStoreController.java

@@ -7,6 +7,7 @@ import com.zhongzheng.modules.top.mall.bo.TopStoreAddBo;
 import com.zhongzheng.modules.top.mall.bo.TopStoreEditBo;
 import com.zhongzheng.modules.top.mall.bo.TopStoreQueryBo;
 import com.zhongzheng.modules.top.mall.service.ITopStoreService;
+import com.zhongzheng.modules.top.mall.vo.TopStoreExportVo;
 import com.zhongzheng.modules.top.mall.vo.TopStoreVo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -105,4 +106,20 @@ public class TopStoreController extends BaseController {
         return toAjax(iTopStoreService.updatePwd(bo) ? 1 : 0);
     }
 
+    @ApiOperation("商户批量删除")
+    @PreAuthorize("@ss.hasPermi('system:store:edit')")
+    @Log(title = "商户批量删除", businessType = BusinessType.UPDATE)
+    @PostMapping("/batchRemove")
+    public AjaxResult<Void> batchRemove(@RequestBody TopStoreEditBo bo) {
+        return toAjax(iTopStoreService.batchRemove(bo) ? 1 : 0);
+    }
+
+    @ApiOperation("商户店铺管理列表导出")
+    @PreAuthorize("@ss.hasPermi('system:store:list')")
+    @GetMapping("/listExport")
+    public AjaxResult<List<TopStoreExportVo>> listExport(TopStoreQueryBo bo) {
+        List<TopStoreExportVo> list = iTopStoreService.listExport(bo);
+        ExcelUtil<TopStoreExportVo> util = new ExcelUtil<TopStoreExportVo>(TopStoreExportVo.class);
+        return util.exportExcel(list, "合作商户列表");
+    }
 }

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

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -56,7 +57,7 @@ public class TopStoreEditBo {
     /** 备注 */
     @ApiModelProperty("备注")
     private String remark;
-
-
+    @ApiModelProperty("批量店铺ID")
+    private List<Long> storeIds;
 
 }

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

@@ -6,6 +6,7 @@ import com.zhongzheng.modules.top.mall.bo.TopStoreAddBo;
 import com.zhongzheng.modules.top.mall.bo.TopStoreEditBo;
 import com.zhongzheng.modules.top.mall.bo.TopStoreQueryBo;
 import com.zhongzheng.modules.top.mall.domain.TopStore;
+import com.zhongzheng.modules.top.mall.vo.TopStoreExportVo;
 import com.zhongzheng.modules.top.mall.vo.TopStoreVo;
 
 import java.util.Collection;
@@ -29,6 +30,8 @@ public interface ITopStoreService extends IService<TopStore> {
 	 */
 	List<TopStoreVo> queryList(TopStoreQueryBo bo);
 
+	List<TopStoreExportVo> listExport(TopStoreQueryBo bo);
+
 	/**
 	 * 根据新增业务对象插入商户店铺管理
 	 * @param bo 商户店铺管理新增业务对象
@@ -54,4 +57,8 @@ public interface ITopStoreService extends IService<TopStore> {
 	Boolean restorePwd(TopStoreEditBo bo);
 
 	Boolean updatePwd(TopStoreEditBo bo);
+
+
+	Boolean batchRemove(TopStoreEditBo bo);
+
 }

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

@@ -15,14 +15,17 @@ import com.zhongzheng.modules.top.mall.bo.TopStoreQueryBo;
 import com.zhongzheng.modules.top.mall.domain.TopStore;
 import com.zhongzheng.modules.top.mall.mapper.TopStoreMapper;
 import com.zhongzheng.modules.top.mall.service.ITopStoreService;
+import com.zhongzheng.modules.top.mall.vo.TopStoreExportVo;
 import com.zhongzheng.modules.top.mall.vo.TopStoreVo;
 import com.zhongzheng.modules.top.order.domain.TopOrderRecNote;
+import com.zhongzheng.modules.top.order.vo.TopOldOrderCompanyExportVo;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.Page;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -58,6 +61,23 @@ public class TopStoreServiceImpl extends ServiceImpl<TopStoreMapper, TopStore> i
         return entity2Vo(this.list(lqw));
     }
 
+    @Override
+    public List<TopStoreExportVo> listExport(TopStoreQueryBo bo) {
+        List<TopStoreExportVo> exportVoList = new ArrayList<>();
+        List<TopStoreVo> list =  queryList(bo);
+        for(TopStoreVo vo : list){
+            TopStoreExportVo exportVo = BeanUtil.toBean(vo, TopStoreExportVo.class);
+            exportVo.setCreateTime(DateUtils.timestampToDate(vo.getCreateTime()));
+            if(vo.getStatus()==1){
+                exportVo.setStatus("启用");
+            }
+            if(vo.getStatus()==0){
+                exportVo.setStatus("禁用");
+            }
+        }
+        return exportVoList;
+    }
+
     /**
     * 实体类转化成视图对象
     *
@@ -150,10 +170,10 @@ public class TopStoreServiceImpl extends ServiceImpl<TopStoreMapper, TopStore> i
         if(Validator.isEmpty(bo.getStoreId())){
             throw new CustomException("参数错误");
         }
-        TopStoreVo storeVo = queryById(bo.getStoreId());
+        TopStore store = getOne(new LambdaQueryWrapper<TopStore>().eq(TopStore::getStoreId, bo.getStoreId()).last("limit 1"));
         LambdaUpdateWrapper<TopStore> objectLambdaUpdateWrapper = Wrappers.lambdaUpdate();
         objectLambdaUpdateWrapper.eq(TopStore::getStoreId, bo.getStoreId());
-        objectLambdaUpdateWrapper.set(TopStore::getPassword, SecurityUtils.encryptPassword(storeVo.getInitPwd()));
+        objectLambdaUpdateWrapper.set(TopStore::getPassword, SecurityUtils.encryptPassword(store.getInitPwd()));
         objectLambdaUpdateWrapper.set(TopStore::getUpdateTime, DateUtils.getNowTime());
         return this.update(null, objectLambdaUpdateWrapper);
     }
@@ -170,4 +190,18 @@ public class TopStoreServiceImpl extends ServiceImpl<TopStoreMapper, TopStore> i
         objectLambdaUpdateWrapper.set(TopStore::getUpdateTime, DateUtils.getNowTime());
         return this.update(null, objectLambdaUpdateWrapper);
     }
+
+    @Override
+    public Boolean batchRemove(TopStoreEditBo bo) {
+        if(Validator.isNotEmpty(bo.getStoreIds())){
+            for(Long id : bo.getStoreIds()){
+                LambdaUpdateWrapper<TopStore> objectLambdaUpdateWrapper = Wrappers.lambdaUpdate();
+                objectLambdaUpdateWrapper.eq(TopStore::getStoreId, id);
+                objectLambdaUpdateWrapper.set(TopStore::getStatus, -1);
+                objectLambdaUpdateWrapper.set(TopStore::getUpdateTime, DateUtils.getNowTime());
+                this.update(null, objectLambdaUpdateWrapper);
+            }
+        }
+        return true;
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/mall/vo/TopStoreExportVo.java

@@ -0,0 +1,45 @@
+package com.zhongzheng.modules.top.mall.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 商户店铺管理视图对象 mall_package
+ *
+ * @author hjl
+ * @date 2023-05-18
+ */
+@Data
+@ApiModel("商户店铺管理视图对象")
+public class TopStoreExportVo {
+	private static final long serialVersionUID = 1L;
+
+	/** 店铺名称 */
+	@Excel(name = "店铺名称")
+	@ApiModelProperty("店铺名称")
+	private String storeName;
+	/** 手机号码 */
+	@Excel(name = "手机号码")
+	@ApiModelProperty("手机号码")
+	private String telphone;
+	/** 用户名 */
+	@Excel(name = "用户名")
+	@ApiModelProperty("用户名")
+	private String userName;
+	@Excel(name = "录入时间")
+	private String createTime;
+	/** 联系人 */
+	@Excel(name = "联系人")
+	@ApiModelProperty("联系人")
+	private String contacts;
+
+	/** 0 未启用 1启用 -1删除 */
+	@Excel(name = "启用状态")
+	@ApiModelProperty("0 未启用 1启用 -1删除")
+	private String status;
+
+
+}