From bafebb880250002b52cde0d1ab97bc21b3f5828e Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Fri, 18 Aug 2023 17:03:28 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=89=80=E6=9C=89=E7=BB=84=E7=BB=87=E4=BF=A1=E6=81=AF=E7=9A=84?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/GroupManagementController.java | 2 +- .../dao/GroupManagementMapper.java | 3 ++- .../model/GroupManagementEntityVO.java | 19 +++++++++++++++++++ .../service/GroupManagementService.java | 7 ++----- .../impl/GroupManagementServiceImpl.java | 7 ++----- .../mybatis/mapper/GroupManagementMapper.xml | 2 +- 6 files changed, 27 insertions(+), 13 deletions(-) create mode 100644 order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/model/GroupManagementEntityVO.java diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/controller/GroupManagementController.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/controller/GroupManagementController.java index 329f4b12..fd8dddfd 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/controller/GroupManagementController.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/controller/GroupManagementController.java @@ -202,7 +202,7 @@ public class GroupManagementController { public R findAllGroupInfo() { try { - List groups = groupManagementService.findAllGroupInfo(); + List groups = groupManagementService.findAllGroupInfo(); return R.ok().put("groupInfo",groups); } catch (Exception e) { return R.error(); diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/dao/GroupManagementMapper.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/dao/GroupManagementMapper.java index 6282ffd1..99281445 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/dao/GroupManagementMapper.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/dao/GroupManagementMapper.java @@ -1,6 +1,7 @@ package com.dxhy.order.baseservice.module.groupmanagement.dao; import com.dxhy.order.baseservice.module.groupmanagement.model.GroupManagementEntity; +import com.dxhy.order.baseservice.module.groupmanagement.model.GroupManagementEntityVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -44,5 +45,5 @@ public interface GroupManagementMapper { int countEntIdNumByXfnsrsbh(@Param("xfnsrsbh") String xfnsrsbh); - List findAllGroupInfo(); + List findAllGroupInfo(); } diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/model/GroupManagementEntityVO.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/model/GroupManagementEntityVO.java new file mode 100644 index 00000000..4b877235 --- /dev/null +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/model/GroupManagementEntityVO.java @@ -0,0 +1,19 @@ +package com.dxhy.order.baseservice.module.groupmanagement.model; + +import lombok.Data; + +@Data +public class GroupManagementEntityVO { + /** + * 组织id + */ + private String groupId; + /** + * 组织名称 + */ + private String groupName; + /** + * 销方纳税人识别号 + */ + private String xhfNsrsbh; +} diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/GroupManagementService.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/GroupManagementService.java index dfa473a2..1dd7d636 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/GroupManagementService.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/GroupManagementService.java @@ -1,9 +1,6 @@ package com.dxhy.order.baseservice.module.groupmanagement.service; -import com.dxhy.order.baseservice.module.groupmanagement.model.GroupDataStatusUpdate; -import com.dxhy.order.baseservice.module.groupmanagement.model.GroupManagementEntity; -import com.dxhy.order.baseservice.module.groupmanagement.model.GroupManagementQuery; -import com.dxhy.order.baseservice.module.groupmanagement.model.GroupTreeVO; +import com.dxhy.order.baseservice.module.groupmanagement.model.*; import org.springframework.web.bind.annotation.RequestBody; import java.util.List; @@ -57,5 +54,5 @@ public interface GroupManagementService { /** * 查询所有组织信息 */ - List findAllGroupInfo(); + List findAllGroupInfo(); } diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/impl/GroupManagementServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/impl/GroupManagementServiceImpl.java index 1d67585c..280ff0a0 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/impl/GroupManagementServiceImpl.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/impl/GroupManagementServiceImpl.java @@ -7,10 +7,7 @@ import cn.hutool.core.lang.tree.TreeNode; import cn.hutool.core.lang.tree.TreeUtil; import cn.hutool.json.JSONUtil; import com.dxhy.order.baseservice.module.groupmanagement.dao.GroupManagementMapper; -import com.dxhy.order.baseservice.module.groupmanagement.model.GroupDataStatusUpdate; -import com.dxhy.order.baseservice.module.groupmanagement.model.GroupManagementEntity; -import com.dxhy.order.baseservice.module.groupmanagement.model.GroupManagementQuery; -import com.dxhy.order.baseservice.module.groupmanagement.model.GroupTreeVO; +import com.dxhy.order.baseservice.module.groupmanagement.model.*; import com.dxhy.order.baseservice.module.groupmanagement.service.GroupManagementService; import com.dxhy.order.baseservice.module.thirdservice.user.model.DeptEntity; import com.dxhy.order.baseservice.module.thirdservice.user.model.TaxPlayerCodeDept; @@ -207,7 +204,7 @@ public class GroupManagementServiceImpl implements GroupManagementService { } @Override - public List findAllGroupInfo() { + public List findAllGroupInfo() { return groupManagementMapper.findAllGroupInfo(); } diff --git a/order-management-base-service/src/main/resources/mybatis/mapper/GroupManagementMapper.xml b/order-management-base-service/src/main/resources/mybatis/mapper/GroupManagementMapper.xml index 59ed0e05..ed98190a 100644 --- a/order-management-base-service/src/main/resources/mybatis/mapper/GroupManagementMapper.xml +++ b/order-management-base-service/src/main/resources/mybatis/mapper/GroupManagementMapper.xml @@ -275,7 +275,7 @@ + type="com.dxhy.order.baseservice.module.groupmanagement.model.GroupManagementEntityVO"> From 6bffef7181e9e656e9bd24aaeffeede76e8af52f Mon Sep 17 00:00:00 2001 From: wangrangrang Date: Tue, 5 Sep 2023 19:14:01 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../consumer/modules/manager/service/PushInvoiceService.java | 2 +- .../modules/order/service/impl/InvoicePushServiceImpl.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/PushInvoiceService.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/PushInvoiceService.java index 9f493fb8..98acdd3c 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/PushInvoiceService.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/PushInvoiceService.java @@ -71,7 +71,7 @@ public interface PushInvoiceService { public R processPushFail(CommonTsMqData commonTsMqData, String pushUrl, String msg, List shList); - public R sendImageSys(String content, String pushType, PushInfo pushInfo, Long id); + public void sendImageSys(String content, String pushType, PushInfo pushInfo, Long id); public void successPush(Long pushInfoRecordId,String content,String result,PushInfo pushInfo,String pushtype); diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/InvoicePushServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/InvoicePushServiceImpl.java index f08de92c..b443c80c 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/InvoicePushServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/InvoicePushServiceImpl.java @@ -98,7 +98,8 @@ public class InvoicePushServiceImpl implements InvoicePushService { String pushType = pushInfoRecord.getInterfacePushType(); try { //推送影像系统 - r=pushInvoiceService.sendImageSys(pushInfoRecord.getPushContent(), pushType, pushInfo,pushInfoRecord.getId()); + pushInvoiceService.sendImageSys(pushInfoRecord.getPushContent(), pushType, pushInfo,pushInfoRecord.getId()); + r.put(OrderManagementConstant.CODE, "0000"); return r; } catch (Exception e) { String error = String.format("影像推送出现异常%s,推送类型%s", e.getMessage(), pushType); From 1f012bf563be4922c37ffa39f847c52d8076148a Mon Sep 17 00:00:00 2001 From: wangrangrang Date: Wed, 6 Sep 2023 10:47:22 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=8E=89=E8=A1=A5?= =?UTF-8?q?=E5=BD=95=E6=8A=A5=E8=B4=A6=E5=8D=95=E5=90=8E=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=9B=9E=E6=8E=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/controller/OrderInfoController.java | 34 ++++++++----------- .../service/impl/OrderInfoServiceImpl.java | 13 ++++--- 2 files changed, 21 insertions(+), 26 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java index 003c0018..3c9ce8ac 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java @@ -5,41 +5,36 @@ import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEntity; -import com.dxhy.order.constant.*; -import com.dxhy.order.consumer.modules.order.model.dto.RewriteBzdhDTO; -import com.dxhy.order.consumer.modules.order.model.vo.OrderInfoVo; -import com.dxhy.order.consumer.modules.order.model.vo.OrderInfoTotalAmountVO; -import com.dxhy.order.consumer.modules.order.service.OrderBzdhService; -import com.dxhy.order.exception.OrderReceiveException; -import com.dxhy.order.model.*; -import com.dxhy.order.model.page.OrderListQuery; -import com.dxhy.order.utils.CommonUtils; -import com.dxhy.order.utils.JsonUtils; -import com.dxhy.order.utils.NsrsbhUtils; -import com.dxhy.order.utils.PageBeanConvertUtil; import com.dxhy.base.constant.OrderSeparationException; import com.dxhy.order.baseservice.annotation.SysLog; import com.dxhy.order.baseservice.module.base.service.BaseService; 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.*; import com.dxhy.order.consumer.model.OderDetailInfo; import com.dxhy.order.consumer.modules.order.model.PageKySlReq; import com.dxhy.order.consumer.modules.order.model.PageKySlRsp; import com.dxhy.order.consumer.modules.order.model.PageSlkjlyYxqRsp; +import com.dxhy.order.consumer.modules.order.model.vo.OrderInfoTotalAmountVO; +import com.dxhy.order.consumer.modules.order.model.vo.OrderInfoVo; import com.dxhy.order.consumer.modules.order.service.OrderInfoService; import com.dxhy.order.consumer.utils.PageDataDealUtil; import com.dxhy.order.consumer.utils.TaxSpecialPolicyUtil; +import com.dxhy.order.exception.OrderReceiveException; +import com.dxhy.order.model.*; +import com.dxhy.order.model.page.OrderListQuery; +import com.dxhy.order.utils.CommonUtils; +import com.dxhy.order.utils.JsonUtils; +import com.dxhy.order.utils.NsrsbhUtils; +import com.dxhy.order.utils.PageBeanConvertUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import javax.validation.constraints.NotBlank; import java.util.*; import java.util.regex.Matcher; @@ -166,14 +161,15 @@ public class OrderInfoController { @ApiOperation(value = "发票列表", notes = "发票列表修改报账单号") @SysLog(operation = "发票列表", operationDesc = "发票列表修改报账单号", key = "订单发票管理") public R updateBillNumber(@RequestParam("bzdh") String bzdh, - @RequestParam("orderInfoId") String orderInfoId, - @RequestParam("fpqqlsh")String fpqqlsh, - @RequestParam("xhfNsrsbh")String xhfNsrsbh) { + @RequestParam("orderInfoId") String orderInfoId +// @RequestParam("fpqqlsh")String fpqqlsh, +// @RequestParam("xhfNsrsbh")String xhfNsrsbh + ) { if(StringUtils.isBlank(bzdh)||StringUtils.isBlank(orderInfoId)){ return R.error("请求参数有误"); } try { - int i = orderInfoService.updateBillNumber(bzdh, orderInfoId,fpqqlsh,xhfNsrsbh); + int i = orderInfoService.updateBillNumber(bzdh, orderInfoId,"",""); if(i > 0){ return R.ok(); } diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java index 87f52f24..91970225 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java @@ -64,7 +64,6 @@ import com.dxhy.order.model.qdsk.taxpayerinfo.Qdjcxx; import com.dxhy.order.utils.*; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -1757,12 +1756,12 @@ public class OrderInfoServiceImpl implements OrderInfoService { orderProcessInfo.setBzdh(bzdh); orderProcessInfo.setOrderInfoId(orderInfoId); int i = orderProcessInfoMapper.updateOrderProcessInfoByFpqqlsh(orderProcessInfo, null); - if(i > 0) { - Map map = new HashMap(); - map.put("ddqqlsh",""); - map.put("xhfNsrsbh",""); - invoiceDataService.manualPushInvoice(Arrays.asList(map)); - } +// if(i > 0) { +// Map map = new HashMap(); +// map.put("ddqqlsh",""); +// map.put("xhfNsrsbh",""); +// invoiceDataService.manualPushInvoice(Arrays.asList(map)); +// } return i; }