fix 日志

netflix-common/src/main/java/com/cyksj/common/constant/Constant.java

@@ -59,4 +59,6 @@ public interface Constant {
 	String EQUIPMENT_DISTRIBUTE_KEY = "equipment_distribute_key";
 
 	String INITIAL_PASSWORD ="qwer1234";
+
+	List<String> serviceKeys = List.of("service_img_set", "service_name_set");
 }

netflix-web/src/main/java/com/cyksj/web/controller/manage/CmsOrderController.java

@@ -4,11 +4,13 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.excel.support.ExcelTypeEnum;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.cyksj.common.annotation.Log;
 import com.cyksj.common.annotation.NoSubmit;
 import com.cyksj.common.constant.Constant;
 import com.cyksj.common.exception.BusinessRuntimeException;
 import com.cyksj.common.util.StringUtil;
 import com.cyksj.dto.Result;
+import com.cyksj.enums.BusinessType;
 import com.cyksj.enums.GatewayResponse;
 import com.cyksj.mapper.OrderCommentMapper;
 import com.cyksj.mapper.RealGoodsInterestUserMapper;
@@ -105,6 +107,7 @@ public class CmsOrderController {
 	 */
 	@GetMapping("/export")
 	@SaCheckPermission("order:export")
+	@Log(module = "订单管理/导出订单", businessType = BusinessType.EXPORT, isSaveRequestData = true)
 	public void exportOrders(HttpServletResponse response) {
 		List<ExcelOrderDonData> list = beanSearcher.searchAll(ExcelOrderDonData.class, MapUtils.flatBuilder(request.getParameterMap()).build());
 		list.forEach(data -> {
@@ -296,6 +299,7 @@ public class CmsOrderController {
      */
     @PostMapping("/put/realGoods/service")
     @NoSubmit
+    @Log(module = "订单管理/售前、售后客服", businessType = BusinessType.PUT, isSaveRequestData = true)
     public Result<String> putRealGoodsService(@RequestBody @Validated RealGoodsServiceReq request) {
         OrderDon orderDon = cmsOrderDonService.getById(request.getOrderId());
         if (orderDon == null || orderDon.getRelationId() != 0) {

netflix-web/src/main/java/com/cyksj/web/controller/manage/account/CmsAccountController.java

@@ -9,9 +9,11 @@ import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.event.AnalysisEventListener;
 import com.alibaba.excel.support.ExcelTypeEnum;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.cyksj.common.annotation.Log;
 import com.cyksj.common.annotation.NoSubmit;
 import com.cyksj.common.exception.BusinessRuntimeException;
 import com.cyksj.dto.Result;
+import com.cyksj.enums.BusinessType;
 import com.cyksj.enums.GatewayResponse;
 import com.cyksj.mapper.GroupsMapper;
 import com.cyksj.mapper.HomeGroupMapper;
@@ -106,6 +108,7 @@ public class CmsAccountController {
      */
     @GetMapping("/export/account")
     @SaCheckPermission("account:export")
+    @Log(module = "平台管理/导出账号", businessType = BusinessType.EXPORT, isSaveRequestData = true)
     public void exportAccount(Long userId, String nickName, String submitAccount, String expiryStartTime, String expiryEndTime, HttpServletResponse response) {
         MapBuilder mapBuilder = MapUtils.flatBuilder(request.getParameterMap());
         if (StrUtil.isNotEmpty(expiryStartTime) || StrUtil.isNotEmpty(expiryEndTime)) {
@@ -183,6 +186,7 @@ public class CmsAccountController {
     @NoSubmit
     @Transactional(rollbackFor = Throwable.class)
     @SaCheckPermission("account:add")
+    @Log(module = "平台管理/新增账号", businessType = BusinessType.POST, isSaveRequestData = true)
     public Result<String> add(@RequestBody Account account){
 		account.setAccount(account.getAccount().trim());
 		account.setPassword(account.getPassword().trim());
@@ -206,6 +210,7 @@ public class CmsAccountController {
 
     @PutMapping("/update")
     @SaCheckPermission("account:update")
+    @Log(module = "平台管理/编辑账号", businessType = BusinessType.PUT, isSaveRequestData = true)
     public Result<String> update(@RequestBody Account account){
 		if (StrUtil.isNotBlank(account.getAccount())){
 			account.setAccount(account.getAccount().trim());
@@ -221,6 +226,7 @@ public class CmsAccountController {
 	 * 修改密码并发送模板消息
 	 */
 	@PutMapping("/update/pwd")
+	@Log(module = "平台管理/批量修改密码", businessType = BusinessType.PUT, isSaveRequestData = true)
 	public Result<String> updatePwdAndSendMsg(@RequestBody List<Account> accounts) throws Exception {
 		accounts.forEach(account -> {
 			Account db = accountService.getById(account.getId());
@@ -265,7 +271,8 @@ public class CmsAccountController {
 
 	@DeleteMapping("/delete/{id}")
 	@SaCheckPermission("account:delete")
-    public Result<String> update(@PathVariable Long id){
+	@Log(module = "平台管理/删除账号", businessType = BusinessType.DELETE, isSaveRequestData = true)
+	public Result<String> update(@PathVariable Long id){
 	    //是否关联了车队
 	    Integer count = groupsMapper.selectCount(Wrappers.lambdaQuery(GroupsTrips.class).eq(GroupsTrips::getAccountId, id));
 	    if (count > 0) {

netflix-web/src/main/java/com/cyksj/web/controller/manage/cms/CmsAdminUserController.java

@@ -9,10 +9,12 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.cyksj.common.annotation.Log;
 import com.cyksj.common.constant.Constant;
 import com.cyksj.common.exception.BusinessRuntimeException;
 import com.cyksj.common.util.Codec;
 import com.cyksj.dto.Result;
+import com.cyksj.enums.BusinessType;
 import com.cyksj.enums.GatewayApiCode;
 import com.cyksj.enums.GatewayResponse;
 import com.cyksj.mapper.PhoneCodeMapper;
@@ -83,6 +85,7 @@ public class CmsAdminUserController {
 	}
 
 	@PostMapping("/post")
+	@Log(module = "用户管理/新增用户", businessType = BusinessType.POST, isSaveRequestData = true)
 	public Result<String> saveAdmin(@RequestBody @Validated CmsUserReq cmsUserReq) throws Exception {
 		Long adminId = StpUtil.getLoginIdAsLong();
 		CmsUser exist = cmsUserMapper.selectById(adminId);
@@ -120,6 +123,7 @@ public class CmsAdminUserController {
 	 * 删除管理员
 	 */
 	@DeleteMapping("/delete/{id}")
+	@Log(module = "用户管理/删除用户", businessType = BusinessType.DELETE)
 	public Result<String> deleteAdminById(@PathVariable Long id) throws Exception {
 		Long adminId = StpUtil.getLoginIdAsLong();
 		CmsUser exist = cmsUserMapper.selectById(adminId);
@@ -139,6 +143,7 @@ public class CmsAdminUserController {
 	 * 编辑管理员
 	 */
 	@PutMapping("/put")
+	@Log(module = "用户管理/编辑用户", businessType = BusinessType.PUT, isSaveRequestData = true)
 	public Result<String> editAdmin(@RequestBody CmsUserReq cmsUserReq) throws Exception {
 		Long adminId = StpUtil.getLoginIdAsLong();
 		CmsUser exist = cmsUserMapper.selectById(adminId);

netflix-web/src/main/java/com/cyksj/web/controller/manage/coupon/CouponController.java

@@ -3,9 +3,11 @@ package com.cyksj.web.controller.manage.coupon;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.cyksj.common.annotation.Log;
 import com.cyksj.common.exception.BusinessRuntimeException;
 import com.cyksj.config.corp.WeChatCorpFactory;
 import com.cyksj.dto.Result;
+import com.cyksj.enums.BusinessType;
 import com.cyksj.enums.GatewayResponse;
 import com.cyksj.mapper.corp.CorpUserAuthMapper;
 import com.cyksj.mapper.corp.CorpUserMapper;
@@ -73,6 +75,7 @@ public class CouponController {
 	 * 新增优惠券
 	 */
 	@PostMapping
+	@Log(module = "优惠券/新增优惠券", businessType = BusinessType.POST, isSaveRequestData = true)
 	public Result<String> couponSave(@RequestBody @Validated Coupon coupon) throws Exception {
 		couponCommonService.saveCoupon(coupon);
 		return GatewayResponse.SUCCESS.newBuilder().toResult("新增优惠券成功");
@@ -83,6 +86,7 @@ public class CouponController {
 	 */
 	@DeleteMapping("/{id}")
 	@Transactional(rollbackFor = Throwable.class)
+	@Log(module = "优惠券/删除优惠券", businessType = BusinessType.DELETE)
 	public Result<String> couponSave(@PathVariable Long id) throws Exception {
 		couponMapper.deleteById(id);
 		couponSkuMapper.deleteByCid(id);
@@ -96,6 +100,7 @@ public class CouponController {
 	 * 修改优惠券
 	 */
 	@PutMapping
+	@Log(module = "优惠券/编辑优惠券", businessType = BusinessType.PUT, isSaveRequestData = true)
 	public Result<String> putCoupon(@RequestBody @Validated Coupon coupon) throws Exception {
 		couponCommonService.updateCoupon(coupon);
 		return GatewayResponse.SUCCESS.newBuilder().toResult("修改优惠券成功");
@@ -105,6 +110,7 @@ public class CouponController {
 	 * 发放优惠券
 	 */
 	@PostMapping("/send")
+	@Log(module = "优惠券/发放优惠券", businessType = BusinessType.POST, isSaveRequestData = true)
 	public Result<String> senCoupon(@RequestBody @Validated CouponActiveReq couponActiveReq) throws Exception {
 		couponCommonService.sendCoupon(couponActiveReq);
 		return GatewayResponse.SUCCESS.newBuilder().toResult("发放优惠券成功");
@@ -114,6 +120,7 @@ public class CouponController {
 	 * 优惠券 设置为推荐优惠券
 	 */
 	@PutMapping("/set/hot/{couponId}")
+	@Log(module = "优惠券/推荐优惠券", businessType = BusinessType.POST)
 	public Result<String> setHotCoupon(@PathVariable @Min(value = 1) Long couponId) {
 		couponCommonService.setHotCoupon(couponId);
 		return GatewayResponse.SUCCESS.newBuilder().toResult("推荐优惠券成功");

netflix-web/src/main/java/com/cyksj/web/controller/manage/distribute/DistributeController.java

@@ -3,9 +3,11 @@ package com.cyksj.web.controller.manage.distribute;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.cyksj.common.annotation.Log;
 import com.cyksj.common.constant.Constant;
 import com.cyksj.common.exception.BusinessRuntimeException;
 import com.cyksj.dto.Result;
+import com.cyksj.enums.BusinessType;
 import com.cyksj.enums.GatewayResponse;
 import com.cyksj.mapper.GoodsDonMapper;
 import com.cyksj.mapper.GoodsDonSkuMapper;
@@ -64,14 +66,13 @@ public class DistributeController {
 
 	private final GoodsDonSkuMapper goodsDonSkuMapper;
 
-	private final HttpServletRequest request;
-
 	private final StatisticsDataService statisticsDataService;
 
 	/**
 	 * 添加固定推广者
 	 */
 	@PostMapping
+	@Log(module = "分销管理/增加推广者", businessType = BusinessType.POST, isSaveRequestData = true)
 	public Result<String> saveDistributes(@RequestBody @NotNull UserDistributeReq userDistributeReq) {
 		distributeService.insertDistribute(userDistributeReq);
 		return GatewayResponse.SUCCESS.newBuilder().toResult("添加成功");
@@ -81,6 +82,7 @@ public class DistributeController {
 	 * 删除固定推广者
 	 */
 	@DeleteMapping("/del/{id}")
+	@Log(module = "分销管理/删除推广者", businessType = BusinessType.DELETE, isSaveRequestData = true)
 	public Result<String> deleteDistributesById(@PathVariable Long id) {
 		if (id == null || id < 1) {
 			throw BusinessRuntimeException.getInstance("id不存在");
@@ -93,6 +95,7 @@ public class DistributeController {
 	 * 推广者编辑
 	 */
 	@PutMapping
+	@Log(module = "分销管理/编辑推广者", businessType = BusinessType.PUT, isSaveRequestData = true)
 	public Result<String> editDistribute(@RequestBody UserDistributeReq userDistributeReq) {
 		distributeService.editDistribute(userDistributeReq);
 		return GatewayResponse.SUCCESS.newBuilder().toResult("编辑成功");
@@ -137,9 +140,8 @@ public class DistributeController {
 	 * 获取平台分销比例
 	 */
 	@GetMapping("/get/plat")
-	public Result<SearchResult<GoodsDon>> getGoodsDistributeRate() {
-		SearchResult<GoodsDon> search = beanSearcher.search(GoodsDon.class, MapUtils.flatBuilder(request.getParameterMap()).field(GoodsDon::getDeleted, true).build());
-		return GatewayResponse.SUCCESS.newBuilder().toResult(search);
+	public Result<List<GoodsDon>> getGoodsDistributeRate() {
+		return GatewayResponse.SUCCESS.newBuilder().toResult(goodsDonMapper.selectList(Wrappers.lambdaQuery(GoodsDon.class).eq(GoodsDon::getType, 1).eq(GoodsDon::getDeleted, true).orderByAsc(GoodsDon::getId).select(GoodsDon::getId, GoodsDon::getTitle, GoodsDon::getRate)));
 	}
 
 	/**
@@ -190,6 +192,7 @@ public class DistributeController {
 	 * 平台分销比例修改
 	 */
 	@PutMapping("/put/goods/rate")
+	@Log(module = "分销管理/修改平台分销比例", businessType = BusinessType.PUT, isSaveRequestData = true)
 	public Result<String> editGoodsDistributeRate(@RequestBody UserDistributeReq userDistributeReq) {
 		for (UserPlatDistributeRate rate : userDistributeReq.getRates()) {
 			if (rate.getRate() < 0 || rate.getRate() > 100) {

netflix-web/src/main/java/com/cyksj/web/controller/manage/exchange/ExchangeCodeController.java

@@ -3,8 +3,10 @@ package com.cyksj.web.controller.manage.exchange;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.excel.support.ExcelTypeEnum;
+import com.cyksj.common.annotation.Log;
 import com.cyksj.common.exception.BusinessRuntimeException;
 import com.cyksj.dto.Result;
+import com.cyksj.enums.BusinessType;
 import com.cyksj.enums.GatewayResponse;
 import com.cyksj.model.excel.ExcelExchangeCodeData;
 import com.cyksj.model.request.ExchangeCodeReq;
@@ -15,7 +17,9 @@ import com.ejlchina.searcher.BeanSearcher;
 import com.ejlchina.searcher.SearchResult;
 import com.ejlchina.searcher.util.MapUtils;
 import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -43,6 +47,7 @@ public class ExchangeCodeController {
 	 */
 	@GetMapping("/createAndExport")
 	@SaCheckPermission("exchangeCode:add")
+	@Log(module = "兑换码/生成兑换码", businessType = BusinessType.POST, isSaveRequestData = true)
 	private void createAndExportCode(ExchangeCodeReq exchangeCodeReq, HttpServletResponse response) {
 		if (ObjectUtil.hasEmpty(exchangeCodeReq.getGoodsId(), exchangeCodeReq.getSkuId(), exchangeCodeReq.getNumber())) {
 			throw BusinessRuntimeException.getInstance("必填项为空");

netflix-web/src/main/java/com/cyksj/web/controller/manage/goods/CmsGoodsDonController.java

@@ -2,7 +2,10 @@ package com.cyksj.web.controller.manage.goods;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.bean.BeanUtil;
+import com.cyksj.common.annotation.Log;
+import com.cyksj.common.exception.BusinessRuntimeException;
 import com.cyksj.dto.Result;
+import com.cyksj.enums.BusinessType;
 import com.cyksj.enums.GatewayResponse;
 import com.cyksj.model.entity.GoodsDon;
 import com.cyksj.model.entity.GoodsDonSku;
@@ -70,10 +73,12 @@ public class CmsGoodsDonController {
      * 新增 商品spu
      */
     @PostMapping(value = "/post")
-    public Result<Long> spuInsert(@Validated @RequestBody ReqGoodsSpuInsert spu) throws Exception{
+    @SaCheckPermission("platform:add")
+    @Log(module = "平台管理/新增平台", businessType = BusinessType.POST, isSaveRequestData = true)
+    public Result<Long> spuInsert(@Validated @RequestBody ReqGoodsSpuInsert spu) throws Exception {
         // 新增商品
         GoodsDon goods = new GoodsDon();
-        BeanUtil.copyProperties(spu,goods);
+        BeanUtil.copyProperties(spu, goods);
 
         goodsDonService.save(goods);
         return GatewayResponse.SUCCESS.newBuilder().toResult(goods.getId());
@@ -84,6 +89,7 @@ public class CmsGoodsDonController {
      */
     @PutMapping(value = "/update")
     @SaCheckPermission("platform:update")
+    @Log(module = "平台管理/编辑平台", businessType = BusinessType.PUT, isSaveRequestData = true)
     public Result<String> spuUpdate(@Validated @RequestBody ReqGoodsSpuInsert spu) throws Exception{
         GoodsDon goods = new GoodsDon();
         BeanUtil.copyProperties(spu,goods);
@@ -92,7 +98,30 @@ public class CmsGoodsDonController {
     }
 
 
+    @PutMapping("/put/status/{id}")
+    @SaCheckPermission("platform:updateStatus")
+    @Log(module = "平台管理/平台上下架", businessType = BusinessType.PUT, isSaveRequestData = true, isSaveResponseData = true)
+    public Result<Boolean> updateStatus(@PathVariable Long id) {
+        GoodsDon goods = goodsDonService.getById(id);
+        if (goods == null) {
+            throw BusinessRuntimeException.getInstance("平台不存在");
+        }
+        goods.setStatus(!goods.getStatus());
+        goodsDonService.updateById(goods);
+        return GatewayResponse.SUCCESS.newBuilder().toResult(goods.getStatus());
+    }
 
-
+    @DeleteMapping("/delete/{id}")
+    @SaCheckPermission("platform:delete")
+    @Log(module = "平台管理/删除平台", businessType = BusinessType.DELETE, isSaveRequestData = true, isSaveResponseData = true)
+    public Result<Long> deleteById(@PathVariable Long id) {
+        GoodsDon goods = goodsDonService.getById(id);
+        if (goods == null) {
+            throw BusinessRuntimeException.getInstance("平台不存在");
+        }
+        goods.setDeleted(false);
+        goodsDonService.updateById(goods);
+        return GatewayResponse.SUCCESS.newBuilder().toResult(id);
+    }
 
 }

netflix-web/src/main/java/com/cyksj/web/controller/manage/goods/CmsGoodsDonSkuController.java

@@ -2,9 +2,10 @@ package com.cyksj.web.controller.manage.goods;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.cyksj.common.util.IoKit;
+import com.cyksj.common.annotation.Log;
 import com.cyksj.common.util.Jsons;
 import com.cyksj.dto.Result;
+import com.cyksj.enums.BusinessType;
 import com.cyksj.enums.GatewayResponse;
 import com.cyksj.model.entity.GoodsDon;
 import com.cyksj.model.entity.GoodsDonSku;
@@ -47,6 +48,7 @@ public class CmsGoodsDonSkuController {
      * 新增 商品spec & sku
      */
     @PostMapping(value = "/post/spec-sku")
+    @Log(module = "平台管理/新增商品sku&spec", businessType = BusinessType.POST, isSaveRequestData = true)
     public Result<String> skuInsert(@Validated @RequestBody ReqGoodsSkuInsert insert) throws Exception{
 
         GoodsDon goods = goodsDonService.getById(insert.getGoodsId());
@@ -125,6 +127,7 @@ public class CmsGoodsDonSkuController {
      */
     @Transactional(rollbackFor = Throwable.class)
     @PostMapping(value = "/post")
+    @Log(module = "平台管理/新增规格", businessType = BusinessType.POST, isSaveRequestData = true)
     public Result<String> skuAppend(@Validated @RequestBody ReqGoodsSkuInsert insert) throws Exception{
 
         GoodsDon goods = goodsDonService.getById(insert.getGoodsId());
@@ -215,6 +218,7 @@ public class CmsGoodsDonSkuController {
      */
     @Transactional(rollbackFor = Throwable.class)
     @PutMapping(value = "/update")
+    @Log(module = "平台管理/编辑规格", businessType = BusinessType.PUT, isSaveRequestData = true)
     public Result<String> skuUpdate(@RequestBody GoodsDonSku sku){
         goodsDonSkuService.saveOrUpdate(sku);
         return GatewayResponse.SUCCESS.newBuilder().toResult();
@@ -226,6 +230,7 @@ public class CmsGoodsDonSkuController {
      */
     @Transactional(rollbackFor = Throwable.class)
     @DeleteMapping("/delete/{skuId}")
+    @Log(module = "平台管理/删除规格", businessType = BusinessType.DELETE)
     public Result<String> skuDelete(@PathVariable Long skuId) {
         goodsDonSkuService.removeById(skuId);
         return GatewayResponse.SUCCESS.newBuilder().toResult();

netflix-web/src/main/java/com/cyksj/web/controller/manage/group/CmsGroupController.java

@@ -1,9 +1,11 @@
 package com.cyksj.web.controller.manage.group;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.cyksj.common.annotation.Log;
 import com.cyksj.common.annotation.NoSubmit;
 import com.cyksj.common.exception.BusinessRuntimeException;
 import com.cyksj.dto.Result;
+import com.cyksj.enums.BusinessType;
 import com.cyksj.enums.GatewayResponse;
 import com.cyksj.mapper.GroupsRelationMapper;
 import com.cyksj.model.entity.Account;
@@ -79,6 +81,7 @@ public class CmsGroupController {
     @PostMapping("/post")
     @NoSubmit
     @SaCheckPermission("group:add")
+    @Log(module = "发布车票/新增车队", businessType = BusinessType.POST, isSaveRequestData = true)
     public Result<GroupsTrips> add(@RequestBody GroupsTrips groups){
 
         GroupsTrips groupsTrips = groupService.issuance(groups);
@@ -87,12 +90,14 @@ public class CmsGroupController {
     }
 
     @PutMapping("/update")
+    @Log(module = "发布车票/编辑车队", businessType = BusinessType.PUT, isSaveRequestData = true)
     public Result<String> update(@RequestBody GroupsTrips groups){
         groupService.updateById(groups);
         return GatewayResponse.SUCCESS.newBuilder().toResult();
     }
 
     @DeleteMapping("/delete/{id}")
+    @Log(module = "发布车票/删除车队", businessType = BusinessType.DELETE, isSaveRequestData = true)
     public Result<String> delete(@PathVariable Long id){
         groupService.close(id);
 
@@ -100,6 +105,7 @@ public class CmsGroupController {
     }
 
     @PutMapping("/update/set/account")
+    @Log(module = "发布车票/配置账号", businessType = BusinessType.PUT, isSaveRequestData = true)
     public Result<String> setAccount(@RequestBody GroupsTrips groupsTrips){
         Account account = accountService.getById(groupsTrips.getAccountId());
         if(account == null){

netflix-web/src/main/java/com/cyksj/web/controller/manage/group/CmsHomeGroupController.java

@@ -1,14 +1,16 @@
 package com.cyksj.web.controller.manage.group;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.cyksj.common.exception.BusinessRuntimeException;
+import com.cyksj.common.annotation.Log;
 import com.cyksj.dto.Result;
+import com.cyksj.enums.BusinessType;
 import com.cyksj.enums.GatewayResponse;
-import com.cyksj.mapper.GroupsRelationMapper;
-import com.cyksj.model.entity.*;
+import com.cyksj.model.entity.HomeGroup;
+import com.cyksj.model.entity.OrderDon;
 import com.cyksj.model.manage.views.HomeGroupView;
 import com.cyksj.model.manage.views.HomeUserView;
-import com.cyksj.service.mange.*;
+import com.cyksj.service.mange.CmsHomeGroupService;
+import com.cyksj.service.mange.CmsOrderDonService;
 import com.ejlchina.searcher.BeanSearcher;
 import com.ejlchina.searcher.SearchResult;
 import com.ejlchina.searcher.util.MapUtils;
@@ -55,6 +57,7 @@ public class CmsHomeGroupController {
 
     @Transactional(rollbackFor = Throwable.class)
     @PostMapping("/post")
+    @Log(module = "平台管理/家庭组管理新增用户", businessType = BusinessType.POST, isSaveRequestData = true)
     public Result<String> post(@RequestBody HomeGroup homeGroup) {
         OrderDon orderDon = orderDonService.getOne(Wrappers.lambdaQuery(OrderDon.class)
                 .eq(OrderDon::getUserId, homeGroup.getUserId())
@@ -74,6 +77,7 @@ public class CmsHomeGroupController {
     }
 
     @DeleteMapping("/delete/{id}")
+    @Log(module = "平台管理/家庭组管理删除用户", businessType = BusinessType.DELETE, isSaveRequestData = true)
     public Result<String> delete(@PathVariable Long id) {
         homeGroupService.removeById(id);
         return GatewayResponse.SUCCESS.newBuilder().toResult();

netflix-web/src/main/java/com/cyksj/web/controller/manage/statistics/StatisticsDataController.java

@@ -7,9 +7,11 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.excel.support.ExcelTypeEnum;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.cyksj.common.annotation.Log;
 import com.cyksj.common.constant.Constant;
 import com.cyksj.common.exception.BusinessRuntimeException;
 import com.cyksj.dto.Result;
+import com.cyksj.enums.BusinessType;
 import com.cyksj.enums.GatewayResponse;
 import com.cyksj.mapper.CustomerServiceRenewOrderRecordMapper;
 import com.cyksj.mapper.GroupsRelationMapper;
@@ -42,7 +44,9 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /*
@@ -137,6 +141,7 @@ public class StatisticsDataController {
 	@PutMapping("/renewTime/up")
 	@Transactional(rollbackFor = Throwable.class)
 	@SaCheckPermission("validAccount:addTime")
+	@Log(module = "有效子账号管理/增加时长", businessType = BusinessType.PUT, isSaveRequestData = true)
 	public Result<String> addRenewTime(@RequestBody @Validated RenewTimeUpReq renewTimeUpReq) {
 		GroupsRelation relation = groupsRelationMapper.selectById(renewTimeUpReq.getRelationId());
 		if (relation == null) {

netflix-web/src/main/java/com/cyksj/web/controller/manage/stock/StockController.java

@@ -1,7 +1,9 @@
 package com.cyksj.web.controller.manage.stock;
 
+import com.cyksj.common.annotation.Log;
 import com.cyksj.common.exception.BusinessRuntimeException;
 import com.cyksj.dto.Result;
+import com.cyksj.enums.BusinessType;
 import com.cyksj.enums.GatewayResponse;
 import com.cyksj.model.entity.GoodsDonStock;
 import com.cyksj.model.entity.GoodsDonStockRecord;
@@ -44,6 +46,7 @@ public class StockController {
      * 新增库存
      */
     @PostMapping("/incr")
+    @Log(module = "库存管理/增加库存", businessType = BusinessType.POST, isSaveRequestData = true)
     public Result<String> incr(@RequestBody StockUpReq stock){
         if (stock.getNum() <= 0) {
             throw BusinessRuntimeException.getInstance("新增库存数量不能为负数");
@@ -62,6 +65,7 @@ public class StockController {
      * 扣减库存
      */
     @PostMapping("/sub")
+    @Log(module = "库存管理/扣减库存", businessType = BusinessType.PUT, isSaveRequestData = true)
     public Result<String> sub(@RequestBody StockUpReq stock){
         stockService.sub(stock);
         return GatewayResponse.SUCCESS.newBuilder().toResult();

netflix-web/src/main/java/com/cyksj/web/controller/payment/OrderController.java

@@ -4,12 +4,14 @@ import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.qrcode.QrCodeUtil;
 import cn.hutool.extra.qrcode.QrConfig;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.cyksj.common.annotation.Log;
 import com.cyksj.common.exception.BusinessRuntimeException;
 import com.cyksj.common.util.IoKit;
 import com.cyksj.common.util.Xmls;
 import com.cyksj.config.zfb.BaseZfbConfig;
 import com.cyksj.config.zfb.ZfbProductCode;
 import com.cyksj.dto.Result;
+import com.cyksj.enums.BusinessType;
 import com.cyksj.enums.GatewayResponse;
 import com.cyksj.mapper.OrderDonMapper;
 import com.cyksj.mapper.OrderDonWaybillMapper;
@@ -126,6 +128,7 @@ public class OrderController {
      * 微信订单退款
      */
     @PostMapping("/wx/refund")
+    @Log(module = "订单管理/微信退款", businessType = BusinessType.PUT, isSaveRequestData = true)
     private Result<String> wxRefund(@RequestBody @Validated WxOrderRefundReq wxOrderRefundReq) throws Exception {
         return orderDonService.wxRefund(wxOrderRefundReq);
     }
@@ -278,6 +281,7 @@ public class OrderController {
      * 支付宝退款
      */
     @PostMapping("/zfb/refund")
+    @Log(module = "订单管理/支付宝退款", businessType = BusinessType.PUT, isSaveRequestData = true)
     public Result<String> zfbOrderRefund(@RequestBody @Validated ZfbOrderRefundReq zfbOrderRefundReq) throws Exception {
         return orderDonService.zfbRefund(zfbOrderRefundReq);
     }

netflix-web/src/main/java/com/cyksj/web/controller/sys/SysConfigController.java

@@ -2,8 +2,10 @@ package com.cyksj.web.controller.sys;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.cyksj.common.annotation.Log;
 import com.cyksj.common.exception.BusinessRuntimeException;
 import com.cyksj.dto.Result;
+import com.cyksj.enums.BusinessType;
 import com.cyksj.enums.GatewayResponse;
 import com.cyksj.mapper.manage.help.HelpQuestionClassificationMapper;
 import com.cyksj.mapper.manage.help.HelpQuestionMapper;
@@ -44,6 +46,7 @@ public class SysConfigController {
 	}
 
 	@PostMapping("/post")
+	@Log(module = "系统设置/新增配置", businessType = BusinessType.POST, isSaveRequestData = true)
 	public Result<SysConfig> post(@RequestBody SysConfig sysConfig) {
 		sysConfigService.save(sysConfig);
 
@@ -51,6 +54,7 @@ public class SysConfigController {
 	}
 
 	@PutMapping("/update")
+	@Log(module = "系统设置/编辑配置", businessType = BusinessType.PUT, isSaveRequestData = true)
 	public Result<SysConfig> update(@RequestBody SysConfig sysConfig) {
 		sysConfigService.updateById(sysConfig);
 
@@ -58,6 +62,7 @@ public class SysConfigController {
 	}
 
 	@DeleteMapping("/delete/{id}")
+	@Log(module = "系统设置/删除配置", businessType = BusinessType.DELETE)
 	public Result<String> update(@PathVariable Long id) {
 		sysConfigService.removeById(id);