From d09c865c4371a29e0585bdcb19ae3856725ed3b3 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Mon, 4 Mar 2024 17:39:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E8=AE=A4=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/approvalrecords/ApprovalRecords.java | 25 +++++ .../approvalrecords/ApprovalRecordsDto.java | 22 +++++ .../approvalrecords/ApprovalRecordsQuery.java | 15 +++ .../approvalrecords/ApprovalRecordsVo.java | 23 +++++ .../EnterpriseCertification.java | 27 ++++++ .../EnterpriseCertificationDto.java | 25 +++++ .../EnterpriseCertificationQuery.java | 15 +++ .../EnterpriseCertificationVo.java | 25 +++++ .../ApprovalRecordsMapper.java | 23 +++++ .../approvalrecords/ApprovalRecordsMapper.xml | 17 ++++ .../approvalrecords/ApprovalRecordsRest.java | 47 ++++++++++ .../ApprovalRecordsService.java | 53 +++++++++++ .../EnterpriseCertificationMapper.java | 25 +++++ .../EnterpriseCertificationMapper.xml | 17 ++++ .../EnterpriseCertificationRest.java | 48 ++++++++++ .../EnterpriseCertificationService.java | 94 +++++++++++++++++++ .../yythmall/biz/lpkgoods/LpkGoodsRest.java | 5 + .../biz/lpkgoods/LpkGoodsService.java | 40 ++++++++ .../VegetableCellarService.java | 7 -- .../yxt/yythmall/config/SaTokenConfigure.java | 2 + 20 files changed, 548 insertions(+), 7 deletions(-) create mode 100644 src/main/java/com/yxt/yythmall/api/approvalrecords/ApprovalRecords.java create mode 100644 src/main/java/com/yxt/yythmall/api/approvalrecords/ApprovalRecordsDto.java create mode 100644 src/main/java/com/yxt/yythmall/api/approvalrecords/ApprovalRecordsQuery.java create mode 100644 src/main/java/com/yxt/yythmall/api/approvalrecords/ApprovalRecordsVo.java create mode 100644 src/main/java/com/yxt/yythmall/api/enterprisecertification/EnterpriseCertification.java create mode 100644 src/main/java/com/yxt/yythmall/api/enterprisecertification/EnterpriseCertificationDto.java create mode 100644 src/main/java/com/yxt/yythmall/api/enterprisecertification/EnterpriseCertificationQuery.java create mode 100644 src/main/java/com/yxt/yythmall/api/enterprisecertification/EnterpriseCertificationVo.java create mode 100644 src/main/java/com/yxt/yythmall/biz/approvalrecords/ApprovalRecordsMapper.java create mode 100644 src/main/java/com/yxt/yythmall/biz/approvalrecords/ApprovalRecordsMapper.xml create mode 100644 src/main/java/com/yxt/yythmall/biz/approvalrecords/ApprovalRecordsRest.java create mode 100644 src/main/java/com/yxt/yythmall/biz/approvalrecords/ApprovalRecordsService.java create mode 100644 src/main/java/com/yxt/yythmall/biz/enterprisecertification/EnterpriseCertificationMapper.java create mode 100644 src/main/java/com/yxt/yythmall/biz/enterprisecertification/EnterpriseCertificationMapper.xml create mode 100644 src/main/java/com/yxt/yythmall/biz/enterprisecertification/EnterpriseCertificationRest.java create mode 100644 src/main/java/com/yxt/yythmall/biz/enterprisecertification/EnterpriseCertificationService.java diff --git a/src/main/java/com/yxt/yythmall/api/approvalrecords/ApprovalRecords.java b/src/main/java/com/yxt/yythmall/api/approvalrecords/ApprovalRecords.java new file mode 100644 index 0000000..532defa --- /dev/null +++ b/src/main/java/com/yxt/yythmall/api/approvalrecords/ApprovalRecords.java @@ -0,0 +1,25 @@ +package com.yxt.yythmall.api.approvalrecords; + +import lombok.Data; + +import java.util.UUID; + +/** + * @author wangpengfei + * @date 2023/11/30 9:27 + */ +@Data +public class ApprovalRecords { + + private String id; + private String sid= UUID.randomUUID().toString(); + private String createTime; + private String remarks; + private String isEnable; + private String customerSid; + private String approvalOpinions;//审核意见 + private String operator;//操作人 + private String operatorSid;//操作人sid + private String approvalStatus;//审核状态 + +} diff --git a/src/main/java/com/yxt/yythmall/api/approvalrecords/ApprovalRecordsDto.java b/src/main/java/com/yxt/yythmall/api/approvalrecords/ApprovalRecordsDto.java new file mode 100644 index 0000000..113acd8 --- /dev/null +++ b/src/main/java/com/yxt/yythmall/api/approvalrecords/ApprovalRecordsDto.java @@ -0,0 +1,22 @@ +package com.yxt.yythmall.api.approvalrecords; + +import com.yxt.common.core.dto.Dto; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/11/30 9:27 + */ +@Data +public class ApprovalRecordsDto implements Dto { + private String id; + private String sid; + private String createTime; + private String remarks; + private String isEnable; + private String customerSid; + private String approvalOpinions;//审核意见 + private String operator;//操作人 + private String operatorSid;//操作人sid + private String approvalStatus;//审核状态 +} diff --git a/src/main/java/com/yxt/yythmall/api/approvalrecords/ApprovalRecordsQuery.java b/src/main/java/com/yxt/yythmall/api/approvalrecords/ApprovalRecordsQuery.java new file mode 100644 index 0000000..5c9934b --- /dev/null +++ b/src/main/java/com/yxt/yythmall/api/approvalrecords/ApprovalRecordsQuery.java @@ -0,0 +1,15 @@ +package com.yxt.yythmall.api.approvalrecords; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/11/30 9:27 + */ +@Data +public class ApprovalRecordsQuery implements Query { + private String shortName; + private String name; + private String reviewStatus; +} diff --git a/src/main/java/com/yxt/yythmall/api/approvalrecords/ApprovalRecordsVo.java b/src/main/java/com/yxt/yythmall/api/approvalrecords/ApprovalRecordsVo.java new file mode 100644 index 0000000..0136cee --- /dev/null +++ b/src/main/java/com/yxt/yythmall/api/approvalrecords/ApprovalRecordsVo.java @@ -0,0 +1,23 @@ +package com.yxt.yythmall.api.approvalrecords; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/11/30 9:27 + */ +@Data +public class ApprovalRecordsVo implements Vo { + private String id; + private String sid; + private String createTime; + private String remarks; + private String isEnable; + private String customerSid; + private String approvalOpinions;//审核意见 + private String operator;//操作人 + private String operatorSid;//操作人sid + private String approvalStatus;//审核状态 + private String customerName; +} diff --git a/src/main/java/com/yxt/yythmall/api/enterprisecertification/EnterpriseCertification.java b/src/main/java/com/yxt/yythmall/api/enterprisecertification/EnterpriseCertification.java new file mode 100644 index 0000000..ff998d9 --- /dev/null +++ b/src/main/java/com/yxt/yythmall/api/enterprisecertification/EnterpriseCertification.java @@ -0,0 +1,27 @@ +package com.yxt.yythmall.api.enterprisecertification; + +import lombok.Data; + +import java.util.UUID; + +/** + * @author wangpengfei + * @date 2023/11/30 9:27 + */ +@Data +public class EnterpriseCertification { + + private String id; + private String sid= UUID.randomUUID().toString(); + private String createTime; + private String remarks; + private String isEnable; + private String customerSid; + private String enterpriseName; + private String shippingAddress; + private String contacts; + private String telephone; + private String reviewStatus; + private String state; + +} diff --git a/src/main/java/com/yxt/yythmall/api/enterprisecertification/EnterpriseCertificationDto.java b/src/main/java/com/yxt/yythmall/api/enterprisecertification/EnterpriseCertificationDto.java new file mode 100644 index 0000000..c20a4ed --- /dev/null +++ b/src/main/java/com/yxt/yythmall/api/enterprisecertification/EnterpriseCertificationDto.java @@ -0,0 +1,25 @@ +package com.yxt.yythmall.api.enterprisecertification; + +import com.yxt.common.core.dto.Dto; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/11/30 9:27 + */ +@Data +public class EnterpriseCertificationDto implements Dto { + private String id; + private String sid; + private String createTime; + private String remarks; + private String isEnable; + private String customerSid; + private String enterpriseName;//企业名称 + private String shippingAddress;//地址 + private String contacts;//联系人 + private String telephone;//联系电话 + private String reviewStatus; + private String state; + private String operator; +} diff --git a/src/main/java/com/yxt/yythmall/api/enterprisecertification/EnterpriseCertificationQuery.java b/src/main/java/com/yxt/yythmall/api/enterprisecertification/EnterpriseCertificationQuery.java new file mode 100644 index 0000000..6b30320 --- /dev/null +++ b/src/main/java/com/yxt/yythmall/api/enterprisecertification/EnterpriseCertificationQuery.java @@ -0,0 +1,15 @@ +package com.yxt.yythmall.api.enterprisecertification; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/11/30 9:27 + */ +@Data +public class EnterpriseCertificationQuery implements Query { + private String shortName; + private String name; + private String reviewStatus; +} diff --git a/src/main/java/com/yxt/yythmall/api/enterprisecertification/EnterpriseCertificationVo.java b/src/main/java/com/yxt/yythmall/api/enterprisecertification/EnterpriseCertificationVo.java new file mode 100644 index 0000000..47dab09 --- /dev/null +++ b/src/main/java/com/yxt/yythmall/api/enterprisecertification/EnterpriseCertificationVo.java @@ -0,0 +1,25 @@ +package com.yxt.yythmall.api.enterprisecertification; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/11/30 9:27 + */ +@Data +public class EnterpriseCertificationVo implements Vo { + private String id; + private String sid; + private String createTime; + private String remarks; + private String isEnable; + private String customerSid; + private String enterpriseName; + private String shippingAddress; + private String contacts; + private String telephone; + private String reviewStatus; + private String state; + private String customerName; +} diff --git a/src/main/java/com/yxt/yythmall/biz/approvalrecords/ApprovalRecordsMapper.java b/src/main/java/com/yxt/yythmall/biz/approvalrecords/ApprovalRecordsMapper.java new file mode 100644 index 0000000..911a775 --- /dev/null +++ b/src/main/java/com/yxt/yythmall/biz/approvalrecords/ApprovalRecordsMapper.java @@ -0,0 +1,23 @@ +package com.yxt.yythmall.biz.approvalrecords; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; + +import com.yxt.yythmall.api.approvalrecords.ApprovalRecords; +import com.yxt.yythmall.api.approvalrecords.ApprovalRecordsVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * @author wangpengfei + * @date 2023/11/21 15:03 + */ +@Mapper +public interface ApprovalRecordsMapper extends BaseMapper { + + IPage ListPageVo(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + +} diff --git a/src/main/java/com/yxt/yythmall/biz/approvalrecords/ApprovalRecordsMapper.xml b/src/main/java/com/yxt/yythmall/biz/approvalrecords/ApprovalRecordsMapper.xml new file mode 100644 index 0000000..19c2f95 --- /dev/null +++ b/src/main/java/com/yxt/yythmall/biz/approvalrecords/ApprovalRecordsMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/yxt/yythmall/biz/approvalrecords/ApprovalRecordsRest.java b/src/main/java/com/yxt/yythmall/biz/approvalrecords/ApprovalRecordsRest.java new file mode 100644 index 0000000..aca2971 --- /dev/null +++ b/src/main/java/com/yxt/yythmall/biz/approvalrecords/ApprovalRecordsRest.java @@ -0,0 +1,47 @@ +package com.yxt.yythmall.biz.approvalrecords; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.yythmall.api.approvalrecords.ApprovalRecordsDto; +import com.yxt.yythmall.api.approvalrecords.ApprovalRecordsQuery; +import com.yxt.yythmall.api.approvalrecords.ApprovalRecordsVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @author wangpengfei + * @date 2023/11/21 15:03 + */ + +@Api(tags = "企业认证") +@RestController +@RequestMapping("ApprovalRecords") +public class ApprovalRecordsRest { + + @Autowired + ApprovalRecordsService approvalRecordsService; + + @ApiOperation("分页列表") + @PostMapping("/listPage") + public ResultBean> ListPageVo(@RequestBody PagerQuery pq) { + return approvalRecordsService.ListPageVo(pq); + } + @ApiOperation("保存") + @PostMapping("/save") + public ResultBean save(@RequestBody ApprovalRecordsDto dto) { + return approvalRecordsService.save(dto); + } +// @ApiOperation("修改") +// @PostMapping("/update") +// public ResultBean update(@RequestBody ApprovalRecordsDto dto) { +// return approvalRecordsService.update(dto); +// } + + +} diff --git a/src/main/java/com/yxt/yythmall/biz/approvalrecords/ApprovalRecordsService.java b/src/main/java/com/yxt/yythmall/biz/approvalrecords/ApprovalRecordsService.java new file mode 100644 index 0000000..b2ed6e9 --- /dev/null +++ b/src/main/java/com/yxt/yythmall/biz/approvalrecords/ApprovalRecordsService.java @@ -0,0 +1,53 @@ +package com.yxt.yythmall.biz.approvalrecords; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.yythmall.api.approvalrecords.ApprovalRecords; +import com.yxt.yythmall.api.approvalrecords.ApprovalRecordsDto; +import com.yxt.yythmall.api.approvalrecords.ApprovalRecordsQuery; +import com.yxt.yythmall.api.approvalrecords.ApprovalRecordsVo; +import org.springframework.stereotype.Service; + +/** + * @author wangpengfei + * @date 2023/11/21 15:03 + */ +@Service +public class ApprovalRecordsService extends MybatisBaseService { + + + public ResultBean> ListPageVo(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + ApprovalRecordsQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("reviewStatus","0"); + qw.orderByDesc("createTime"); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.ListPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return rb.success().setData(p); + } + + public ResultBean save(ApprovalRecordsDto dto) { + ResultBean rb = ResultBean.fireFail(); + baseMapper.delete(new QueryWrapper().eq("customerSid",dto.getCustomerSid())); + ApprovalRecords entity=new ApprovalRecords(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + return rb.success().setMsg("添加成功"); + } +// public ResultBean update(ApprovalRecordsDto dto) { +// ResultBean rb=new ResultBean(); +// ApprovalRecords entity=baseMapper.selectOne(new QueryWrapper().eq("customerSid",dto.getCustomerSid())); +// BeanUtil.copyProperties(dto, entity, "id", "sid"); +// entity.setReviewStatus("0"); +// baseMapper.updateById(entity); +// return rb.success().setMsg("修改成功"); +// } +} diff --git a/src/main/java/com/yxt/yythmall/biz/enterprisecertification/EnterpriseCertificationMapper.java b/src/main/java/com/yxt/yythmall/biz/enterprisecertification/EnterpriseCertificationMapper.java new file mode 100644 index 0000000..7098941 --- /dev/null +++ b/src/main/java/com/yxt/yythmall/biz/enterprisecertification/EnterpriseCertificationMapper.java @@ -0,0 +1,25 @@ +package com.yxt.yythmall.biz.enterprisecertification; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.yythmall.api.enterprisecertification.EnterpriseCertification; +import com.yxt.yythmall.api.enterprisecertification.EnterpriseCertificationVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2023/11/21 15:03 + */ +@Mapper +public interface EnterpriseCertificationMapper extends BaseMapper { + + IPage ListPageVo(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + +} diff --git a/src/main/java/com/yxt/yythmall/biz/enterprisecertification/EnterpriseCertificationMapper.xml b/src/main/java/com/yxt/yythmall/biz/enterprisecertification/EnterpriseCertificationMapper.xml new file mode 100644 index 0000000..d557f2b --- /dev/null +++ b/src/main/java/com/yxt/yythmall/biz/enterprisecertification/EnterpriseCertificationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/yxt/yythmall/biz/enterprisecertification/EnterpriseCertificationRest.java b/src/main/java/com/yxt/yythmall/biz/enterprisecertification/EnterpriseCertificationRest.java new file mode 100644 index 0000000..bb58ef9 --- /dev/null +++ b/src/main/java/com/yxt/yythmall/biz/enterprisecertification/EnterpriseCertificationRest.java @@ -0,0 +1,48 @@ +package com.yxt.yythmall.biz.enterprisecertification; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.yythmall.api.enterprisecertification.EnterpriseCertificationDto; +import com.yxt.yythmall.api.enterprisecertification.EnterpriseCertificationQuery; +import com.yxt.yythmall.api.enterprisecertification.EnterpriseCertificationVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * @author wangpengfei + * @date 2023/11/21 15:03 + */ + +@Api(tags = "企业认证") +@RestController +@RequestMapping("enterprisecertification") +public class EnterpriseCertificationRest { + + @Autowired + EnterpriseCertificationService EnterpriseCertificationService; + + @ApiOperation("分页列表") + @PostMapping("/listPage") + public ResultBean> ListPageVo(@RequestBody PagerQuery pq) { + return EnterpriseCertificationService.ListPageVo(pq); + } + @ApiOperation("保存") + @PostMapping("/save") + public ResultBean save(@RequestBody EnterpriseCertificationDto dto) { + return EnterpriseCertificationService.save(dto); + } + @ApiOperation("修改") + @PostMapping("/update") + public ResultBean update(@RequestBody EnterpriseCertificationDto dto) { + return EnterpriseCertificationService.update(dto); + } + + @ApiOperation("审核") + @PostMapping("/toExamine") + public ResultBean toExamine(@RequestBody EnterpriseCertificationDto dto) { + return EnterpriseCertificationService.toExamine(dto); + } +} diff --git a/src/main/java/com/yxt/yythmall/biz/enterprisecertification/EnterpriseCertificationService.java b/src/main/java/com/yxt/yythmall/biz/enterprisecertification/EnterpriseCertificationService.java new file mode 100644 index 0000000..a5d4a93 --- /dev/null +++ b/src/main/java/com/yxt/yythmall/biz/enterprisecertification/EnterpriseCertificationService.java @@ -0,0 +1,94 @@ +package com.yxt.yythmall.biz.enterprisecertification; + +import cn.dev33.satoken.stp.StpUtil; +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.base.utils.StringUtils; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.yythmall.api.approvalrecords.ApprovalRecordsDto; +import com.yxt.yythmall.api.enterprisecertification.EnterpriseCertification; +import com.yxt.yythmall.api.enterprisecertification.EnterpriseCertificationDto; +import com.yxt.yythmall.api.enterprisecertification.EnterpriseCertificationQuery; +import com.yxt.yythmall.api.enterprisecertification.EnterpriseCertificationVo; +import com.yxt.yythmall.api.lpkcustomer.LpkCustomer; +import com.yxt.yythmall.api.sysuser.SysUser; +import com.yxt.yythmall.biz.approvalrecords.ApprovalRecordsService; +import com.yxt.yythmall.biz.lpkcustomer.LpkCustomerService; +import com.yxt.yythmall.biz.sysuser.SysUserService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2023/11/21 15:03 + */ +@Service +public class EnterpriseCertificationService extends MybatisBaseService { + @Autowired + ApprovalRecordsService approvalRecordsService; + @Autowired + SysUserService sysUserService; + + public ResultBean> ListPageVo(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + EnterpriseCertificationQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("reviewStatus","0"); + qw.orderByDesc("createTime"); + if(StringUtils.isNotBlank(query.getName())){ + qw.like("enterpriseName",query.getName()); + } + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.ListPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return rb.success().setData(p); + } + + public ResultBean save(EnterpriseCertificationDto dto) { + ResultBean rb = ResultBean.fireFail(); + baseMapper.delete(new QueryWrapper().eq("customerSid",dto.getCustomerSid())); + EnterpriseCertification entity=new EnterpriseCertification(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + return rb.success().setMsg("添加成功"); + } + public ResultBean update(EnterpriseCertificationDto dto) { + ResultBean rb=new ResultBean(); + EnterpriseCertification entity=baseMapper.selectOne(new QueryWrapper().eq("customerSid",dto.getCustomerSid())); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + entity.setReviewStatus("0"); + baseMapper.updateById(entity); + return rb.success().setMsg("修改成功"); + } + public ResultBean toExamine(EnterpriseCertificationDto dto) { + ResultBean rb=new ResultBean(); + if(StringUtils.isBlank(dto.getSid())){ + return rb.setMsg("参数不全"); + } + EnterpriseCertification entity=baseMapper.selectOne(new QueryWrapper().eq("sid",dto.getSid())); + entity.setReviewStatus(dto.getReviewStatus()); + if(StringUtils.isNotBlank(dto.getRemarks())){ + entity.setRemarks(dto.getRemarks()); + } + baseMapper.updateById(entity); + //审核记录 + ApprovalRecordsDto dto1=new ApprovalRecordsDto(); + dto1.setApprovalOpinions(dto.getRemarks()); + dto1.setCustomerSid(entity.getCustomerSid()); + Object id=StpUtil.getLoginIdByToken(StpUtil.getTokenValue()); + SysUser sysUser=sysUserService.getOne(new QueryWrapper().eq("id",id)); + dto1.setOperator(sysUser.getUserName()); + dto1.setOperatorSid(sysUser.getSid()); + dto1.setApprovalStatus(dto.getReviewStatus()); + approvalRecordsService.save(dto1); + return rb.success().setMsg("审核成功"); + } + +} diff --git a/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsRest.java b/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsRest.java index d15ec5d..b52a8ca 100644 --- a/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsRest.java +++ b/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsRest.java @@ -101,4 +101,9 @@ public class LpkGoodsRest { public ResultBean getGoodsByType(@RequestBody LpkGiftCardQuery query) { return lpkGoodsService.getGoodsByTypeSid(query); } + @ApiOperation("判断是否是企业菜窖") + @GetMapping("/isEnterprise/{sid}/{brandId}") + public ResultBean isEnterprise(@PathVariable("sid")String sid ,@PathVariable("brandId")String brandId) { + return lpkGoodsService.isEnterprise(sid,brandId); + } } diff --git a/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsService.java b/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsService.java index 61c9016..32659ba 100644 --- a/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsService.java +++ b/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsService.java @@ -14,14 +14,18 @@ import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import com.yxt.yythmall.api.appletgiftbag.*; +import com.yxt.yythmall.api.enterprisecertification.EnterpriseCertification; +import com.yxt.yythmall.api.enterprisecertification.EnterpriseCertificationVo; import com.yxt.yythmall.api.lpkcustomer.LpkCustomer; import com.yxt.yythmall.api.lpkgiftcard.LpkGiftCardQuery; import com.yxt.yythmall.api.lpkgoods.*; import com.yxt.yythmall.api.shoppingcart.ShoppingCartQuery; import com.yxt.yythmall.api.shoppingcart.ShoppingCartVo; +import com.yxt.yythmall.biz.enterprisecertification.EnterpriseCertificationService; import com.yxt.yythmall.biz.lpkcustomer.LpkCustomerService; import com.yxt.yythmall.biz.shoppingcart.ShoppingCartService; import com.yxt.yythmall.mallplus.biz.pms.service.IPmsBrandService; +import com.yxt.yythmall.mallplus.mbg.pms.entity.PmsBrand; import com.yxt.yythmall.mallplus.mbg.pms.entity.brand.BrandVo; import com.yxt.yythmall.utils.DoubleUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -54,6 +58,8 @@ public class LpkGoodsService extends MybatisBaseService> goodsListPage(PagerQuery pq) { @@ -321,6 +327,40 @@ public class LpkGoodsService extends MybatisBaseService().eq("customerSid",sid)); + if(enterpriseCertification!=null){ //有企业认证记录 + EnterpriseCertificationVo vo=new EnterpriseCertificationVo(); + BeanUtil.copyProperties(enterpriseCertification,vo); + LpkCustomer customer=lpkCustomerService.getOne(new QueryWrapper().eq("sid",vo.getCustomerSid())); + vo.setCustomerName(customer.getNick()); + if(enterpriseCertification.getReviewStatus().equals("0")){ + return rb.setCode("202"); //待审核 + }else if (enterpriseCertification.getReviewStatus().equals("1")){ + return rb.success(); //审核通过 + }else if(enterpriseCertification.getReviewStatus().equals("2")){ + return rb.setCode("203").setData(vo);//审核不通过 + } + }else{ + return rb.setCode("201"); + } + return rb.success(); + } + } + return rb.success(); + } public static void main(String[] args) { double a =1.88; diff --git a/src/main/java/com/yxt/yythmall/biz/vegetablecellar/VegetableCellarService.java b/src/main/java/com/yxt/yythmall/biz/vegetablecellar/VegetableCellarService.java index 6813ceb..9037a6c 100644 --- a/src/main/java/com/yxt/yythmall/biz/vegetablecellar/VegetableCellarService.java +++ b/src/main/java/com/yxt/yythmall/biz/vegetablecellar/VegetableCellarService.java @@ -1,14 +1,9 @@ package com.yxt.yythmall.biz.vegetablecellar; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.common.base.service.MybatisBaseService; -import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.base.utils.StringUtils; -import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; -import com.yxt.yythmall.api.appletgiftbaggoods.AppletGiftBagGoods; import com.yxt.yythmall.api.lpkcustomer.LpkCustomer; import com.yxt.yythmall.api.lpkgoods.LpkGoods; import com.yxt.yythmall.api.newcomerrecorecord.NewcomerRecoRecord; @@ -19,13 +14,11 @@ import com.yxt.yythmall.api.shoppingcart.ShoppingCart; import com.yxt.yythmall.api.transferrecords.TransferRecords; import com.yxt.yythmall.api.transferrecordsgoodsdetails.TransferRecordsGoodsDetails; import com.yxt.yythmall.api.vegetablecellar.*; -import com.yxt.yythmall.biz.empcard.EmpCardService; import com.yxt.yythmall.biz.lpkcustomer.LpkCustomerService; import com.yxt.yythmall.biz.lpkgoods.LpkGoodsService; import com.yxt.yythmall.biz.newcomerrecorecord.NewcomerRecoRecordService; import com.yxt.yythmall.biz.ordorder.OrdOrderService; import com.yxt.yythmall.biz.ordorderdetails.OrdOrderDetailService; -import com.yxt.yythmall.biz.recommendnewuserbag.RecommendNewUserBagService; import com.yxt.yythmall.biz.recommendnewuserbagdetails.RecommendNewUserBagDetailsService; import com.yxt.yythmall.biz.shoppingcart.ShoppingCartService; import com.yxt.yythmall.biz.transferrecords.TransferRecordsService; diff --git a/src/main/java/com/yxt/yythmall/config/SaTokenConfigure.java b/src/main/java/com/yxt/yythmall/config/SaTokenConfigure.java index a47e568..02f6651 100644 --- a/src/main/java/com/yxt/yythmall/config/SaTokenConfigure.java +++ b/src/main/java/com/yxt/yythmall/config/SaTokenConfigure.java @@ -108,6 +108,8 @@ public class SaTokenConfigure implements WebMvcConfigurer { .excludePathPatterns("/pms/PmsBrand/getList") .excludePathPatterns("/LpkCustomerBank/getBankList") .excludePathPatterns("/lpkcustomer/updateCustomerBank") + .excludePathPatterns("/lpkgoods/isEnterprise/**") + .excludePathPatterns("/enterprisecertification/save") .excludePathPatterns("//wxapi/**") ; }