From 1f012bf563be4922c37ffa39f847c52d8076148a Mon Sep 17 00:00:00 2001 From: wangrangrang Date: Wed, 6 Sep 2023 10:47:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=8E=89=E8=A1=A5=E5=BD=95?= =?UTF-8?q?=E6=8A=A5=E8=B4=A6=E5=8D=95=E5=90=8E=E8=87=AA=E5=8A=A8=E5=9B=9E?= =?UTF-8?q?=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; }