From 770768d83ef519db1b27c6033fc1da7bb1c1d638 Mon Sep 17 00:00:00 2001 From: gongquanlin <1025081659@qq.com> Date: Tue, 7 Mar 2023 11:19:05 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=BC=95=E7=94=A8=E5=AE=A2=E5=95=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../buyer/controller/BuyerController.java | 21 +++++++ .../module/buyer/dao/BuyerMapper.java | 2 + .../module/buyer/service/BuyerService.java | 9 +++ .../buyer/service/impl/BuyerServiceImpl.java | 56 +++++++++++++++++++ .../resources/mybatis/mapper/BuyerMapper.xml | 39 +++++++++++++ 5 files changed, 127 insertions(+) diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/controller/BuyerController.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/controller/BuyerController.java index fdfed6c2..6e22bd24 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/controller/BuyerController.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/controller/BuyerController.java @@ -287,4 +287,25 @@ public class BuyerController { return R.ok().put(OrderManagementConstant.DATA, buyerEntity); } + + /** + * 引用总部购方信息 + */ + @PostMapping("/quote") + @ApiOperation(value = "引用购方信息", notes = "购房信息列表-引用购方信息") + public R quote(@RequestParam Map map) { + String buyerName = (String) map.get("buyerName"); // 购方名称 + String buyerCode = (String) map.get("buyerCode"); // 购方编码 + if (StringUtils.isEmpty(buyerName) && StringUtils.isEmpty(buyerCode)) { + return R.error("购方名称和购方编码不能同时为空！"); + } + + String xhfNsrsbh = (String) map.get("xhfNsrsbh"); // 销方信息 + if (StringUtils.isBlank(xhfNsrsbh)) { + return R.error(OrderInfoContentEnum.TAXCODE_ISNULL); + } + + return buyerService.quoteBuyer(buyerName, buyerCode, xhfNsrsbh); + } + } diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/dao/BuyerMapper.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/dao/BuyerMapper.java index 926e2bc4..cd19ec97 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/dao/BuyerMapper.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/dao/BuyerMapper.java @@ -50,6 +50,8 @@ public interface BuyerMapper { */ int selectBuyerByName(@Param("map") Map map, @Param("shList") List shList); + BuyerEntity selectBuyerByCodeOrNameAndNsrsbh(@Param("buyerName") String buyerName, @Param("buyerCode") String buyerCode, @Param("nsrsbh") String nsrsbh); + /** * 根据销方税号,购方名称和购方税号获取购方信息 * diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/BuyerService.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/BuyerService.java index 4621938e..5089b77a 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/BuyerService.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/BuyerService.java @@ -112,4 +112,13 @@ public interface BuyerService { * @return */ BuyerEntity autoQueryBuyerInfo(String ghfMc, String buyerCode, List shList, List entList); + + /** + * 引用购方信息 + * + * @param buyerName + * @param buyerCode + * @return + */ + R quoteBuyer(String buyerName, String buyerCode, String xhfNsrshb); } diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/impl/BuyerServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/impl/BuyerServiceImpl.java index a5fb494d..056ddd7f 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/impl/BuyerServiceImpl.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/impl/BuyerServiceImpl.java @@ -3,6 +3,8 @@ package com.dxhy.order.baseservice.module.buyer.service.impl; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.dxhy.order.baseservice.module.thirdservice.user.model.DeptEntity; +import com.dxhy.order.baseservice.module.thirdservice.user.service.UserInfoService; import com.dxhy.order.constant.ConfigureConstant; import com.dxhy.order.constant.OrderInfoContentEnum; import com.dxhy.order.constant.OrderInfoEnum; @@ -24,6 +26,8 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -56,6 +60,9 @@ public class BuyerServiceImpl implements BuyerService { @Resource private OpenApiService openApiService; + @Autowired + private UserInfoService userInfoService; + @Override public PageUtils queryBuyerList(Map paramMap, List shList) { int pageSize = Integer.parseInt(String.valueOf(paramMap.get(ConfigureConstant.STRING_PAGE_SIZE))); @@ -757,4 +764,53 @@ public class BuyerServiceImpl implements BuyerService { } return buyerEntity; } + + /** + * 引用购方信息 + * + * @param buyerName + * @param buyerCode + * @return + */ + @Override + public R quoteBuyer(String buyerName, String buyerCode, String xhfNsrshb) { + if (StringUtils.isEmpty(buyerName) && StringUtils.isEmpty(buyerCode)) { + return R.error("购方名称和购方编码不能同时为空！"); + } + + if (StringUtils.isEmpty(xhfNsrshb)) { + return R.error(OrderInfoContentEnum.TAXCODE_ISNULL); + } + + // 查询当前账号是否存在购方信息 + BuyerEntity buyer = buyerMapper.selectBuyerByCodeOrNameAndNsrsbh(buyerName, buyerCode, xhfNsrshb); + if (buyer != null) { + return R.error("此购方已经被引用"); + } + + buyer = buyerMapper.selectBuyerByCodeOrNameAndNsrsbh(buyerName, buyerCode, "-1"); + if (buyer == null) { + return R.error("未找到购方信息"); + } + + // 根据销方税号查一下销方信息 + DeptEntity deptEntity = userInfoService.querySysDeptEntityFromUrl(xhfNsrshb, "", null); + if (deptEntity == null) { + return R.error("未找到销方信息"); + } + + BuyerEntity newBuyerEntity = new BuyerEntity(); + BeanUtils.copyProperties(buyer, newBuyerEntity); + + newBuyerEntity.setId(baseService.getGenerateShotKey()); + newBuyerEntity.setXhfNsrsbh(xhfNsrshb); + newBuyerEntity.setXhfMc(deptEntity.getTaxpayerName()); + newBuyerEntity.setCreateTime(new Date()); + + if (buyerMapper.insertBuyer(newBuyerEntity) > 0) { + return R.ok(); + } else { + return R.error("引用失败"); + } + } } diff --git a/order-management-base-service/src/main/resources/mybatis/mapper/BuyerMapper.xml b/order-management-base-service/src/main/resources/mybatis/mapper/BuyerMapper.xml index 64c714e8..863db7ad 100644 --- a/order-management-base-service/src/main/resources/mybatis/mapper/BuyerMapper.xml +++ b/order-management-base-service/src/main/resources/mybatis/mapper/BuyerMapper.xml @@ -728,6 +728,45 @@ + + DELETE FROM buyer_manage_info