From 2f7df374f06072e611a86cbdbc9c5563d638a2fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Tue, 6 Aug 2024 14:21:45 +0800 Subject: [PATCH] =?UTF-8?q?feature:=E8=AF=BB=E5=85=A5=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/consumer/dao/SkOrderInfoMapper.java | 7 +++ .../order/consumer/dao/YyOrderInfoMapper.java | 4 ++ .../controller/OrderHandleController.java | 55 +++++++++++++++++++ .../modules/bespoke/model/req/ReqParam.java | 3 + .../bespoke/service/OrderHandleService.java | 7 +++ .../modules/bespoke/service/OrderService.java | 3 + .../service/impl/OrderHandleServiceImpl.java | 6 ++ .../service/impl/SkOrderServiceImpl.java | 16 ++++++ .../service/impl/YyOrderServiceImpl.java | 21 ++++++- .../mybatis/mapper/SkOrderInfoMapper.xml | 27 +++++++++ .../mybatis/mapper/YyOrderInfoMapper.xml | 24 ++++++++ .../common/constant/ConfigureConstant.java | 7 +++ 12 files changed, 179 insertions(+), 1 deletion(-) diff --git a/order-management-order/src/main/java/com/dxhy/order/consumer/dao/SkOrderInfoMapper.java b/order-management-order/src/main/java/com/dxhy/order/consumer/dao/SkOrderInfoMapper.java index 98dcad7..e265ad8 100644 --- a/order-management-order/src/main/java/com/dxhy/order/consumer/dao/SkOrderInfoMapper.java +++ b/order-management-order/src/main/java/com/dxhy/order/consumer/dao/SkOrderInfoMapper.java @@ -1,11 +1,18 @@ package com.dxhy.order.consumer.dao; +import com.dxhy.order.consumer.modules.bespoke.model.req.ReqParam; import com.dxhy.order.consumer.modules.bespoke.model.sk.SkOrderInfo; +import java.util.List; + public interface SkOrderInfoMapper { //插入订单信息 int insertSkOrderInfo(SkOrderInfo skOrderInfo); + //查询订单信息是否已存在 SkOrderInfo checkOrderExist(String xsddm); + + //查询订单列表 + List queryList(ReqParam reqParam); } diff --git a/order-management-order/src/main/java/com/dxhy/order/consumer/dao/YyOrderInfoMapper.java b/order-management-order/src/main/java/com/dxhy/order/consumer/dao/YyOrderInfoMapper.java index 8f52182..b182cd0 100644 --- a/order-management-order/src/main/java/com/dxhy/order/consumer/dao/YyOrderInfoMapper.java +++ b/order-management-order/src/main/java/com/dxhy/order/consumer/dao/YyOrderInfoMapper.java @@ -10,5 +10,9 @@ public interface YyOrderInfoMapper { //插入订单 int insertYyOrderInfo(YyOrderInfo yyOrderInfo); + //查询订单是否存在 YyOrderInfo checkOrderExist(String cdlcode); + + //查询订单列表 + List queryList(ReqParam reqParam); } diff --git a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/controller/OrderHandleController.java b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/controller/OrderHandleController.java index 4a38816..b4c2de9 100644 --- a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/controller/OrderHandleController.java +++ b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/controller/OrderHandleController.java @@ -2,13 +2,16 @@ package com.dxhy.order.consumer.modules.bespoke.controller; import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson2.JSON; +import com.dxhy.base.common.constant.OrderManagementConstant; import com.dxhy.base.common.model.R; import com.dxhy.management.common.constant.ConfigureConstant; import com.dxhy.order.baseservice.annotation.SysLog; import com.dxhy.order.baseservice.constant.OrderValidateEnum; +import com.dxhy.order.baseservice.utils.PageUtils; import com.dxhy.order.consumer.modules.bespoke.config.datasource.config.DynamicContextHolder; import com.dxhy.order.consumer.modules.bespoke.model.req.ReqParam; import com.dxhy.order.consumer.modules.bespoke.service.OrderHandleService; +import com.github.pagehelper.PageInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -74,5 +77,57 @@ public class OrderHandleController { } + /** + * 订单列表查询 + * + * @return + */ + @ApiOperation(value = "查询读入订单列表", notes = "查询读入订单列表") + @PostMapping("/queryList") + @SysLog(operation = "查询订单列表rest接口", operationDesc = "查询订单列表", key = "订单列表") + public R queryList(@RequestBody ReqParam reqParam) { + + log.info("{}订单列表查询请求参数:{}", LOGGER_MSG, JSON.toJSONString(reqParam)); + if (StringUtils.isNotBlank(reqParam.getStartTime()) + && StringUtils.isNotBlank(reqParam.getEndTime())) { + Date starttime = DateUtil.parseDate(reqParam.getStartTime()); + Date endtime = DateUtil.parseDate(reqParam.getEndTime()); + if (starttime.after(endtime)) { + log.error("{}开始时间不能大于结束时间", LOGGER_MSG); + return R.error(OrderValidateEnum.ORDER_TIME_ERROR.getKey(), + OrderValidateEnum.ORDER_TIME_ERROR.getMessage()); + } + } + + if (StringUtils.isNotBlank(reqParam.getReadTimeStart()) + && StringUtils.isNotBlank(reqParam.getReadTimeEnd())) { + Date starttime = DateUtil.parseDate(reqParam.getReadTimeEnd()); + Date endtime = DateUtil.parseDate(reqParam.getReadTimeEnd()); + if (starttime.after(endtime)) { + log.error("{}开始时间不能大于结束时间", LOGGER_MSG); + return R.error(OrderValidateEnum.ORDER_TIME_ERROR.getKey(), + OrderValidateEnum.ORDER_TIME_ERROR.getMessage()); + } + } + + if (StringUtils.isBlank(reqParam.getNsrsbh())) { + log.error("{},请求税号为空!", LOGGER_MSG); + return R.error(OrderValidateEnum.TAXCODE_ISNULL.getKey(), OrderValidateEnum.TAXCODE_ISNULL.getMessage()); + } + if (StringUtils.isBlank(reqParam.getEntId())){ + log.error("{},请求企业id为空!", LOGGER_MSG); + return R.error(OrderValidateEnum.ENTID_ISNULL.getKey(), OrderValidateEnum.ENTID_ISNULL.getMessage()); + } + + try { + + return orderHandleService.queryList(reqParam); + }catch (Exception e){ + log.error("{}查询读入订单异常", LOGGER_MSG, e); + return R.error("查询列表异常请联系运维人员"); + } + + } + } diff --git a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/model/req/ReqParam.java b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/model/req/ReqParam.java index 637467e..1fb2c42 100644 --- a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/model/req/ReqParam.java +++ b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/model/req/ReqParam.java @@ -61,4 +61,7 @@ public class ReqParam { //凭证号 private String pzh; + + //购方名称 + private String gfmc; } diff --git a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/OrderHandleService.java b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/OrderHandleService.java index 1b93ff4..90934f0 100644 --- a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/OrderHandleService.java +++ b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/OrderHandleService.java @@ -10,4 +10,11 @@ public interface OrderHandleService { * @return */ R readOrder(ReqParam reqParam); + + /** + * 订单查询 + * @param reqParam + * @return + */ + R queryList(ReqParam reqParam); } diff --git a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/OrderService.java b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/OrderService.java index f3db7c8..dde217d 100644 --- a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/OrderService.java +++ b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/OrderService.java @@ -7,4 +7,7 @@ public interface OrderService { //订单读入 R orderRead(ReqParam reqParam); + + //查询订单列表 + R queryList(ReqParam reqParam); } diff --git a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/OrderHandleServiceImpl.java b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/OrderHandleServiceImpl.java index 06c6d2c..452d375 100644 --- a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/OrderHandleServiceImpl.java +++ b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/OrderHandleServiceImpl.java @@ -16,4 +16,10 @@ public class OrderHandleServiceImpl implements OrderHandleService { OrderService orderService = SpringUtil.getBean(ServiceConfig.getService(reqParam.getNsrsbh()), OrderService.class); return orderService.orderRead(reqParam); } + + @Override + public R queryList(ReqParam reqParam) { + OrderService orderService = SpringUtil.getBean(ServiceConfig.getService(reqParam.getNsrsbh()), OrderService.class); + return orderService.queryList(reqParam); + } } diff --git a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/SkOrderServiceImpl.java b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/SkOrderServiceImpl.java index b406f6d..ede76a1 100644 --- a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/SkOrderServiceImpl.java +++ b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/SkOrderServiceImpl.java @@ -1,7 +1,10 @@ package com.dxhy.order.consumer.modules.bespoke.service.impl; import com.alibaba.fastjson2.JSON; +import com.dxhy.base.common.constant.OrderManagementConstant; import com.dxhy.base.common.model.R; +import com.dxhy.base.common.utils.DecimalCalculateUtil; +import com.dxhy.base.common.utils.NsrsbhUtils; import com.dxhy.base.thirdservice.module.base.service.BaseService; import com.dxhy.management.common.constant.ConfigureConstant; import com.dxhy.order.consumer.dao.SkOrderInfoMapper; @@ -13,6 +16,8 @@ import com.dxhy.order.consumer.modules.bespoke.model.sk.SkOrderInfo; import com.dxhy.order.consumer.modules.bespoke.model.sk.SkOrderItemInfo; import com.dxhy.order.consumer.modules.bespoke.service.OrderHandleService; import com.dxhy.order.consumer.modules.bespoke.service.OrderService; +import com.github.pagehelper.PageInfo; +import com.github.pagehelper.page.PageMethod; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; @@ -67,6 +72,17 @@ public class SkOrderServiceImpl implements OrderService { return R.ok("成功读取" + count + "条订单数据"); } + @Override + public R queryList(ReqParam reqParam) { + int currPage = Integer.parseInt(reqParam.getCurrPage()); + int pageSize = Integer.parseInt(reqParam.getPageSize()); + log.debug("订单查询，当前页：{},页面条数:{}", currPage, pageSize); + PageMethod.startPage(currPage, pageSize); + List skOrderInfoList = skOrderInfoMapper.queryList(reqParam); + + return R.ok().put(OrderManagementConstant.DATA, new PageInfo<>(skOrderInfoList)); + } + @Transactional public int saveOrder(SkOrderInfo skOrderInfo, List skOrderItemInfoList, ReqParam reqParam) { diff --git a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/YyOrderServiceImpl.java b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/YyOrderServiceImpl.java index 6846ed5..f9edfdd 100644 --- a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/YyOrderServiceImpl.java +++ b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/YyOrderServiceImpl.java @@ -1,6 +1,7 @@ package com.dxhy.order.consumer.modules.bespoke.service.impl; import com.alibaba.fastjson2.JSON; +import com.dxhy.base.common.constant.OrderManagementConstant; import com.dxhy.base.common.model.R; import com.dxhy.base.thirdservice.module.base.service.BaseService; import com.dxhy.management.common.constant.ConfigureConstant; @@ -12,11 +13,12 @@ import com.dxhy.order.consumer.modules.bespoke.model.req.ReqParam; import com.dxhy.order.consumer.modules.bespoke.model.yy.YyOrderInfo; import com.dxhy.order.consumer.modules.bespoke.model.yy.YyOrderItemInfo; import com.dxhy.order.consumer.modules.bespoke.service.OrderService; +import com.github.pagehelper.PageInfo; +import com.github.pagehelper.page.PageMethod; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; - import javax.annotation.Resource; import java.math.BigDecimal; import java.util.Date; @@ -66,6 +68,17 @@ public class YyOrderServiceImpl implements OrderService { return R.ok("成功读取"+count+"条订单数据"); } + @Override + public R queryList(ReqParam reqParam) { + int currPage = Integer.parseInt(reqParam.getCurrPage()); + int pageSize = Integer.parseInt(reqParam.getPageSize()); + log.debug("订单查询，当前页：{},页面条数:{}", currPage, pageSize); + PageMethod.startPage(currPage, pageSize); + List yyOrderInfoList = yyOrderInfoMapper.queryList(reqParam); + + return R.ok().put(OrderManagementConstant.DATA, new PageInfo<>(yyOrderInfoList)); + } + @Transactional public int saveOrder(YyOrderInfo yyOrderInfo, List yyOrderItemInfoList, ReqParam reqParam) { @@ -97,6 +110,12 @@ public class YyOrderServiceImpl implements OrderService { yyOrderInfo.setDetailCount(String.valueOf(yyOrderItemInfoList.size())); yyOrderInfo.setHsje(hsje.add(se).setScale(ConfigureConstant.INT_2).toPlainString()); yyOrderInfo.setSe(se.setScale(ConfigureConstant.INT_2).toPlainString()); + if (yyOrderInfo.getCvouchtype().equals(ConfigureConstant.STRING_26)){ + yyOrderInfo.setCvouchtype(ConfigureConstant.STRING_001); + } + if (yyOrderInfo.getCvouchtype().equals(ConfigureConstant.STRING_27)){ + yyOrderInfo.setCvouchtype(ConfigureConstant.STRING_002); + } yyOrderInfoMapper.insertYyOrderInfo(yyOrderInfo); return ConfigureConstant.INT_1; diff --git a/order-management-order/src/main/resources/mybatis/mapper/SkOrderInfoMapper.xml b/order-management-order/src/main/resources/mybatis/mapper/SkOrderInfoMapper.xml index 083e2ee..d13c491 100644 --- a/order-management-order/src/main/resources/mybatis/mapper/SkOrderInfoMapper.xml +++ b/order-management-order/src/main/resources/mybatis/mapper/SkOrderInfoMapper.xml @@ -133,4 +133,31 @@ where xsddm = #{xsddm} and status = '0' + + diff --git a/order-management-order/src/main/resources/mybatis/mapper/YyOrderInfoMapper.xml b/order-management-order/src/main/resources/mybatis/mapper/YyOrderInfoMapper.xml index 3f47727..58f3f13 100644 --- a/order-management-order/src/main/resources/mybatis/mapper/YyOrderInfoMapper.xml +++ b/order-management-order/src/main/resources/mybatis/mapper/YyOrderInfoMapper.xml @@ -140,4 +140,28 @@ where cdlcode = #{cdlcode} and status = '0' + + diff --git a/sims-back-common/src/main/java/com/dxhy/management/common/constant/ConfigureConstant.java b/sims-back-common/src/main/java/com/dxhy/management/common/constant/ConfigureConstant.java index 91d987a..d186e09 100644 --- a/sims-back-common/src/main/java/com/dxhy/management/common/constant/ConfigureConstant.java +++ b/sims-back-common/src/main/java/com/dxhy/management/common/constant/ConfigureConstant.java @@ -101,6 +101,10 @@ public class ConfigureConstant { public static final String STRING_10 = "10"; + public static final String STRING_26 = "26"; + + public static final String STRING_27 = "27"; + public static final String STRING_100 = "100"; public static final String STRING_0000 = "0000"; @@ -220,4 +224,7 @@ public class ConfigureConstant { public static final int SPECIAL_MAX_ITEM_LENGTH = 8; + public static final String STRING_001 = "001"; + + public static final String STRING_002 = "002"; }