From c1551a93dc2d2c95cd457258e4e904f1856778d0 Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Thu, 23 Mar 2023 14:10:48 +0800 Subject: [PATCH] fix business --- .../controller/sys/WxBusinessController.java | 45 +++++++++++++++++++ .../iformall/service/WxBusinessService.java | 2 +- .../service/impl/WxBusinessServiceImpl.java | 17 +++++++ 3 files changed, 63 insertions(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java index 3bd0b4289..eb6af3352 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java @@ -1,11 +1,16 @@ package com.iformall.controller.sys; import com.iformall.annotation.SystemControllerLog; +import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.WxBusiness; +import com.iformall.domain.po.WxCoupon; import com.iformall.domain.vo.WxBusinessDataVo; +import com.iformall.enums.EnumCouponContentType; +import com.iformall.enums.EnumCouponSourceType; +import com.iformall.enums.EnumRentContractAppStatus; import com.iformall.enums.EnumYesOrNo; import com.iformall.service.ExcelService; import com.iformall.service.WxBusinessService; @@ -64,6 +69,46 @@ public class WxBusinessController extends BaseController { final List busList = wxBusinessService.findTreeList(getTenantInfo()); return new ResultData(busList); } + + @ApiOperation("新增/修改接口") + @PostMapping("saveOrUpdate") + public ResultData saveOrUpdate(@RequestBody WxBusiness wxBusiness) { + TenantEntity tenantEntity = getTenantInfo(); + wxBusiness.setFinalTenantId(tenantEntity.getFinalTenantId()); + if (null != wxBusiness.getId()) { + //不能修改系统默认的 + WxBusiness b = wxBusinessService.getById(wxBusiness.getId(), wxBusiness.getFinalTenantId()); + if (null == b) { + return new ResultData(Result.ERROR,"未查询到业态"); + } + if (b.getIsSystem().intValue() == EnumYesOrNo.YES.getCode().intValue()) { + return new ResultData(Result.ERROR,"不能修改系统默认业态"); + } + } + wxBusinessService.saveOrUpdate(wxBusiness); + return new ResultData(); + } + + @ApiOperation("删除接口") + @PostMapping("del") + public ResultData delete(@RequestBody WxBusiness wxBusiness) { + TenantEntity tenantEntity = getTenantInfo(); + wxBusiness.setFinalTenantId(tenantEntity.getFinalTenantId()); + if (null == wxBusiness.getId()) { + return new ResultData(Result.ERROR,"参数错误"); + } + //不能修改系统默认的 + WxBusiness b = wxBusinessService.getById(wxBusiness.getId(), wxBusiness.getFinalTenantId()); + if (null == b) { + return new ResultData(Result.ERROR,"未查询到业态"); + } + if (b.getIsSystem().intValue() == EnumYesOrNo.YES.getCode().intValue()) { + return new ResultData(Result.ERROR,"不能修改系统默认业态"); + } + b.setIsDel(EnumYesOrNo.YES.getCode()); + wxBusinessService.saveOrUpdate(b); + return new ResultData(); + } @ApiOperation("业态分析接口") @GetMapping("businessDataList") diff --git a/mallinkService/src/main/java/com/iformall/service/WxBusinessService.java b/mallinkService/src/main/java/com/iformall/service/WxBusinessService.java index 9769a340d..0fd23cff2 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBusinessService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBusinessService.java @@ -55,6 +55,6 @@ public interface WxBusinessService { ResultData devoteList(WxBusiness wxBusiness,Integer pageNum, Integer pageSize); - + void saveOrUpdate(WxBusiness record); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java index 16b83cf79..0ab31e19f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java @@ -3,6 +3,7 @@ package com.iformall.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.iformall.common.IdWorker; import com.iformall.common.ResultData; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.WxBusiness; @@ -25,6 +26,7 @@ import java.math.BigDecimal; import java.math.RoundingMode; import java.util.ArrayList; import java.util.Collection; +import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -277,4 +279,19 @@ public class WxBusinessServiceImpl implements WxBusinessService { } } + @Override + public void saveOrUpdate(WxBusiness record) { + if (null == record.getId()) { + record.setType(1); + record.setCreateDate(new Date()); + record.setUpdateDate(new Date()); + record.setIsSystem(EnumYesOrNo.NO.getCode()); + record.setIsDel(EnumYesOrNo.NO.getCode()); + wxBusinessMapper.insert(record); + }else { + record.setUpdateDate(new Date()); + wxBusinessMapper.updateById(record); + } + } + }