fix

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

@@ -0,0 +1,79 @@
+package com.zhongzheng.controller.mall;
+
+import java.util.List;
+import java.util.Arrays;
+
+import com.zhongzheng.modules.top.mall.bo.TopActionLogAddBo;
+import com.zhongzheng.modules.top.mall.bo.TopActionLogQueryBo;
+import com.zhongzheng.modules.top.mall.service.ITopActionLogService;
+import com.zhongzheng.modules.top.mall.vo.TopActionLogVo;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.common.utils.poi.ExcelUtil;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 行为操作历史Controller
+ *
+ * @author ruoyi
+ * @date 2023-05-25
+ */
+@Api(value = "行为操作历史控制器", tags = {"行为操作历史管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/system/log")
+public class TopActionLogController extends BaseController {
+
+    private final ITopActionLogService iTopActionLogService;
+
+    /**
+     * 查询行为操作历史列表
+     */
+    @ApiOperation("查询行为操作历史列表")
+    @PreAuthorize("@ss.hasPermi('system:log:list')")
+    @GetMapping("/list")
+    public TableDataInfo<TopActionLogVo> list(TopActionLogQueryBo bo) {
+        startPage();
+        List<TopActionLogVo> list = iTopActionLogService.queryList(bo);
+        return getDataTable(list);
+    }
+
+
+    /**
+     * 获取行为操作历史详细信息
+     */
+    @ApiOperation("获取行为操作历史详细信息")
+    @PreAuthorize("@ss.hasPermi('system:log:query')")
+    @GetMapping("/{logId}")
+    public AjaxResult<TopActionLogVo> getInfo(@PathVariable("logId" ) Long logId) {
+        return AjaxResult.success(iTopActionLogService.queryById(logId));
+    }
+
+    /**
+     * 新增行为操作历史
+     */
+    @ApiOperation("新增行为操作历史")
+    @PreAuthorize("@ss.hasPermi('system:log:add')")
+    @Log(title = "行为操作历史", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody TopActionLogAddBo bo) {
+        return toAjax(iTopActionLogService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+
+}

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

@@ -0,0 +1,128 @@
+package com.zhongzheng.controller.mall;
+
+import java.util.List;
+import java.util.Arrays;
+
+import com.zhongzheng.modules.top.mall.bo.TopMerchantAddBo;
+import com.zhongzheng.modules.top.mall.bo.TopMerchantEditBo;
+import com.zhongzheng.modules.top.mall.bo.TopMerchantQueryBo;
+import com.zhongzheng.modules.top.mall.bo.TopStoreQueryBo;
+import com.zhongzheng.modules.top.mall.service.ITopMerchantService;
+import com.zhongzheng.modules.top.mall.vo.TopMerchantExportVo;
+import com.zhongzheng.modules.top.mall.vo.TopMerchantVo;
+import com.zhongzheng.modules.top.mall.vo.TopStoreExportVo;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.common.utils.poi.ExcelUtil;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 商户管理Controller
+ *
+ * @author ruoyi
+ * @date 2023-05-25
+ */
+@Api(value = "商户管理控制器", tags = {"商户管理管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/mall/merchant")
+public class TopMerchantController extends BaseController {
+
+    private final ITopMerchantService iTopMerchantService;
+
+    /**
+     * 查询商户管理列表
+     */
+    @ApiOperation("查询合作商户管理列表")
+    @PreAuthorize("@ss.hasPermi('system:merchant:list')")
+    @GetMapping("/list")
+    public TableDataInfo<TopMerchantVo> list(TopMerchantQueryBo bo) {
+        startPage();
+        List<TopMerchantVo> list = iTopMerchantService.queryList(bo);
+        return getDataTable(list);
+    }
+
+
+
+    /**
+     * 获取商户管理详细信息
+     */
+    @ApiOperation("获取合作商户管理详细信息")
+    @PreAuthorize("@ss.hasPermi('system:merchant:query')")
+    @GetMapping("/{merId}")
+    public AjaxResult<TopMerchantVo> getInfo(@PathVariable("merId" ) Long merId) {
+        return AjaxResult.success(iTopMerchantService.queryById(merId));
+    }
+
+    /**
+     * 新增商户管理
+     */
+    @ApiOperation("新增合作商户管理")
+    @PreAuthorize("@ss.hasPermi('system:merchant:add')")
+    @Log(title = "商户管理", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody TopMerchantAddBo bo) {
+        return toAjax(iTopMerchantService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改商户管理
+     */
+    @ApiOperation("修改合作商户管理")
+    @PreAuthorize("@ss.hasPermi('system:merchant:edit')")
+    @Log(title = "商户管理", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult<Void> edit(@RequestBody TopMerchantEditBo bo) {
+        return toAjax(iTopMerchantService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+
+
+    @ApiOperation("合作商户恢复密码")
+    @PreAuthorize("@ss.hasPermi('system:store:edit')")
+    @Log(title = "商户恢复密码", businessType = BusinessType.UPDATE)
+    @PostMapping("/restorePwd")
+    public AjaxResult<Void> restorePwd(@RequestBody TopMerchantEditBo bo) {
+        return toAjax(iTopMerchantService.restorePwd(bo) ? 1 : 0);
+    }
+
+    @ApiOperation("合作商户修改密码")
+    @PreAuthorize("@ss.hasPermi('system:store:edit')")
+    @Log(title = "商户修改密码", businessType = BusinessType.UPDATE)
+    @PostMapping("/updatePwd")
+    public AjaxResult<Void> updatePwd(@RequestBody TopMerchantEditBo bo) {
+        return toAjax(iTopMerchantService.updatePwd(bo) ? 1 : 0);
+    }
+
+    @ApiOperation("合作商户批量删除")
+    @PreAuthorize("@ss.hasPermi('system:store:edit')")
+    @Log(title = "商户批量删除", businessType = BusinessType.UPDATE)
+    @PostMapping("/batchRemove")
+    public AjaxResult<Void> batchRemove(@RequestBody TopMerchantEditBo bo) {
+        return toAjax(iTopMerchantService.batchRemove(bo) ? 1 : 0);
+    }
+
+    @ApiOperation("合作商户管理列表导出")
+    @PreAuthorize("@ss.hasPermi('system:store:list')")
+    @GetMapping("/listExport")
+    public AjaxResult<List<TopMerchantExportVo>> listExport(TopMerchantQueryBo bo) {
+        List<TopMerchantExportVo> list = iTopMerchantService.listExport(bo);
+        ExcelUtil<TopMerchantExportVo> util = new ExcelUtil<TopMerchantExportVo>(TopMerchantExportVo.class);
+        return util.exportExcel(list, "合作商户列表");
+    }
+}

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

@@ -3,6 +3,9 @@ package com.zhongzheng.controller.mall;
 import java.util.List;
 import java.util.Arrays;
 
+import com.zhongzheng.common.core.domain.model.TopLoginUser;
+import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.framework.web.service.TopTokenService;
 import com.zhongzheng.modules.system.bo.SysTenantBadBillConfigBo;
 import com.zhongzheng.modules.top.mall.bo.TopStoreAddBo;
 import com.zhongzheng.modules.top.mall.bo.TopStoreEditBo;
@@ -46,6 +49,8 @@ public class TopStoreController extends BaseController {
 
     private final ITopStoreService iTopStoreService;
 
+    private final TopTokenService tokenService;
+
     /**
      * 查询商户店铺管理列表
      */
@@ -137,6 +142,8 @@ public class TopStoreController extends BaseController {
     @PostMapping("/updatePointsRule")
     public AjaxResult editBadBill(@Validated @RequestBody TopSysPointsRuleVo bo)
     {
+        TopLoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setOperName(loginUser.getUser().getUserName());
         return toAjax(iTopStoreService.updatePointsRuleConfig(bo));
     }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/sdk/service/impl/TopNuoMplatformLogServiceImpl.java

@@ -96,7 +96,6 @@ public class TopNuoMplatformLogServiceImpl extends ServiceImpl<TopNuoMplatformLo
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public Map<String, String>  insertByAddBo(TopNuoMplatformLogAddBo bo) {
         if(Validator.isEmpty(bo.getOrderNo())||Validator.isEmpty(bo.getTenantId())||Validator.isEmpty(bo.getContent())){
             throw new CustomException("参数缺少");
@@ -122,6 +121,7 @@ public class TopNuoMplatformLogServiceImpl extends ServiceImpl<TopNuoMplatformLo
                 TopNuoMplatformLog update = new TopNuoMplatformLog();
                 update.setId(id);
                 update.setResult(result);
+                System.out.println(result);
                 JSONObject jsonObject = (JSONObject) JSONObject.parse(result);
                 String code = String.valueOf(jsonObject.get("code"));
                 String describe = String.valueOf(jsonObject.get("describe"));

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

@@ -0,0 +1,48 @@
+package com.zhongzheng.modules.top.mall.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 行为操作历史添加对象 top_action_log
+ *
+ * @author ruoyi
+ * @date 2023-05-25
+ */
+@Data
+@ApiModel("行为操作历史添加对象")
+public class TopActionLogAddBo {
+
+    /** 类型 1兑换规则 2会员 3商品 */
+    @ApiModelProperty("类型 1兑换规则 2会员 3商品")
+    private Integer logType;
+    /** 老的数据 */
+    @ApiModelProperty("老的数据")
+    private String oldContent;
+    /** 新的数据 */
+    @ApiModelProperty("新的数据")
+    private String newContent;
+    /** 状态 0关闭 1开启 */
+    @ApiModelProperty("状态 0关闭 1开启")
+    private Integer status;
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+    /** key值 */
+    @ApiModelProperty("key值")
+    private String logKey;
+    /** 动作  1新增 2修改 3删除 */
+    @ApiModelProperty("动作  1新增 2修改 3删除")
+    private Long logAction;
+    /** 操作人员 */
+    @ApiModelProperty("操作人员")
+    private String operName;
+}

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

@@ -0,0 +1,56 @@
+package com.zhongzheng.modules.top.mall.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 行为操作历史编辑对象 top_action_log
+ *
+ * @author ruoyi
+ * @date 2023-05-25
+ */
+@Data
+@ApiModel("行为操作历史编辑对象")
+public class TopActionLogEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long logId;
+
+    /** 类型 1兑换规则 2会员 3商品 */
+    @ApiModelProperty("类型 1兑换规则 2会员 3商品")
+    private Integer logType;
+
+    /** 老的数据 */
+    @ApiModelProperty("老的数据")
+    private String oldContent;
+
+    /** 新的数据 */
+    @ApiModelProperty("新的数据")
+    private String newContent;
+
+    /** 状态 0关闭 1开启 */
+    @ApiModelProperty("状态 0关闭 1开启")
+    private Integer status;
+
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+
+    /** key值 */
+    @ApiModelProperty("key值")
+    private String logKey;
+
+    /** 动作  1新增 2修改 3删除 */
+    @ApiModelProperty("动作  1新增 2修改 3删除")
+    private Long logAction;
+
+    /** 操作人员 */
+    @ApiModelProperty("操作人员")
+    private String operName;
+
+}

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

@@ -0,0 +1,60 @@
+package com.zhongzheng.modules.top.mall.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 行为操作历史分页查询对象 top_action_log
+ *
+ * @author ruoyi
+ * @date 2023-05-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("行为操作历史分页查询对象")
+public class TopActionLogQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 类型 1兑换规则 2会员 3商品 */
+	@ApiModelProperty("类型 1兑换规则 2会员 3商品")
+	private Integer logType;
+	/** 老的数据 */
+	@ApiModelProperty("老的数据")
+	private String oldContent;
+	/** 新的数据 */
+	@ApiModelProperty("新的数据")
+	private String newContent;
+	/** 状态 0关闭 1开启 */
+	@ApiModelProperty("状态 0关闭 1开启")
+	private Integer status;
+	/** key值 */
+	@ApiModelProperty("key值")
+	private String logKey;
+	/** 动作  1新增 2修改 3删除 */
+	@ApiModelProperty("动作  1新增 2修改 3删除")
+	private Long logAction;
+	/** 操作人员 */
+	@ApiModelProperty("操作人员")
+	private String operName;
+}

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

@@ -0,0 +1,54 @@
+package com.zhongzheng.modules.top.mall.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 商户管理添加对象 top_merchant
+ *
+ * @author ruoyi
+ * @date 2023-05-25
+ */
+@Data
+@ApiModel("商户管理添加对象")
+public class TopMerchantAddBo {
+
+    /** 商户名称 */
+    @ApiModelProperty("商户名称")
+    private String merName;
+    /** 手机号码 */
+    @ApiModelProperty("手机号码")
+    private String telphone;
+    /** 用户名 */
+    @ApiModelProperty("用户名")
+    private String userName;
+    /** 密码 */
+    @ApiModelProperty("密码")
+    private String password;
+    /** 联系人 */
+    @ApiModelProperty("联系人")
+    private String contacts;
+    /** 初始密码 */
+    @ApiModelProperty("初始密码")
+    private String initPwd;
+    /** 0 未启用 1启用 -1删除 */
+    @ApiModelProperty("0 未启用 1启用 -1删除")
+    private Integer status;
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long updateTime;
+    /** 备注 */
+    @ApiModelProperty("备注")
+    private String remark;
+    /** 商户账号 */
+    @ApiModelProperty("商户账号")
+    private String merAccount;
+}

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

@@ -0,0 +1,69 @@
+package com.zhongzheng.modules.top.mall.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * 商户管理编辑对象 top_merchant
+ *
+ * @author ruoyi
+ * @date 2023-05-25
+ */
+@Data
+@ApiModel("商户管理编辑对象")
+public class TopMerchantEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long merId;
+
+    /** 商户名称 */
+    @ApiModelProperty("商户名称")
+    private String merName;
+
+    /** 手机号码 */
+    @ApiModelProperty("手机号码")
+    private String telphone;
+
+    /** 用户名 */
+    @ApiModelProperty("用户名")
+    private String userName;
+
+    /** 密码 */
+    @ApiModelProperty("密码")
+    private String password;
+
+    /** 联系人 */
+    @ApiModelProperty("联系人")
+    private String contacts;
+
+    /** 初始密码 */
+    @ApiModelProperty("初始密码")
+    private String initPwd;
+
+    /** 0 未启用 1启用 -1删除 */
+    @ApiModelProperty("0 未启用 1启用 -1删除")
+    private Integer status;
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long updateTime;
+
+    /** 备注 */
+    @ApiModelProperty("备注")
+    private String remark;
+
+
+    /** 商户账号 */
+    @ApiModelProperty("商户账号")
+    private String merAccount;
+
+    @ApiModelProperty("批量店铺ID")
+    private List<Long> merIds;
+
+}

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

@@ -0,0 +1,64 @@
+package com.zhongzheng.modules.top.mall.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 商户管理分页查询对象 top_merchant
+ *
+ * @author ruoyi
+ * @date 2023-05-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("商户管理分页查询对象")
+public class TopMerchantQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 商户名称 */
+	@ApiModelProperty("商户名称")
+	private String merName;
+	/** 手机号码 */
+	@ApiModelProperty("手机号码")
+	private String telphone;
+	/** 用户名 */
+	@ApiModelProperty("用户名")
+	private String userName;
+	/** 密码 */
+	@ApiModelProperty("密码")
+	private String password;
+	/** 联系人 */
+	@ApiModelProperty("联系人")
+	private String contacts;
+	/** 初始密码 */
+	@ApiModelProperty("初始密码")
+	private String initPwd;
+	/** 0 未启用 1启用 -1删除 */
+	@ApiModelProperty("0 未启用 1启用 -1删除")
+	private List<Integer> status;
+	/** 商户账号 */
+	@ApiModelProperty("商户账号")
+	private String merAccount;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/mall/domain/TopActionLog.java

@@ -0,0 +1,49 @@
+package com.zhongzheng.modules.top.mall.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.zhongzheng.common.annotation.Excel;
+
+/**
+ * 行为操作历史对象 top_action_log
+ *
+ * @author ruoyi
+ * @date 2023-05-25
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("top_action_log")
+public class TopActionLog implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "log_id")
+    private Long logId;
+    /** 类型 1兑换规则 2会员 3商品 */
+    private Integer logType;
+    /** 老的数据 */
+    private String oldContent;
+    /** 新的数据 */
+    private String newContent;
+    /** 状态 0关闭 1开启 */
+    private Integer status;
+    /** 创建时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 更新时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+    /** key值 */
+    private String logKey;
+    /** 动作  1新增 2修改 3删除 */
+    private Long logAction;
+    /** 操作人员 */
+    private String operName;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/mall/domain/TopMerchant.java

@@ -0,0 +1,55 @@
+package com.zhongzheng.modules.top.mall.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.zhongzheng.common.annotation.Excel;
+
+/**
+ * 商户管理对象 top_merchant
+ *
+ * @author ruoyi
+ * @date 2023-05-25
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("top_merchant")
+public class TopMerchant implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "mer_id")
+    private Long merId;
+    /** 商户名称 */
+    private String merName;
+    /** 手机号码 */
+    private String telphone;
+    /** 用户名 */
+    private String userName;
+    /** 密码 */
+    private String password;
+    /** 联系人 */
+    private String contacts;
+    /** 初始密码 */
+    private String initPwd;
+    /** 0 未启用 1启用 -1删除 */
+    private Integer status;
+    /** 创建时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** $column.columnComment */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+    /** 备注 */
+    private String remark;
+    /** 商户账号 */
+    private String merAccount;
+
+    private String tenantId;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/mall/mapper/TopActionLogMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.top.mall.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.top.mall.domain.TopActionLog;
+
+/**
+ * 行为操作历史Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-05-25
+ */
+public interface TopActionLogMapper extends BaseMapper<TopActionLog> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/mall/mapper/TopMerchantMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.top.mall.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.top.mall.domain.TopMerchant;
+
+/**
+ * 商户管理Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-05-25
+ */
+public interface TopMerchantMapper extends BaseMapper<TopMerchant> {
+
+}

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

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.top.mall.service;
+
+import com.zhongzheng.modules.top.mall.bo.TopActionLogAddBo;
+import com.zhongzheng.modules.top.mall.bo.TopActionLogEditBo;
+import com.zhongzheng.modules.top.mall.bo.TopActionLogQueryBo;
+import com.zhongzheng.modules.top.mall.domain.TopActionLog;
+import com.zhongzheng.modules.top.mall.vo.TopActionLogVo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 行为操作历史Service接口
+ *
+ * @author ruoyi
+ * @date 2023-05-25
+ */
+public interface ITopActionLogService extends IService<TopActionLog> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	TopActionLogVo queryById(Long logId);
+
+	/**
+	 * 查询列表
+	 */
+	List<TopActionLogVo> queryList(TopActionLogQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入行为操作历史
+	 * @param bo 行为操作历史新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(TopActionLogAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改行为操作历史
+	 * @param bo 行为操作历史编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(TopActionLogEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

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

@@ -0,0 +1,65 @@
+package com.zhongzheng.modules.top.mall.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.top.mall.bo.*;
+import com.zhongzheng.modules.top.mall.domain.TopMerchant;
+import com.zhongzheng.modules.top.mall.vo.TopMerchantExportVo;
+import com.zhongzheng.modules.top.mall.vo.TopMerchantVo;
+import com.zhongzheng.modules.top.mall.vo.TopStoreExportVo;
+import com.zhongzheng.modules.top.user.vo.TopSysPointsRuleVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 商户管理Service接口
+ *
+ * @author ruoyi
+ * @date 2023-05-25
+ */
+public interface ITopMerchantService extends IService<TopMerchant> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	TopMerchantVo queryById(Long merId);
+
+	/**
+	 * 查询列表
+	 */
+	List<TopMerchantVo> queryList(TopMerchantQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入商户管理
+	 * @param bo 商户管理新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(TopMerchantAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改商户管理
+	 * @param bo 商户管理编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(TopMerchantEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+	Boolean restorePwd(TopMerchantEditBo bo);
+
+	Boolean updatePwd(TopMerchantEditBo bo);
+
+
+	Boolean batchRemove(TopMerchantEditBo bo);
+
+
+	List<TopMerchantExportVo> listExport(TopMerchantQueryBo bo);
+
+}

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

@@ -0,0 +1,106 @@
+package com.zhongzheng.modules.top.mall.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.top.mall.bo.TopActionLogAddBo;
+import com.zhongzheng.modules.top.mall.bo.TopActionLogEditBo;
+import com.zhongzheng.modules.top.mall.bo.TopActionLogQueryBo;
+import com.zhongzheng.modules.top.mall.domain.TopActionLog;
+import com.zhongzheng.modules.top.mall.mapper.TopActionLogMapper;
+import com.zhongzheng.modules.top.mall.service.ITopActionLogService;
+import com.zhongzheng.modules.top.mall.vo.TopActionLogVo;
+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.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 行为操作历史Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2023-05-25
+ */
+@Service
+public class TopActionLogServiceImpl extends ServiceImpl<TopActionLogMapper, TopActionLog> implements ITopActionLogService {
+
+    @Override
+    public TopActionLogVo queryById(Long logId){
+        TopActionLog db = this.baseMapper.selectById(logId);
+        return BeanUtil.toBean(db, TopActionLogVo.class);
+    }
+
+    @Override
+    public List<TopActionLogVo> queryList(TopActionLogQueryBo bo) {
+        LambdaQueryWrapper<TopActionLog> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getLogType() != null, TopActionLog::getLogType, bo.getLogType());
+        lqw.eq(StrUtil.isNotBlank(bo.getOldContent()), TopActionLog::getOldContent, bo.getOldContent());
+        lqw.eq(StrUtil.isNotBlank(bo.getNewContent()), TopActionLog::getNewContent, bo.getNewContent());
+        lqw.eq(bo.getStatus() != null, TopActionLog::getStatus, bo.getStatus());
+        lqw.eq(StrUtil.isNotBlank(bo.getLogKey()), TopActionLog::getLogKey, bo.getLogKey());
+        lqw.eq(bo.getLogAction() != null, TopActionLog::getLogAction, bo.getLogAction());
+        lqw.like(StrUtil.isNotBlank(bo.getOperName()), TopActionLog::getOperName, bo.getOperName());
+        lqw.orderByDesc(TopActionLog::getLogId);
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<TopActionLogVo> entity2Vo(Collection<TopActionLog> collection) {
+        List<TopActionLogVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, TopActionLogVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<TopActionLog> page = (Page<TopActionLog>)collection;
+            Page<TopActionLogVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(TopActionLogAddBo bo) {
+        TopActionLog add = BeanUtil.toBean(bo, TopActionLog.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(TopActionLogEditBo bo) {
+        TopActionLog update = BeanUtil.toBean(bo, TopActionLog.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(TopActionLog entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+}

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

@@ -0,0 +1,206 @@
+package com.zhongzheng.modules.top.mall.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.lang.Validator;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.zhongzheng.common.exception.CustomException;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.common.utils.SecurityUtils;
+import com.zhongzheng.common.utils.SnowflakeIdUtils;
+import com.zhongzheng.modules.top.mall.bo.TopMerchantAddBo;
+import com.zhongzheng.modules.top.mall.bo.TopMerchantEditBo;
+import com.zhongzheng.modules.top.mall.bo.TopMerchantQueryBo;
+import com.zhongzheng.modules.top.mall.domain.TopMerchant;
+import com.zhongzheng.modules.top.mall.domain.TopStore;
+import com.zhongzheng.modules.top.mall.mapper.TopMerchantMapper;
+import com.zhongzheng.modules.top.mall.service.ITopMerchantService;
+import com.zhongzheng.modules.top.mall.vo.TopMerchantExportVo;
+import com.zhongzheng.modules.top.mall.vo.TopMerchantVo;
+import com.zhongzheng.modules.top.mall.vo.TopStoreExportVo;
+import com.zhongzheng.modules.top.mall.vo.TopStoreVo;
+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;
+import java.util.stream.Collectors;
+
+/**
+ * 商户管理Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2023-05-25
+ */
+@Service
+public class TopMerchantServiceImpl extends ServiceImpl<TopMerchantMapper, TopMerchant> implements ITopMerchantService {
+
+    @Override
+    public TopMerchantVo queryById(Long merId){
+        TopMerchant db = this.baseMapper.selectById(merId);
+        return BeanUtil.toBean(db, TopMerchantVo.class);
+    }
+
+    @Override
+    public List<TopMerchantVo> queryList(TopMerchantQueryBo bo) {
+        LambdaQueryWrapper<TopMerchant> lqw = Wrappers.lambdaQuery();
+        lqw.like(StrUtil.isNotBlank(bo.getMerName()), TopMerchant::getMerName, bo.getMerName());
+        lqw.eq(StrUtil.isNotBlank(bo.getTelphone()), TopMerchant::getTelphone, bo.getTelphone());
+        lqw.like(StrUtil.isNotBlank(bo.getUserName()), TopMerchant::getUserName, bo.getUserName());
+        lqw.eq(StrUtil.isNotBlank(bo.getPassword()), TopMerchant::getPassword, bo.getPassword());
+        lqw.eq(StrUtil.isNotBlank(bo.getContacts()), TopMerchant::getContacts, bo.getContacts());
+        lqw.eq(StrUtil.isNotBlank(bo.getInitPwd()), TopMerchant::getInitPwd, bo.getInitPwd());
+        lqw.in(bo.getStatus() != null, TopMerchant::getStatus, bo.getStatus());
+        lqw.eq(StrUtil.isNotBlank(bo.getMerAccount()), TopMerchant::getMerAccount, bo.getMerAccount());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<TopMerchantVo> entity2Vo(Collection<TopMerchant> collection) {
+        List<TopMerchantVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, TopMerchantVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<TopMerchant> page = (Page<TopMerchant>)collection;
+            Page<TopMerchantVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(TopMerchantAddBo bo) {
+        if (getOne(new LambdaQueryWrapper<TopMerchant>().eq(TopMerchant::getMerName, bo.getMerName()).last("limit 1")) != null) {
+            throw new CustomException("该商户名已被注册");
+        }
+        if (getOne(new LambdaQueryWrapper<TopMerchant>().eq(TopMerchant::getTelphone, bo.getTelphone()).last("limit 1")) != null) {
+            throw new CustomException("该手机号已被注册");
+        }
+        TopMerchant add = BeanUtil.toBean(bo, TopMerchant.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        String pwd =  add.getTelphone().substring(add.getTelphone().length() - 6);
+        add.setUserName("manager");
+        add.setPassword(pwd);
+        add.setInitPwd(add.getPassword());
+        add.setPassword(SecurityUtils.encryptPassword(add.getPassword()));
+        add.setTenantId("867735392558919680");//初始按祥粤创建
+        SnowflakeIdUtils idWorker = new SnowflakeIdUtils(3, 1);
+        add.setMerAccount(String.valueOf(idWorker.nextId()));
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(TopMerchantEditBo bo) {
+        if(Validator.isEmpty(bo.getMerId())){
+            throw new CustomException("参数错误");
+        }
+        if(Validator.isNotEmpty(bo.getMerName())){
+            if (getOne(new LambdaQueryWrapper<TopMerchant>().ne(TopMerchant::getMerId, bo.getMerId()).eq(TopMerchant::getMerName, bo.getMerName()).last("limit 1")) != null) {
+                throw new CustomException("该商户名称已被注册");
+            }
+        }
+        if(Validator.isNotEmpty(bo.getTelphone())){
+            TopMerchant topStore = getOne(new LambdaQueryWrapper<TopMerchant>().eq(TopMerchant::getMerId, bo.getMerId()));
+            if(!topStore.getTelphone().equals(bo.getTelphone())){
+                if (getOne(new LambdaQueryWrapper<TopMerchant>().ne(TopMerchant::getMerId, bo.getMerId()).eq(TopMerchant::getTelphone, bo.getTelphone()).last("limit 1")) != null) {
+                    throw new CustomException("该手机号码已被注册");
+                }
+                String pwd =  bo.getTelphone().substring(bo.getTelphone().length() - 6);
+                bo.setInitPwd(pwd);
+            }
+        }
+
+        TopMerchant update = BeanUtil.toBean(bo, TopMerchant.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(TopMerchant entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+
+    @Override
+    public Boolean restorePwd(TopMerchantEditBo bo) {
+        if(Validator.isEmpty(bo.getMerId())){
+            throw new CustomException("参数错误");
+        }
+        TopMerchant store = getOne(new LambdaQueryWrapper<TopMerchant>().eq(TopMerchant::getMerId, bo.getMerId()).last("limit 1"));
+        LambdaUpdateWrapper<TopMerchant> objectLambdaUpdateWrapper = Wrappers.lambdaUpdate();
+        objectLambdaUpdateWrapper.eq(TopMerchant::getMerId, bo.getMerId());
+        objectLambdaUpdateWrapper.set(TopMerchant::getPassword, SecurityUtils.encryptPassword(store.getInitPwd()));
+        objectLambdaUpdateWrapper.set(TopMerchant::getUpdateTime, DateUtils.getNowTime());
+        return this.update(null, objectLambdaUpdateWrapper);
+    }
+
+    @Override
+    public Boolean updatePwd(TopMerchantEditBo bo) {
+        if(Validator.isEmpty(bo.getMerId())||Validator.isEmpty(bo.getPassword())){
+            throw new CustomException("参数错误");
+        }
+        TopMerchantVo storeVo = queryById(bo.getMerId());
+        LambdaUpdateWrapper<TopMerchant> objectLambdaUpdateWrapper = Wrappers.lambdaUpdate();
+        objectLambdaUpdateWrapper.eq(TopMerchant::getMerId, bo.getMerId());
+        objectLambdaUpdateWrapper.set(TopMerchant::getPassword, SecurityUtils.encryptPassword(bo.getPassword()));
+        objectLambdaUpdateWrapper.set(TopMerchant::getUpdateTime, DateUtils.getNowTime());
+        return this.update(null, objectLambdaUpdateWrapper);
+    }
+
+    @Override
+    public Boolean batchRemove(TopMerchantEditBo bo) {
+        if(Validator.isNotEmpty(bo.getMerIds())){
+            for(Long id : bo.getMerIds()){
+                LambdaUpdateWrapper<TopMerchant> objectLambdaUpdateWrapper = Wrappers.lambdaUpdate();
+                objectLambdaUpdateWrapper.eq(TopMerchant::getMerId, id);
+                objectLambdaUpdateWrapper.set(TopMerchant::getStatus, -1);
+                objectLambdaUpdateWrapper.set(TopMerchant::getUpdateTime, DateUtils.getNowTime());
+                this.update(null, objectLambdaUpdateWrapper);
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public List<TopMerchantExportVo> listExport(TopMerchantQueryBo bo) {
+        List<TopMerchantExportVo> exportVoList = new ArrayList<>();
+        List<TopMerchantVo> list =  queryList(bo);
+        for(TopMerchantVo vo : list){
+            TopMerchantExportVo exportVo = BeanUtil.toBean(vo, TopMerchantExportVo.class);
+            exportVo.setCreateTime(DateUtils.timestampToDate(vo.getCreateTime()));
+            if(vo.getStatus()==1){
+                exportVo.setStatus("启用");
+            }
+            if(vo.getStatus()==0){
+                exportVo.setStatus("禁用");
+            }
+        }
+        return exportVoList;
+    }
+}

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

@@ -10,11 +10,13 @@ import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.SecurityUtils;
 import com.zhongzheng.common.utils.SnowflakeIdUtils;
 import com.zhongzheng.modules.grade.domain.ClassGradeUser;
+import com.zhongzheng.modules.top.mall.bo.TopActionLogAddBo;
 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.mapper.TopStoreMapper;
+import com.zhongzheng.modules.top.mall.service.ITopActionLogService;
 import com.zhongzheng.modules.top.mall.service.ITopStoreService;
 import com.zhongzheng.modules.top.mall.vo.TopStoreExportVo;
 import com.zhongzheng.modules.top.mall.vo.TopStoreVo;
@@ -48,6 +50,9 @@ public class TopStoreServiceImpl extends ServiceImpl<TopStoreMapper, TopStore> i
     @Autowired
     private ITopSysConfigService topConfigService;
 
+    @Autowired
+    private ITopActionLogService iTopActionLogService;
+
     @Override
     public TopStoreVo queryById(Long storeId){
         TopStore db = this.baseMapper.selectById(storeId);
@@ -221,6 +226,59 @@ public class TopStoreServiceImpl extends ServiceImpl<TopStoreMapper, TopStore> i
 
     @Override
     public boolean updatePointsRuleConfig(TopSysPointsRuleVo bo) {
+        //获取老的配置
+        String json = topConfigService.selectConfigByKeyNoCache("points_rule");
+        TopSysPointsRuleVo oldVo = JSON.parseObject(json,TopSysPointsRuleVo.class);
+        if(!oldVo.getYearOverEnable().equals(bo.getYearOverEnable())){
+            TopActionLogAddBo addBo = new TopActionLogAddBo();
+            addBo.setLogType(1);
+            addBo.setLogAction(2L);
+            addBo.setLogKey("yearOver");
+            addBo.setOldContent((oldVo.getYearOverEnable()?"启用":"停用")+"一个自然年自动清零");
+            addBo.setNewContent((bo.getYearOverEnable()?"启用":"停用")+"一个自然年自动清零");
+            addBo.setOperName(bo.getOperName());
+            iTopActionLogService.insertByAddBo(addBo);
+        }
+        if(!oldVo.getOneExchangeEnable().equals(bo.getOneExchangeEnable())||!oldVo.getOneExchangeValue().equals(bo.getOneExchangeValue())){
+            TopActionLogAddBo addBo = new TopActionLogAddBo();
+            addBo.setLogType(1);
+            addBo.setLogAction(2L);
+            addBo.setLogKey("oneExchange");
+            addBo.setOldContent((oldVo.getOneExchangeEnable()?"启用":"停用")+"积分兑换,1元="+oldVo.getOneExchangeValue()+"积分");
+            addBo.setNewContent((bo.getOneExchangeEnable()?"启用":"停用")+"积分兑换,1元="+bo.getOneExchangeValue()+"积分");
+            addBo.setOperName(bo.getOperName());
+            iTopActionLogService.insertByAddBo(addBo);
+        }
+        if(!oldVo.getFullEnable().equals(bo.getFullEnable())||!oldVo.getFullPointsValue().equals(bo.getFullPointsValue())||!oldVo.getFullMoneyValue().equals(bo.getFullMoneyValue())){
+            TopActionLogAddBo addBo = new TopActionLogAddBo();
+            addBo.setLogType(1);
+            addBo.setLogAction(2L);
+            addBo.setLogKey("fullMoney");
+            addBo.setOldContent((oldVo.getOneExchangeEnable()?"启用":"停用")+"下单满"+oldVo.getFullMoneyValue()+"元，送"+oldVo.getFullPointsValue()+"积分");
+            addBo.setNewContent((bo.getOneExchangeEnable()?"启用":"停用")+"下单满"+bo.getFullMoneyValue()+"元，送"+bo.getFullPointsValue()+"积分");
+            addBo.setOperName(bo.getOperName());
+            iTopActionLogService.insertByAddBo(addBo);
+        }
+        if(!oldVo.getUploadCarteEnable().equals(bo.getUploadCarteEnable())||!oldVo.getUploadCarteValue().equals(bo.getUploadCarteValue())){
+            TopActionLogAddBo addBo = new TopActionLogAddBo();
+            addBo.setLogType(1);
+            addBo.setLogAction(2L);
+            addBo.setLogKey("uploadCarte");
+            addBo.setOldContent((oldVo.getOneExchangeEnable()?"启用":"停用")+"e管证证书上传，送"+oldVo.getUploadCarteValue()+"积分");
+            addBo.setNewContent((bo.getOneExchangeEnable()?"启用":"停用")+"e管证证书上传，送"+bo.getUploadCarteValue()+"积分");
+            addBo.setOperName(bo.getOperName());
+            iTopActionLogService.insertByAddBo(addBo);
+        }
+        if(!oldVo.getShareGoodsEnable().equals(bo.getShareGoodsEnable())||!oldVo.getShareGoodsValue().equals(bo.getShareGoodsValue())){
+            TopActionLogAddBo addBo = new TopActionLogAddBo();
+            addBo.setLogType(1);
+            addBo.setLogAction(2L);
+            addBo.setLogKey("shareGoods");
+            addBo.setOldContent((oldVo.getOneExchangeEnable()?"启用":"停用")+"分享商品，送"+oldVo.getShareGoodsValue()+"积分");
+            addBo.setNewContent((bo.getOneExchangeEnable()?"启用":"停用")+"分享商品，送"+bo.getShareGoodsValue()+"积分");
+            addBo.setOperName(bo.getOperName());
+            iTopActionLogService.insertByAddBo(addBo);
+        }
         LambdaUpdateWrapper<TopSysConfig> objectLambdaUpdateWrapper = Wrappers.lambdaUpdate();
         objectLambdaUpdateWrapper.eq(TopSysConfig::getConfigKey, "points_rule");
         objectLambdaUpdateWrapper.set(TopSysConfig::getConfigValue, JSON.toJSONString(bo));

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

@@ -0,0 +1,56 @@
+package com.zhongzheng.modules.top.mall.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 行为操作历史视图对象 mall_package
+ *
+ * @author ruoyi
+ * @date 2023-05-25
+ */
+@Data
+@ApiModel("行为操作历史视图对象")
+public class TopActionLogVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long logId;
+
+	/** 类型 1兑换规则 2会员 3商品 */
+	@Excel(name = "类型 1兑换规则 2会员 3商品")
+	@ApiModelProperty("类型 1兑换规则 2会员 3商品")
+	private Integer logType;
+	/** 老的数据 */
+	@Excel(name = "老的数据")
+	@ApiModelProperty("老的数据")
+	private String oldContent;
+	/** 新的数据 */
+	@Excel(name = "新的数据")
+	@ApiModelProperty("新的数据")
+	private String newContent;
+	/** 状态 0关闭 1开启 */
+	@Excel(name = "状态 0关闭 1开启")
+	@ApiModelProperty("状态 0关闭 1开启")
+	private Integer status;
+	/** key值 */
+	@Excel(name = "key值")
+	@ApiModelProperty("key值")
+	private String logKey;
+	/** 动作  1新增 2修改 3删除 */
+	@Excel(name = "动作  1新增 2修改 3删除")
+	@ApiModelProperty("动作  1新增 2修改 3删除")
+	private Long logAction;
+	/** 操作人员 */
+	@Excel(name = "操作人员")
+	@ApiModelProperty("操作人员")
+	private String operName;
+	private Long createTime;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/mall/vo/TopMerchantExportVo.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 TopMerchantExportVo {
+	private static final long serialVersionUID = 1L;
+
+	/** 店铺名称 */
+	@Excel(name = "商户名称")
+	@ApiModelProperty("店铺名称")
+	private String merName;
+	/** 手机号码 */
+	@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;
+
+
+}

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

@@ -0,0 +1,66 @@
+package com.zhongzheng.modules.top.mall.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 商户管理视图对象 mall_package
+ *
+ * @author ruoyi
+ * @date 2023-05-25
+ */
+@Data
+@ApiModel("商户管理视图对象")
+public class TopMerchantVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long merId;
+
+	/** 商户名称 */
+	@Excel(name = "商户名称")
+	@ApiModelProperty("商户名称")
+	private String merName;
+	/** 手机号码 */
+	@Excel(name = "手机号码")
+	@ApiModelProperty("手机号码")
+	private String telphone;
+	/** 用户名 */
+	@Excel(name = "用户名")
+	@ApiModelProperty("用户名")
+	private String userName;
+	/** 密码 */
+	@Excel(name = "密码")
+	@ApiModelProperty("密码")
+	private String password;
+	/** 联系人 */
+	@Excel(name = "联系人")
+	@ApiModelProperty("联系人")
+	private String contacts;
+	/** 初始密码 */
+	@Excel(name = "初始密码")
+	@ApiModelProperty("初始密码")
+	private String initPwd;
+	/** 0 未启用 1启用 -1删除 */
+	@Excel(name = "0 未启用 1启用 -1删除")
+	@ApiModelProperty("0 未启用 1启用 -1删除")
+	private Integer status;
+	/** 备注 */
+	@Excel(name = "备注")
+	@ApiModelProperty("备注")
+	private String remark;
+	/** 商户账号 */
+	@Excel(name = "商户账号")
+	@ApiModelProperty("商户账号")
+	private String merAccount;
+	private String tenantId;
+
+	private Long createTime;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/user/vo/TopSysPointsRuleVo.java

@@ -48,4 +48,6 @@ private static final long serialVersionUID=1L;
 
     @ApiModelProperty("分享商品送积分值")
     private BigDecimal shareGoodsValue;
+
+    private String operName;
 }

zhongzheng-system/src/main/resources/mapper/modules/top/TopActionLogMapper.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zhongzheng.modules.top.mall.mapper.TopActionLogMapper">
+
+    <resultMap type="com.zhongzheng.modules.top.mall.domain.TopActionLog" id="TopActionLogResult">
+        <result property="logId" column="log_id"/>
+        <result property="logType" column="log_type"/>
+        <result property="oldContent" column="old_content"/>
+        <result property="newContent" column="new_content"/>
+        <result property="status" column="status"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="logKey" column="log_key"/>
+        <result property="logAction" column="log_action"/>
+        <result property="operName" column="oper_name"/>
+    </resultMap>
+
+
+</mapper>

zhongzheng-system/src/main/resources/mapper/modules/top/TopMerchantMapper.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zhongzheng.modules.top.mall.mapper.TopMerchantMapper">
+
+    <resultMap type="com.zhongzheng.modules.top.mall.domain.TopMerchant" id="TopMerchantResult">
+        <result property="merId" column="mer_id"/>
+        <result property="merName" column="mer_name"/>
+        <result property="telphone" column="telphone"/>
+        <result property="userName" column="user_name"/>
+        <result property="password" column="password"/>
+        <result property="contacts" column="contacts"/>
+        <result property="initPwd" column="init_pwd"/>
+        <result property="status" column="status"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
+        <result property="merAccount" column="mer_account"/>
+    </resultMap>
+
+
+</mapper>