From 7439124f396ba2aff37f994cadd93c8fc14876dd Mon Sep 17 00:00:00 2001 From: chenwei Date: Mon, 19 Aug 2024 18:48:38 +0800 Subject: [PATCH] lpg 功能模块划分 --- backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/DdConroller.java | 129 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/TqglController.java | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ backend/lpg-user/src/main/java/com/hotent/lpg/user/dao/WDdfwrzDao.java | 14 ++++++++++++++ backend/lpg-user/src/main/java/com/hotent/lpg/user/dao/WDdxqDao.java | 14 ++++++++++++++ backend/lpg-user/src/main/java/com/hotent/lpg/user/dao/WQplxDao.java | 14 ++++++++++++++ backend/lpg-user/src/main/java/com/hotent/lpg/user/dao/WTqglDao.java | 21 +++++++++++++++++++++ backend/lpg-user/src/main/java/com/hotent/lpg/user/dto/CreateOrderRequest.java | 150 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/WDdManager.java | 42 ++++++++++++++++++++++++++++++++++++++++++ backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/WDdfwrzManager.java | 17 +++++++++++++++++ backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/WDdxqManager.java | 14 ++++++++++++++ backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/WQplxManager.java | 16 ++++++++++++++++ backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/WTqglManager.java | 36 ++++++++++++++++++++++++++++++++++++ backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/WDdManagerImpl.java | 177 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/WDdfwrzManagerImpl.java | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/WDdxqManagerImpl.java | 21 +++++++++++++++++++++ backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/WQplxManagerImpl.java | 20 ++++++++++++++++++++ backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/WTqglManagerImpl.java | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ backend/lpg-user/src/main/java/com/hotent/lpg/user/vo/DdxxVo.java | 20 ++++++++++++++++++++ backend/lpg-user/src/main/resources/mapper/WTqglMapper.xml | 103 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ backend/lpg/src/main/java/com/hotent/lpg/controller/hy/DdConroller.java | 130 ---------------------------------------------------------------------------------------------------------------------------------- backend/lpg/src/main/java/com/hotent/lpg/controller/hy/TqglController.java | 95 ----------------------------------------------------------------------------------------------- backend/lpg/src/main/java/com/hotent/lpg/dao/WDdfwrzDao.java | 15 --------------- backend/lpg/src/main/java/com/hotent/lpg/model/request/CreateOrderRequest.java | 153 --------------------------------------------------------------------------------------------------------------------------------------------------------- backend/lpg/src/main/java/com/hotent/lpg/model/vo/DdxxVo.java | 20 -------------------- backend/lpg/src/main/resources/mapper/WTqglMapper.xml | 103 ------------------------------------------------------------------------------------------------------- 25 files changed, 1075 insertions(+), 516 deletions(-) create mode 100644 backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/DdConroller.java create mode 100644 backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/TqglController.java create mode 100644 backend/lpg-user/src/main/java/com/hotent/lpg/user/dao/WDdfwrzDao.java create mode 100644 backend/lpg-user/src/main/java/com/hotent/lpg/user/dao/WDdxqDao.java create mode 100644 backend/lpg-user/src/main/java/com/hotent/lpg/user/dao/WQplxDao.java create mode 100644 backend/lpg-user/src/main/java/com/hotent/lpg/user/dao/WTqglDao.java create mode 100644 backend/lpg-user/src/main/java/com/hotent/lpg/user/dto/CreateOrderRequest.java create mode 100644 backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/WDdfwrzManager.java create mode 100644 backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/WDdxqManager.java create mode 100644 backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/WQplxManager.java create mode 100644 backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/WTqglManager.java create mode 100644 backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/WDdfwrzManagerImpl.java create mode 100644 backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/WDdxqManagerImpl.java create mode 100644 backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/WQplxManagerImpl.java create mode 100644 backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/WTqglManagerImpl.java create mode 100644 backend/lpg-user/src/main/java/com/hotent/lpg/user/vo/DdxxVo.java create mode 100644 backend/lpg-user/src/main/resources/mapper/WTqglMapper.xml delete mode 100644 backend/lpg/src/main/java/com/hotent/lpg/controller/hy/DdConroller.java delete mode 100644 backend/lpg/src/main/java/com/hotent/lpg/controller/hy/TqglController.java delete mode 100644 backend/lpg/src/main/java/com/hotent/lpg/dao/WDdfwrzDao.java delete mode 100644 backend/lpg/src/main/java/com/hotent/lpg/model/request/CreateOrderRequest.java delete mode 100644 backend/lpg/src/main/java/com/hotent/lpg/model/vo/DdxxVo.java delete mode 100644 backend/lpg/src/main/resources/mapper/WTqglMapper.xml diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/DdConroller.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/DdConroller.java new file mode 100644 index 0000000..6e8eb9d --- /dev/null +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/DdConroller.java @@ -0,0 +1,129 @@ +package com.hotent.lpg.user.controller; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.hotent.base.model.CommonResult; +import com.hotent.lpg.common.enums.DdlyEnum; +import com.hotent.lpg.common.enums.UserlxEnum; +import com.hotent.lpg.common.model.WDd; +import com.hotent.lpg.common.model.WHydz; +import com.hotent.lpg.common.model.WHyxx; +import com.hotent.lpg.user.dao.WHydzDao; +import com.hotent.lpg.user.dto.CreateOrderRequest; +import com.hotent.lpg.user.manager.WDdManager; +import com.hotent.lpg.user.manager.WHyxxManager; +import com.hotent.uc.util.ContextUtil; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +@RestController +@RequestMapping("/customer/dd/") +@Validated +public class DdConroller { + + @Autowired + private WDdManager wDdManager; + + @Resource + private WHydzDao hydzDao; + @Resource + private WHyxxManager wHyxxManager; + + + /** + * 会员获取订单列表 + * + * @param page + * @param zt + * @return + * @throws Exception + */ + @GetMapping(value = "/list") + public CommonResult list(Page page, String zt) throws Exception { + IPage> list = wDdManager.pageList(page, zt, ContextUtil.getCurrentUserId()); + return CommonResult.ok().value(list); + } + + + /** + * 根据id获取订单数据详情 + * + * @param id + * @return + * @throws Exception ModelAndView + */ + @GetMapping(value = "/getDetail") + @ApiOperation(value = "根据id获取订单数据详情", httpMethod = "GET", notes = "根据id获取订单数据详情") + public CommonResult getDetail(@ApiParam(name = "id", value = "业务对象主键", required = true) + @RequestParam(required = true) String id) throws Exception { + return CommonResult.ok().value(wDdManager.getDetail(id)); + } + + /** + * 取消订单 + * + * @param ddid 订单id + * @return + * @throws Exception + * @throws + */ + @PostMapping(value = "/cancel") + @ApiOperation(value = "取消订单", httpMethod = "POST", notes = "取消订单") + public CommonResult cancel(@RequestParam(required = true) String ddid) throws Exception { + wDdManager.cancel(ddid); + return CommonResult.ok(); + } + + /** + * 创建订单 + * + * @param request + * @return + * @throws Exception + * @throws + */ + @PostMapping(value = "/save") + @ApiOperation(value = "创建订单", httpMethod = "POST", notes = "创建订单") + public CommonResult createOrder(@ApiParam(name = "CreateOrderRequest", value = "创建订单请求对象", required = true) @RequestBody CreateOrderRequest request) throws Exception { + WHydz hydz = hydzDao.selectOneByHyIdAndDzId(ContextUtil.getCurrentUserId(), request.getHydzId()); + if (BeanUtil.isEmpty(hydz)){ + throw new RuntimeException("未查询到地址信息。"); + } + WHyxx hyxx = wHyxxManager.getUseridByInfo(ContextUtil.getCurrentUserId()); + if (BeanUtil.isEmpty(hyxx)){ + throw new RuntimeException("未查询会员信息。"); + } + request.setShlxr(hydz.getFLxr()); + request.setShlxrdh(hydz.getFLxrdh()); + request.setShsf(hydz.getFLxrsf()); + request.setShs(hydz.getFLxrs()); + request.setShq(hydz.getFLxrq()); + request.setShjd(hydz.getFLxrjd()); + request.setShxxdz(hydz.getFLxrxxdz()); + request.setJd(hydz.getFJd()); + request.setWd(hydz.getFWd()); + + request.setSfhy("是"); + request.setHydh(hyxx.getFSjh()); //账号就是电话 + request.setHyid(hyxx.getFUserid()); + request.setHymc(hyxx.getFXm()); + request.setHylx(hyxx.getFHylx()); + request.setSfzh(hyxx.getFSfzh()); + request.setShtysbm(hyxx.getFShtysbm()); + + request.setXdrlx(UserlxEnum.hy.getInfo()); + request.setXdrid(ContextUtil.getCurrentUserId()); + request.setXdrmc(ContextUtil.getCurrentUser().getFullname()); + request.setDdly(DdlyEnum.xsxd.getInfo()); + WDd order = wDdManager.createOrder(request); + return CommonResult.ok().value(order); + } + +} diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/TqglController.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/TqglController.java new file mode 100644 index 0000000..b33686f --- /dev/null +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/TqglController.java @@ -0,0 +1,94 @@ +package com.hotent.lpg.user.controller; + + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.hotent.base.controller.BaseController; +import com.hotent.base.model.CommonResult; +import com.hotent.base.util.StringUtil; +import com.hotent.lpg.common.model.WTqgl; +import com.hotent.lpg.user.manager.WTqglManager; +import com.hotent.runtime.script.ScriptImpl; +import com.hotent.uc.api.model.IUser; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +/** + * 退气管理 前端控制器 + * + * @author 超级管理员 + * @company 广州宏天软件股份有限公司 + * @since 2024-04-11 + */ +@Slf4j +@RestController +@RequestMapping("/customer/wTqgl/v1/") +public class TqglController extends BaseController { + + @Resource + private ScriptImpl script; + + /** + * 根据id获取退气管理数据详情 + * + * @param id + * @return + * @throws Exception ModelAndView + */ + @GetMapping(value = "/getDetail") + @ApiOperation(value = "根据id获取退气管理数据详情", httpMethod = "GET", notes = "根据id获取退气管理数据详情") + public CommonResult getDetail(@ApiParam(name = "id", value = "业务对象主键", required = true) @RequestParam(required = true) String id) throws Exception { + return CommonResult.ok().value(baseService.getDetail(id)); + } + + /** + * 会员退气 + * + * @param id 会员用气记录id + * @return + * @throws Exception + * @throws + */ + @PostMapping(value = "/save") + @ApiOperation(value = "新增退气管理数据", httpMethod = "POST", notes = "新增退气管理数据") + public CommonResult save(String id) throws Exception { + if (StringUtil.isEmpty(id)) { + return CommonResult.error("参数不全"); + } + log.info("新增退气管理数据，会员用气记录id={}", id); + try { + baseService.saveTq(id); + } catch (Exception e) { + log.info("新增退气管理数据,异常={}", e.getMessage()); + return CommonResult.error(e.getMessage()); + } + return CommonResult.ok().message(""); + } + + /** + * 退气列表 + * + * @return + * @throws Exception + * @throws + */ + @GetMapping(value = "/tqPage") + @ApiOperation(value = "退气列表", httpMethod = "GET", notes = "退气列表") + public CommonResult tqPage(Page page, WTqgl wTqgl) throws Exception { + log.info("退气列表，page={},wTqgl={}", page, wTqgl); + IPage result = null; + try { + IUser currentUser = script.getCurrentUser(); + wTqgl.setFHyyhid(currentUser.getUserId()); + result = baseService.tqPage(page, wTqgl,null); + } catch (Exception e) { + log.info("退气列表,异常={}", e.getMessage()); + return CommonResult.error(e.getMessage()); + } + return new CommonResult<>(true, "", result); + } +} diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/dao/WDdfwrzDao.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/dao/WDdfwrzDao.java new file mode 100644 index 0000000..3e31c43 --- /dev/null +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/dao/WDdfwrzDao.java @@ -0,0 +1,14 @@ +package com.hotent.lpg.user.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.hotent.lpg.common.model.WDdfwrz; + +/** + * 订单服务日志 Mapper 接口 + * + * @company 广州宏天软件股份有限公司 + * @author 超级管理员 + * @since 2024-03-21 + */ +public interface WDdfwrzDao extends BaseMapper { +} diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/dao/WDdxqDao.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/dao/WDdxqDao.java new file mode 100644 index 0000000..35b8b40 --- /dev/null +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/dao/WDdxqDao.java @@ -0,0 +1,14 @@ +package com.hotent.lpg.user.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.hotent.lpg.common.model.WDdxq; + +/** + * 订单详情 Mapper 接口 + * + * @author 超级管理员 + * @company 广州宏天软件股份有限公司 + * @since 2024-03-18 + */ +public interface WDdxqDao extends BaseMapper { +} diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/dao/WQplxDao.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/dao/WQplxDao.java new file mode 100644 index 0000000..b36f333 --- /dev/null +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/dao/WQplxDao.java @@ -0,0 +1,14 @@ +package com.hotent.lpg.user.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.hotent.lpg.common.model.WQplx; + +/** + * 气瓶类型 Mapper 接口 + * + * @company 广州宏天软件股份有限公司 + * @author 超级管理员 + * @since 2024-03-13 + */ +public interface WQplxDao extends BaseMapper { +} diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/dao/WTqglDao.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/dao/WTqglDao.java new file mode 100644 index 0000000..7ae8d96 --- /dev/null +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/dao/WTqglDao.java @@ -0,0 +1,21 @@ +package com.hotent.lpg.user.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.hotent.lpg.common.model.WTqgl; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 退气管理 Mapper 接口 + * + * @company 广州宏天软件股份有限公司 + * @author 超级管理员 + * @since 2024-04-11 + */ +public interface WTqglDao extends BaseMapper { + IPage tqPage(Page page, @Param("query") WTqgl wTqgl, @Param("list") List orgIdList); + +} diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/dto/CreateOrderRequest.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/dto/CreateOrderRequest.java new file mode 100644 index 0000000..a285226 --- /dev/null +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/dto/CreateOrderRequest.java @@ -0,0 +1,150 @@ +package com.hotent.lpg.user.dto; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; +import java.util.List; + +@Data +public class CreateOrderRequest { + + /** + * 是否会员 + */ + private String sfhy; + + /** + * 会员id + */ + private String hyid; + + /** + * 会员名称 + */ + private String hymc; + + /** + * 会员电话 + */ + private String hydh; + + /** + * 订单来源 + */ + private String ddly; + + /** + * 配送方式 + */ + private String psfs; + + /** + * 买家留言 + */ + private String mjly; + + /** + * 备注 + */ + private String bz; + + /** + * 会员收货地址id + */ + private String hydzId; + /** + * 收货联系人 + */ + private String shlxr; + /** + * 收货联系人电话 + */ + private String shlxrdh; + /** + * 收货省份 + */ + private String shsf; + /** + * 收货市 + */ + private String shs; + /** + * 收货区 + */ + private String shq; + /** + * 收货街道 + */ + private String shjd; + + /** + * 收货详细地址 + */ + private String shxxdz; + + + /** + * 下单人类型 + */ + private String xdrlx; + /** + * 下单人id + */ + private String xdrid; + /** + * 下单人名称 + */ + private String xdrmc; + + + /** + * 下单人名称 + */ + private String shtysbm; + + /** + * 身份证号 + */ + private String sfzh; + + /** + * 会员类型 + */ + private String hylx; + + /** + * 经度 + */ + private String jd; + + /** + * 维度 + */ + private String wd; + + + + /** + * 购买详情 + */ + @Size(min = 1, message = "购买详情不能为空") + @NotNull(message = "购买详情不能为空") + private List xqList; + + @Data + public static class XqVO { + /** + * 气瓶类型ID + */ + @NotBlank(message = "气瓶类型ID不能为空") + private String qplxId; + /** + * 数量 + */ + @NotNull(message = "数量不能为空") + private Integer sl; + } +} + diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/WDdManager.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/WDdManager.java index bfa407d..b2ff61f 100644 --- a/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/WDdManager.java +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/WDdManager.java @@ -1,8 +1,14 @@ package com.hotent.lpg.user.manager; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.hotent.base.manager.BaseManager; import com.hotent.lpg.common.model.WDd; +import com.hotent.lpg.user.dto.CreateOrderRequest; +import com.hotent.lpg.user.vo.DdxxVo; + +import java.util.List; /** * 订单 服务类 @@ -12,4 +18,40 @@ import com.hotent.lpg.common.model.WDd; * @since 2024-03-18 */ public interface WDdManager extends BaseManager { + + + /** + * 根据主键获取详情 + * + * @param id + * @return + */ + WDd getDetail(String id); + + void cancel(String ddid); + + + WDd createOrder(CreateOrderRequest request); + + + + /** + * 订单列表 + * + * @param page + * @param zt 订单状态 + * @param hyid 会员id + * @return + */ + IPage pageList(Page page, String zt, String hyid); + + /** + * 根据订单id查询订单详情 + * + * @param oracleId + * @return + */ + DdxxVo getOrderByid(String oracleId); + + } diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/WDdfwrzManager.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/WDdfwrzManager.java new file mode 100644 index 0000000..e704da3 --- /dev/null +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/WDdfwrzManager.java @@ -0,0 +1,17 @@ +package com.hotent.lpg.user.manager; + +import com.hotent.base.manager.BaseManager; +import com.hotent.lpg.common.model.WDdfwrz; + +/** + * 订单服务日志 服务类 + * + * @author 超级管理员 + * @company 广州宏天软件股份有限公司 + * @since 2024-03-21 + */ +public interface WDdfwrzManager extends BaseManager { + + void insertDdfwrz(String fwlxdm, String ddid); + +} diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/WDdxqManager.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/WDdxqManager.java new file mode 100644 index 0000000..9505327 --- /dev/null +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/WDdxqManager.java @@ -0,0 +1,14 @@ +package com.hotent.lpg.user.manager; + +import com.hotent.base.manager.BaseManager; +import com.hotent.lpg.common.model.WDdxq; + +/** + * 订单详情 服务类 + * + * @company 广州宏天软件股份有限公司 + * @author 超级管理员 + * @since 2024-03-18 + */ +public interface WDdxqManager extends BaseManager { +} diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/WQplxManager.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/WQplxManager.java new file mode 100644 index 0000000..5a039a1 --- /dev/null +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/WQplxManager.java @@ -0,0 +1,16 @@ +package com.hotent.lpg.user.manager; + +import com.hotent.base.manager.BaseManager; +import com.hotent.lpg.common.model.WQplx; + +/** + * 气瓶类型 服务类 + * + * @author 超级管理员 + * @company 广州宏天软件股份有限公司 + * @since 2024-03-13 + */ +public interface WQplxManager extends BaseManager { + + +} diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/WTqglManager.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/WTqglManager.java new file mode 100644 index 0000000..d273ae7 --- /dev/null +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/WTqglManager.java @@ -0,0 +1,36 @@ +package com.hotent.lpg.user.manager; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.hotent.base.manager.BaseManager; +import com.hotent.lpg.common.model.WTqgl; + +import java.util.List; + +/** + * 退气管理 服务类 + * + * @company 广州宏天软件股份有限公司 + * @author 超级管理员 + * @since 2024-04-11 + */ +public interface WTqglManager extends BaseManager { + IPage tqPage(Page page, WTqgl wTqgl, List orgIdList); + + + /** + * 申请退气 + * @param id + */ + void saveTq(String id); + + + /** + * 根据主键获取详情 + * @param id + * @return + */ + WTqgl getDetail(String id); + + +} diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/WDdManagerImpl.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/WDdManagerImpl.java index 3e3e65c..efc82ab 100644 --- a/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/WDdManagerImpl.java +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/WDdManagerImpl.java @@ -1,13 +1,44 @@ package com.hotent.lpg.user.manager.impl; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.NumberUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.hotent.base.id.IdGenerator; import com.hotent.base.manager.impl.BaseManagerImpl; +import com.hotent.base.util.BeanUtils; +import com.hotent.base.util.StringUtil; +import com.hotent.lpg.common.enums.DdfwlxEnum; +import com.hotent.lpg.common.enums.DdztEnum; import com.hotent.lpg.common.model.WDd; +import com.hotent.lpg.common.model.WDdxq; +import com.hotent.lpg.common.model.WHyyqjl; +import com.hotent.lpg.common.model.WQplx; import com.hotent.lpg.user.dao.WDdDao; +import com.hotent.lpg.user.dao.WDdxqDao; +import com.hotent.lpg.user.dao.WQplxDao; +import com.hotent.lpg.user.dto.CreateOrderRequest; import com.hotent.lpg.user.manager.WDdManager; +import com.hotent.lpg.user.manager.WDdfwrzManager; +import com.hotent.lpg.user.manager.WHyxxManager; +import com.hotent.lpg.user.manager.WHyyqjlManager; +import com.hotent.lpg.user.vo.DdxxVo; +import com.hotent.uc.util.ContextUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; + /** * 订单 服务实现类 * @@ -19,4 +50,150 @@ import org.springframework.transaction.annotation.Transactional; @Transactional(rollbackFor = Exception.class) @Service public class WDdManagerImpl extends BaseManagerImpl implements WDdManager { + @Resource + private IdGenerator idGenerator; + + @Resource + private WDdxqDao ddxqDao; + @Resource + private WQplxDao qplxDao; + @Resource + private WDdfwrzManager wDdfwrzManager; + @Resource + private WHyxxManager wHyxxManager; + @Resource + private WHyyqjlManager wHyyqjlManager; + @Override + public WDd getDetail(String id) { + WDd wDd = this.get(id); + if (ObjectUtil.isNull(wDd)) { + return wDd; + } + wDd.setDdxqList(ddxqDao.selectList(new LambdaQueryWrapper().eq(WDdxq::getfDdid, wDd.getId()))); + return wDd; + } + @Override + public void cancel(String ddid) { + WDd dd = baseMapper.selectById(ddid); + if (ObjectUtil.isNull(dd)) { + throw new RuntimeException("参数错误:订单不存在"); + } + if (DdztEnum.dps.getInfo().equals(dd.getFDdzt()) || DdztEnum.psz.getInfo().equals(dd.getFDdzt())) { + dd.setFDdzt(DdztEnum.yqx.getInfo()); + baseMapper.updateById(dd); + } else { + throw new RuntimeException("订单状态不正确"); + } + //添加服务日志 + wDdfwrzManager.insertDdfwrz(DdfwlxEnum.qxdd.getCode(), dd.getId()); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public WDd createOrder(CreateOrderRequest request) { + WQplx qplx = qplxDao.selectById(request.getXqList().get(0).getQplxId()); + WDd dd = new WDd(); + dd.setId(idGenerator.getSuid()); + + dd.setFSfhy(request.getSfhy()); + dd.setFHyyhid(request.getHyid()); + dd.setFHymc(request.getHymc()); + dd.setFHylx(request.getHylx()); + dd.setFHydh(request.getHydh()); + + dd.setFShtysbm(request.getShtysbm()); + dd.setFSfzh(request.getSfzh()); + + dd.setFDdlx(null); + dd.setFDddh(idGenerator.getSuid()); + dd.setFDdly(request.getDdly()); + dd.setFZffs(null); + dd.setFPsfs(request.getPsfs()); + dd.setFDdzt(DdztEnum.dps.getInfo()); + dd.setFMjly(request.getMjly()); + dd.setFBz(request.getBz()); + + dd.setFCzid(qplx.getfSsczid()); + dd.setFCzmc(qplx.getfSsczmc()); + dd.setFQyid(qplx.getfSsqyid()); + + dd.setFXdrlx(request.getXdrlx()); + dd.setFXdrid(request.getXdrid()); + dd.setFXdrmc(request.getXdrmc()); + dd.setFShlxr(request.getShlxr()); + dd.setFShlxrdh(request.getShlxrdh()); + dd.setFShsf(request.getShsf()); + dd.setFShs(request.getShs()); + dd.setFShq(request.getShq()); + dd.setFShjd(request.getShjd()); + dd.setFShxxdz(request.getShxxdz()); + dd.setFCjr(ContextUtil.getCurrentUser().getFullname()); + dd.setFCjsj(LocalDateTime.now()); + dd.setFGxr(ContextUtil.getCurrentUser().getFullname()); + dd.setFGxsj(LocalDateTime.now()); + dd.setFShdzjd(request.getJd()); + dd.setFShdzwd(request.getWd()); + BigDecimal ddje = new BigDecimal(0); + List ddxqList = new ArrayList(); + for (CreateOrderRequest.XqVO xqVO : request.getXqList()) { + WQplx wQplx = qplxDao.selectById(xqVO.getQplxId()); + if (ObjectUtil.isNull(wQplx)) { + throw new RuntimeException("商品信息不存在"); + } + ddje = NumberUtil.add(ddje, NumberUtil.mul(wQplx.getfJg(), xqVO.getSl())); + WDdxq ddxq = new WDdxq(); + ddxq.setfDdid(dd.getId()); + ddxq.setfQplxid(wQplx.getId()); + ddxq.setfSpmc(wQplx.getfMc()); + ddxq.setfTp(wQplx.getfTp()); + ddxq.setfSl(BigDecimal.valueOf(xqVO.getSl())); + ddxq.setfDj(wQplx.getfJg()); + ddxq.setfMs(wQplx.getfMs()); + ddxqDao.insert(ddxq); + ddxqList.add(ddxq); + } + dd.setFDdje(ddje); + dd.setDdxqList(ddxqList); + baseMapper.insert(dd); + //添加服务日志 + wDdfwrzManager.insertDdfwrz(DdfwlxEnum.cjdd.getCode(), dd.getId()); + return dd; + } + + @Override + public IPage pageList(Page page, String zt, String hyid) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(StrUtil.isNotBlank(zt), WDd::getFDdzt, zt); + wrapper.eq(WDd::getFHyyhid, hyid); + wrapper.orderByDesc(WDd::getFCjsj); + Page selectPage = baseMapper.selectPage(page, wrapper); + if (CollUtil.isNotEmpty(selectPage.getRecords())) { + List list = selectPage.getRecords(); + for (WDd dd : list) { + dd.setDdxqList(ddxqDao.selectList(new LambdaQueryWrapper().eq(WDdxq::getfDdid, dd.getId()))); + } + } + return selectPage; + } + + @Override + public DdxxVo getOrderByid(String oracleId) { + WDd dd = this.getById(oracleId); + if (BeanUtils.isEmpty(dd)) { + throw new RuntimeException("未查询到订单信息。"); + } + DdxxVo ddxxVo = new DdxxVo(); + BeanUtil.copyProperties(dd, ddxxVo); + if (StringUtil.isNotEmpty(dd.getFHyyhid())) { + ddxxVo.setHyxx(wHyxxManager.getUseridByInfo(dd.getFHyyhid())); + } + WHyyqjl wHyyqjl = wHyyqjlManager.getOne + (Wrappers.lambdaQuery() + .eq(WHyyqjl::getFHyyhid, dd.getFHyyhid()) + + .orderByDesc(WHyyqjl::getFCjsj) + .last("LIMIT 1")); + ddxxVo.setMcazsj(BeanUtil.isEmpty(wHyyqjl) ? null : wHyyqjl.getFCjsj()); + return ddxxVo; + } } diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/WDdfwrzManagerImpl.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/WDdfwrzManagerImpl.java new file mode 100644 index 0000000..804a28a --- /dev/null +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/WDdfwrzManagerImpl.java @@ -0,0 +1,69 @@ +package com.hotent.lpg.user.manager.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.hotent.base.manager.impl.BaseManagerImpl; +import com.hotent.base.util.BeanUtils; +import com.hotent.base.util.JsonUtil; +import com.hotent.lpg.common.enums.DdfwlxEnum; +import com.hotent.lpg.common.enums.UserlxEnum; +import com.hotent.lpg.common.model.WDdfwrz; +import com.hotent.lpg.common.model.WHyxx; +import com.hotent.lpg.user.dao.WDdfwrzDao; +import com.hotent.lpg.user.manager.WDdManager; +import com.hotent.lpg.user.manager.WDdfwrzManager; +import com.hotent.lpg.user.manager.WHyxxManager; +import com.hotent.lpg.user.vo.DdxxVo; +import com.hotent.uc.util.ContextUtil; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.time.LocalDateTime; + +/** + * 订单服务日志 服务实现类 + * + * @author 超级管理员 + * @company 广州宏天软件股份有限公司 + * @since 2024-03-21 + */ +@Transactional(rollbackFor = Exception.class) +@Service +public class WDdfwrzManagerImpl extends BaseManagerImpl implements WDdfwrzManager { + + + @Resource + private WDdManager wDdManager; + @Resource + private WHyxxManager wHyxxManager; + /** + * 添加订单服务日志 + * + * @param ddid + */ + @Override + public void insertDdfwrz(String fwlxdm, String ddid) { + try { + LambdaQueryWrapper hyxxQuery = Wrappers.lambdaQuery(WHyxx.class).eq(WHyxx::getFSjh, ContextUtil.getCurrentUser().getAccount()); + WHyxx wHyxx = wHyxxManager.list(hyxxQuery).stream().findAny().orElse(null); + WDdfwrz wDdfwrz = new WDdfwrz(); + DdxxVo detail = wDdManager.getOrderByid(ddid); + DdfwlxEnum ddfwlxEnum = DdfwlxEnum.valueOf(fwlxdm); + wDdfwrz.setfFwlx(ddfwlxEnum.getInfo()); +// formatWithString(ddfwlxEnum.getContent(), detail) + wDdfwrz.setfFwnr(ddfwlxEnum.getInfo()); + wDdfwrz.setfKzjson(JsonUtil.toJson(detail)); + wDdfwrz.setfCzrlx(BeanUtils.isNotEmpty(wHyxx) ? UserlxEnum.hy.getInfo() : UserlxEnum.yg.getInfo()); + wDdfwrz.setfCzrid(ContextUtil.getCurrentUserId()); + wDdfwrz.setfCzsj(LocalDateTime.now()); + wDdfwrz.setfCzr(ContextUtil.getCurrentUser().getFullname()); + wDdfwrz.setfQyid(detail.getFQyid()); + wDdfwrz.setfCzid(detail.getFCzid()); + wDdfwrz.setfDdid(detail.getId()); + this.save(wDdfwrz); + } catch (Exception e) { + e.printStackTrace(); + } + } +} diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/WDdxqManagerImpl.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/WDdxqManagerImpl.java new file mode 100644 index 0000000..4d82cbf --- /dev/null +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/WDdxqManagerImpl.java @@ -0,0 +1,21 @@ +package com.hotent.lpg.user.manager.impl; + +import com.hotent.base.manager.impl.BaseManagerImpl; +import com.hotent.lpg.common.model.WDdxq; +import com.hotent.lpg.user.dao.WDdxqDao; +import com.hotent.lpg.user.manager.WDdxqManager; +import org.springframework.stereotype.Service; + +/** + * 订单详情 服务实现类 + * + * @company 广州宏天软件股份有限公司 + * @author 超级管理员 + * @since 2024-03-18 + */ +@Service +public class WDdxqManagerImpl extends BaseManagerImpl implements WDdxqManager { + + + +} diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/WQplxManagerImpl.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/WQplxManagerImpl.java new file mode 100644 index 0000000..f81a7ee --- /dev/null +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/WQplxManagerImpl.java @@ -0,0 +1,20 @@ +package com.hotent.lpg.user.manager.impl; + +import com.hotent.base.manager.impl.BaseManagerImpl; +import com.hotent.lpg.common.model.WQplx; +import com.hotent.lpg.user.dao.WQplxDao; +import com.hotent.lpg.user.manager.WQplxManager; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +/** + * 气瓶类型 服务实现类 + * + * @company 广州宏天软件股份有限公司 + * @author 超级管理员 + * @since 2024-03-13 + */ +@Transactional(rollbackFor = Exception.class) +@Service +public class WQplxManagerImpl extends BaseManagerImpl implements WQplxManager { +} diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/WTqglManagerImpl.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/WTqglManagerImpl.java new file mode 100644 index 0000000..46acbbb --- /dev/null +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/WTqglManagerImpl.java @@ -0,0 +1,104 @@ +package com.hotent.lpg.user.manager.impl; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.hotent.base.id.IdGenerator; +import com.hotent.base.manager.impl.BaseManagerImpl; +import com.hotent.lpg.common.enums.QpztEnum; +import com.hotent.lpg.common.model.WDd; +import com.hotent.lpg.common.model.WHyyqjl; +import com.hotent.lpg.common.model.WTqgl; +import com.hotent.lpg.user.dao.WTqglDao; +import com.hotent.lpg.user.manager.WDdManager; +import com.hotent.lpg.user.manager.WHyyqjlManager; +import com.hotent.lpg.user.manager.WTqglManager; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.time.LocalDateTime; +import java.util.List; + +/** + * 退气管理 服务实现类 + * + * @author 超级管理员 + * @company 广州宏天软件股份有限公司 + * @since 2024-04-11 + */ +@Transactional(rollbackFor = Exception.class) +@Service +@Slf4j +public class WTqglManagerImpl extends BaseManagerImpl implements WTqglManager { + + @Resource + private IdGenerator idGenerator; + @Resource + private WHyyqjlManager wHyyqjlManager; + @Resource + private WDdManager wDdManager; + + @Override + public IPage tqPage(Page page, WTqgl wTqgl, List orgIdList) { + IPage result = baseMapper.tqPage(page, wTqgl, orgIdList); + return result; + } + + @Override + public void saveTq(String id) { + WHyyqjl wHyyqjl = wHyyqjlManager.getById(id); + if (wHyyqjl == null) { + throw new RuntimeException("会员用气记录不存在"); + } + if (QpztEnum.ygh.equals(wHyyqjl.getFZt())) { + throw new RuntimeException("此状态下不允许提交退气"); + } + List wTqgls = baseMapper.selectList(Wrappers.lambdaQuery().eq(WTqgl::getFHyyqjlid, id)); + if (CollectionUtils.isNotEmpty(wTqgls)) { + throw new RuntimeException("已提交申请，无需再次提交"); + } + WDd wdd = wDdManager.getById(wHyyqjl.getFDdid()); + WTqgl wTqgl = new WTqgl(); + wTqgl.setFHyyqjlid(id); + wTqgl.setFQpid(wHyyqjl.getFQpid()); + wTqgl.setFQptm(wHyyqjl.getFQptm()); + wTqgl.setFQpgg((wHyyqjl.getFQpgg() == null ? "" : wHyyqjl.getFQpgg()) + " " + (wHyyqjl.getFCzjz() == null ? "" : wHyyqjl.getFCzjz())); + wTqgl.setFQprl(wHyyqjl.getFQprl()); + wTqgl.setFAzsj(wHyyqjl.getFKssysj()); + wTqgl.setFSqsj(LocalDateTime.now()); + wTqgl.setFTqdh(idGenerator.getSuid()); + wTqgl.setFHyxm(wHyyqjl.getFXm()); + wTqgl.setFHyyhid(wHyyqjl.getFHyyhid()); + wTqgl.setFHysjh(wHyyqjl.getFSjh()); + wTqgl.setFQplzid(null); + if (wdd != null) { + wTqgl.setFSsqyid(wdd.getFQyid()); + wTqgl.setFSsczid(wdd.getFCzid()); + wTqgl.setFSsqymc(null); + wTqgl.setFSsczmc(wdd.getFCzmc()); + wTqgl.setFLxr(wdd.getFShlxr()); + wTqgl.setFLxrdh(wdd.getFShlxrdh()); + wTqgl.setFLxrsf(wdd.getFShsf()); + wTqgl.setFLxrs(wdd.getFShs()); + wTqgl.setFLxrq(wdd.getFShq()); + wTqgl.setFLxrjd(wdd.getFShjd()); + wTqgl.setFLxrxxdz(wdd.getFShxxdz()); + wTqgl.setFJd(wdd.getFShdzjd()); + wTqgl.setFWd(wdd.getFShdzwd()); + } + wTqgl.setFDdid(wHyyqjl.getFDdid()); + wTqgl.setFZt(QpztEnum.dhs.getInfo()); + baseMapper.insert(wTqgl); + wHyyqjl.setFZt(QpztEnum.tqz.getInfo()); + wHyyqjlManager.updateById(wHyyqjl); + } + + @Override + public WTqgl getDetail(String id) { + WTqgl wTqgl = this.get(id); + return wTqgl; + } +} diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/vo/DdxxVo.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/vo/DdxxVo.java new file mode 100644 index 0000000..65fbfd2 --- /dev/null +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/vo/DdxxVo.java @@ -0,0 +1,20 @@ +package com.hotent.lpg.user.vo; + +import com.hotent.lpg.common.model.WAj; +import com.hotent.lpg.common.model.WDd; +import com.hotent.lpg.common.model.WDdpsxq; +import com.hotent.lpg.common.model.WHyxx; +import lombok.Data; + +import java.time.LocalDateTime; + +/** + * 订单详情 + */ +@Data +public class DdxxVo extends WDd { + private WAj ajxx=new WAj(); + private WHyxx hyxx=new WHyxx(); + private WDdpsxq ddpsxq=new WDdpsxq(); + private LocalDateTime mcazsj; +} diff --git a/backend/lpg-user/src/main/resources/mapper/WTqglMapper.xml b/backend/lpg-user/src/main/resources/mapper/WTqglMapper.xml new file mode 100644 index 0000000..b49980b --- /dev/null +++ b/backend/lpg-user/src/main/resources/mapper/WTqglMapper.xml @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ID_, REF_ID_, F_hyyqjlID, F_qpID, F_qptm, F_qpgg, F_qprl, F_azsj, F_sqsj, F_tqdh, F_hyxm, F_hysjh, F_qplzID, F_ssqyID, F_ssczID, F_ssqymc, F_ssczmc, F_sjhsqyID, F_sjhsczID, F_sjhsqymc, F_sjhsczmc, F_ddID, F_zt, F_hsrxm, F_hsrID, F_hsrlxdh, F_form_data_rev_, F_lxr, F_lxrdh, F_lxrsf, F_lxrs, F_lxrq, F_lxrjd, F_lxrxxdz, F_jd, F_wd,F_hyyhID + + + + + + + + + + diff --git a/backend/lpg/src/main/java/com/hotent/lpg/controller/hy/DdConroller.java b/backend/lpg/src/main/java/com/hotent/lpg/controller/hy/DdConroller.java deleted file mode 100644 index 48fb748..0000000 --- a/backend/lpg/src/main/java/com/hotent/lpg/controller/hy/DdConroller.java +++ /dev/null @@ -1,130 +0,0 @@ -package com.hotent.lpg.controller.hy; - -import cn.hutool.core.bean.BeanUtil; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.hotent.base.model.CommonResult; -import com.hotent.lpg.dao.WHydzDao; -import com.hotent.lpg.manager.WDdManager; -import com.hotent.lpg.manager.WHyxxManager; -import com.hotent.lpg.model.WDd; -import com.hotent.lpg.model.WHydz; -import com.hotent.lpg.model.WHyxx; -import com.hotent.lpg.model.enums.DdlyEnum; -import com.hotent.lpg.model.enums.UserlxEnum; -import com.hotent.lpg.model.request.CreateOrderRequest; -import com.hotent.uc.util.ContextUtil; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -@RestController -@RequestMapping("/customer/dd/") -@Validated -public class DdConroller { - - @Autowired - private WDdManager wDdManager; - - @Resource - private WHydzDao hydzDao; - @Resource - private WHyxxManager wHyxxManager; - - - /** - * 会员获取订单列表 - * - * @param page - * @param zt - * @param search - * @return - * @throws Exception - */ - @GetMapping(value = "/list") - public CommonResult list(Page page, String zt) throws Exception { - IPage> list = wDdManager.pageList(page, zt, ContextUtil.getCurrentUserId()); - return CommonResult.ok().value(list); - } - - - /** - * 根据id获取订单数据详情 - * - * @param id - * @return - * @throws Exception ModelAndView - */ - @GetMapping(value = "/getDetail") - @ApiOperation(value = "根据id获取订单数据详情", httpMethod = "GET", notes = "根据id获取订单数据详情") - public CommonResult getDetail(@ApiParam(name = "id", value = "业务对象主键", required = true) - @RequestParam(required = true) String id) throws Exception { - return CommonResult.ok().value(wDdManager.getDetail(id)); - } - - /** - * 取消订单 - * - * @param ddid 订单id - * @return - * @throws Exception - * @throws - */ - @PostMapping(value = "/cancel") - @ApiOperation(value = "取消订单", httpMethod = "POST", notes = "取消订单") - public CommonResult cancel(@RequestParam(required = true) String ddid) throws Exception { - wDdManager.cancel(ddid); - return CommonResult.ok(); - } - - /** - * 创建订单 - * - * @param request - * @return - * @throws Exception - * @throws - */ - @PostMapping(value = "/save") - @ApiOperation(value = "创建订单", httpMethod = "POST", notes = "创建订单") - public CommonResult createOrder(@ApiParam(name = "CreateOrderRequest", value = "创建订单请求对象", required = true) @RequestBody CreateOrderRequest request) throws Exception { - WHydz hydz = hydzDao.selectOneByHyIdAndDzId(ContextUtil.getCurrentUserId(), request.getHydzId()); - if (BeanUtil.isEmpty(hydz)){ - throw new RuntimeException("未查询到地址信息。"); - } - WHyxx hyxx = wHyxxManager.getUseridByInfo(ContextUtil.getCurrentUserId()); - if (BeanUtil.isEmpty(hyxx)){ - throw new RuntimeException("未查询会员信息。"); - } - request.setShlxr(hydz.getFLxr()); - request.setShlxrdh(hydz.getFLxrdh()); - request.setShsf(hydz.getFLxrsf()); - request.setShs(hydz.getFLxrs()); - request.setShq(hydz.getFLxrq()); - request.setShjd(hydz.getFLxrjd()); - request.setShxxdz(hydz.getFLxrxxdz()); - request.setJd(hydz.getFJd()); - request.setWd(hydz.getFWd()); - - request.setSfhy("是"); - request.setHydh(hyxx.getFSjh()); //账号就是电话 - request.setHyid(hyxx.getFUserid()); - request.setHymc(hyxx.getFXm()); - request.setHylx(hyxx.getFHylx()); - request.setSfzh(hyxx.getFSfzh()); - request.setShtysbm(hyxx.getFShtysbm()); - - request.setXdrlx(UserlxEnum.hy.getInfo()); - request.setXdrid(ContextUtil.getCurrentUserId()); - request.setXdrmc(ContextUtil.getCurrentUser().getFullname()); - request.setDdly(DdlyEnum.xsxd.getInfo()); - WDd order = wDdManager.createOrder(request); - return CommonResult.ok().value(order); - } - -} diff --git a/backend/lpg/src/main/java/com/hotent/lpg/controller/hy/TqglController.java b/backend/lpg/src/main/java/com/hotent/lpg/controller/hy/TqglController.java deleted file mode 100644 index c48bb17..0000000 --- a/backend/lpg/src/main/java/com/hotent/lpg/controller/hy/TqglController.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.hotent.lpg.controller.hy; - - -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.hotent.base.controller.BaseController; -import com.hotent.base.model.CommonResult; -import com.hotent.base.util.StringUtil; -import com.hotent.lpg.manager.WTqglManager; -import com.hotent.lpg.model.WTqgl; -import com.hotent.runtime.script.ScriptImpl; -import com.hotent.uc.api.model.IUser; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.ArrayList; - -/** - * 退气管理 前端控制器 - * - * @author 超级管理员 - * @company 广州宏天软件股份有限公司 - * @since 2024-04-11 - */ -@Slf4j -@RestController -@RequestMapping("/customer/wTqgl/v1/") -public class TqglController extends BaseController { - - @Resource - private ScriptImpl script; - - /** - * 根据id获取退气管理数据详情 - * - * @param id - * @return - * @throws Exception ModelAndView - */ - @GetMapping(value = "/getDetail") - @ApiOperation(value = "根据id获取退气管理数据详情", httpMethod = "GET", notes = "根据id获取退气管理数据详情") - public CommonResult getDetail(@ApiParam(name = "id", value = "业务对象主键", required = true) @RequestParam(required = true) String id) throws Exception { - return CommonResult.ok().value(baseService.getDetail(id)); - } - - /** - * 会员退气 - * - * @param id 会员用气记录id - * @return - * @throws Exception - * @throws - */ - @PostMapping(value = "/save") - @ApiOperation(value = "新增退气管理数据", httpMethod = "POST", notes = "新增退气管理数据") - public CommonResult save(String id) throws Exception { - if (StringUtil.isEmpty(id)) { - return CommonResult.error("参数不全"); - } - log.info("新增退气管理数据，会员用气记录id={}", id); - try { - baseService.saveTq(id); - } catch (Exception e) { - log.info("新增退气管理数据,异常={}", e.getMessage()); - return CommonResult.error(e.getMessage()); - } - return CommonResult.ok().message(""); - } - - /** - * 退气列表 - * - * @return - * @throws Exception - * @throws - */ - @GetMapping(value = "/tqPage") - @ApiOperation(value = "退气列表", httpMethod = "GET", notes = "退气列表") - public CommonResult tqPage(Page page, WTqgl wTqgl) throws Exception { - log.info("退气列表，page={},wTqgl={}", page, wTqgl); - IPage result = null; - try { - IUser currentUser = script.getCurrentUser(); - wTqgl.setFHyyhid(currentUser.getUserId()); - result = baseService.tqPage(page, wTqgl,null); - } catch (Exception e) { - log.info("退气列表,异常={}", e.getMessage()); - return CommonResult.error(e.getMessage()); - } - return new CommonResult<>(true, "", result); - } -} diff --git a/backend/lpg/src/main/java/com/hotent/lpg/dao/WDdfwrzDao.java b/backend/lpg/src/main/java/com/hotent/lpg/dao/WDdfwrzDao.java deleted file mode 100644 index aa2668a..0000000 --- a/backend/lpg/src/main/java/com/hotent/lpg/dao/WDdfwrzDao.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.hotent.lpg.dao; - -import com.hotent.lpg.model.WDdfwrz; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * 订单服务日志 Mapper 接口 - * - * @company 广州宏天软件股份有限公司 - * @author 超级管理员 - * @since 2024-03-21 - */ -public interface WDdfwrzDao extends BaseMapper { - -} diff --git a/backend/lpg/src/main/java/com/hotent/lpg/model/request/CreateOrderRequest.java b/backend/lpg/src/main/java/com/hotent/lpg/model/request/CreateOrderRequest.java deleted file mode 100644 index bde82f3..0000000 --- a/backend/lpg/src/main/java/com/hotent/lpg/model/request/CreateOrderRequest.java +++ /dev/null @@ -1,153 +0,0 @@ -package com.hotent.lpg.model.request; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.fasterxml.jackson.annotation.JsonProperty; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import java.util.List; - -@Data -public class CreateOrderRequest { - - /** - * 是否会员 - */ - private String sfhy; - - /** - * 会员id - */ - private String hyid; - - /** - * 会员名称 - */ - private String hymc; - - /** - * 会员电话 - */ - private String hydh; - - /** - * 订单来源 - */ - private String ddly; - - /** - * 配送方式 - */ - private String psfs; - - /** - * 买家留言 - */ - private String mjly; - - /** - * 备注 - */ - private String bz; - - /** - * 会员收货地址id - */ - private String hydzId; - /** - * 收货联系人 - */ - private String shlxr; - /** - * 收货联系人电话 - */ - private String shlxrdh; - /** - * 收货省份 - */ - private String shsf; - /** - * 收货市 - */ - private String shs; - /** - * 收货区 - */ - private String shq; - /** - * 收货街道 - */ - private String shjd; - - /** - * 收货详细地址 - */ - private String shxxdz; - - - /** - * 下单人类型 - */ - private String xdrlx; - /** - * 下单人id - */ - private String xdrid; - /** - * 下单人名称 - */ - private String xdrmc; - - - /** - * 下单人名称 - */ - private String shtysbm; - - /** - * 身份证号 - */ - private String sfzh; - - /** - * 会员类型 - */ - private String hylx; - - /** - * 经度 - */ - private String jd; - - /** - * 维度 - */ - private String wd; - - - - /** - * 购买详情 - */ - @Size(min = 1, message = "购买详情不能为空") - @NotNull(message = "购买详情不能为空") - private List xqList; - - @Data - public static class XqVO { - /** - * 气瓶类型ID - */ - @NotBlank(message = "气瓶类型ID不能为空") - private String qplxId; - /** - * 数量 - */ - @NotNull(message = "数量不能为空") - private Integer sl; - } -} - diff --git a/backend/lpg/src/main/java/com/hotent/lpg/model/vo/DdxxVo.java b/backend/lpg/src/main/java/com/hotent/lpg/model/vo/DdxxVo.java deleted file mode 100644 index d51fd20..0000000 --- a/backend/lpg/src/main/java/com/hotent/lpg/model/vo/DdxxVo.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.hotent.lpg.model.vo; - -import com.hotent.lpg.model.WAj; -import com.hotent.lpg.model.WDd; -import com.hotent.lpg.model.WDdpsxq; -import com.hotent.lpg.model.WHyxx; -import lombok.Data; - -import java.time.LocalDateTime; - -/** - * 订单详情 - */ -@Data -public class DdxxVo extends WDd { - private WAj ajxx=new WAj(); - private WHyxx hyxx=new WHyxx(); - private WDdpsxq ddpsxq=new WDdpsxq(); - private LocalDateTime mcazsj; -} diff --git a/backend/lpg/src/main/resources/mapper/WTqglMapper.xml b/backend/lpg/src/main/resources/mapper/WTqglMapper.xml deleted file mode 100644 index 6640f44..0000000 --- a/backend/lpg/src/main/resources/mapper/WTqglMapper.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ID_, REF_ID_, F_hyyqjlID, F_qpID, F_qptm, F_qpgg, F_qprl, F_azsj, F_sqsj, F_tqdh, F_hyxm, F_hysjh, F_qplzID, F_ssqyID, F_ssczID, F_ssqymc, F_ssczmc, F_sjhsqyID, F_sjhsczID, F_sjhsqymc, F_sjhsczmc, F_ddID, F_zt, F_hsrxm, F_hsrID, F_hsrlxdh, F_form_data_rev_, F_lxr, F_lxrdh, F_lxrsf, F_lxrs, F_lxrq, F_lxrjd, F_lxrxxdz, F_jd, F_wd,F_hyyhID - - - - - - - - - - -- libgit2 0.21.2