From 2b80a765fc4b7c8bd0ea1a90399b7f47084de0da Mon Sep 17 00:00:00 2001
From: kane <kane@qq.com>
Date: Mon, 26 Jun 2023 14:02:55 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BA=A2=E5=AD=97=E4=BF=A1=E6=81=AF=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/RedInformationController.java    |  7 +++-
 .../mapper/invoice/RedinfoMapper.xml          |  2 +-
 .../ExceptionInformationConstants.java        |  7 ++++
 .../platform/constant/RedWordConstants.java   |  4 +--
 .../platform/dto/invoicered/RedWordDTO.java   |  2 --
 .../service/RedInformationService.java        |  7 ++++
 .../impl/RedInformationServiceImpl.java       | 33 +++++++++++++++++++
 .../vo/invoicered/RedWordDetailVO.java        | 16 +++++++++
 8 files changed, 72 insertions(+), 6 deletions(-)
 create mode 100644 jianshui-platform/src/main/java/com/jianshui/platform/vo/invoicered/RedWordDetailVO.java

diff --git a/jianshui-admin/src/main/java/com/jianshui/web/controller/platform/RedInformationController.java b/jianshui-admin/src/main/java/com/jianshui/web/controller/platform/RedInformationController.java
index 6df6b8e..2fc83d9 100644
--- a/jianshui-admin/src/main/java/com/jianshui/web/controller/platform/RedInformationController.java
+++ b/jianshui-admin/src/main/java/com/jianshui/web/controller/platform/RedInformationController.java
@@ -37,10 +37,15 @@ public class RedInformationController {
         return redInformationService.redWordSubmit(dto);
     }
 
-    @ApiOperation("红字信息表列表展示")
+    @ApiOperation("红字信息列表展示")
     @PostMapping("/findRedWord")
     public AjaxResult findRedWord(@RequestBody FindRedWordDTO dto){
         return redInformationService.findRedWord(dto);
     }
 
+    @ApiOperation("红字信息明细展示")
+    @GetMapping("/findRedWordDetail/{id}")
+    public AjaxResult findRedWordDetail(@PathVariable Long id){
+        return redInformationService.findRedWordDetail(id);
+    }
 }
diff --git a/jianshui-invoice/src/main/resources/mapper/invoice/RedinfoMapper.xml b/jianshui-invoice/src/main/resources/mapper/invoice/RedinfoMapper.xml
index fa1241a..6c98da1 100644
--- a/jianshui-invoice/src/main/resources/mapper/invoice/RedinfoMapper.xml
+++ b/jianshui-invoice/src/main/resources/mapper/invoice/RedinfoMapper.xml
@@ -144,7 +144,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where a.id = #{id}
     </select>
     <select id="findRedInfoList" resultMap="RedinfoResult">
-        <include refid="selectRedinfoVo"/>
+        select * from redinfo
         <where>
             <if test="redInfoNo != null  and redInfoNo != ''"> and red_info_no like concat('%', #{redInfoNo},'%')</if>
             <if test="buyerName != null  and buyerName != ''"> and buyer_name like concat('%', #{buyerName},'%')</if>
diff --git a/jianshui-platform/src/main/java/com/jianshui/platform/constant/ExceptionInformationConstants.java b/jianshui-platform/src/main/java/com/jianshui/platform/constant/ExceptionInformationConstants.java
index be1a885..80bd882 100644
--- a/jianshui-platform/src/main/java/com/jianshui/platform/constant/ExceptionInformationConstants.java
+++ b/jianshui-platform/src/main/java/com/jianshui/platform/constant/ExceptionInformationConstants.java
@@ -22,4 +22,11 @@ public class ExceptionInformationConstants {
 
     //发票相关信息为空
     public static final String INVOICEINFORMATIONISEMPTY = "发票相关信息为空";
+    //红字信息为空
+    public static final String REDWORDINFOISEMPT = "传入红字信息为空";
+
+    //未查询到红字信息
+    public static final String NOTFINREDWORDINFO = "未查询到该红字信息表";
+
+
 }
diff --git a/jianshui-platform/src/main/java/com/jianshui/platform/constant/RedWordConstants.java b/jianshui-platform/src/main/java/com/jianshui/platform/constant/RedWordConstants.java
index 59c3cc1..b2b65df 100644
--- a/jianshui-platform/src/main/java/com/jianshui/platform/constant/RedWordConstants.java
+++ b/jianshui-platform/src/main/java/com/jianshui/platform/constant/RedWordConstants.java
@@ -15,10 +15,10 @@ public class RedWordConstants {
     // 购方类型（未抵扣）
     public static final String NOTDEDUCTION = "2";
 
-    // 含税单价
+    // 含税状态
     public static final String TAXINVOICE = "0";
 
-    // 不含税单价
+    // 不含税状态
     public static final String NOTTAXINVOICE = "1";
 
     // 提交结果响应
diff --git a/jianshui-platform/src/main/java/com/jianshui/platform/dto/invoicered/RedWordDTO.java b/jianshui-platform/src/main/java/com/jianshui/platform/dto/invoicered/RedWordDTO.java
index 33d9d06..976d51c 100644
--- a/jianshui-platform/src/main/java/com/jianshui/platform/dto/invoicered/RedWordDTO.java
+++ b/jianshui-platform/src/main/java/com/jianshui/platform/dto/invoicered/RedWordDTO.java
@@ -1,13 +1,11 @@
 package com.jianshui.platform.dto.invoicered;
 
-import com.jianshui.invoice.domain.Redinfodetail;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
-import java.util.Date;
 import java.util.List;
 
 /**
diff --git a/jianshui-platform/src/main/java/com/jianshui/platform/service/RedInformationService.java b/jianshui-platform/src/main/java/com/jianshui/platform/service/RedInformationService.java
index cbb72fd..4d878a0 100644
--- a/jianshui-platform/src/main/java/com/jianshui/platform/service/RedInformationService.java
+++ b/jianshui-platform/src/main/java/com/jianshui/platform/service/RedInformationService.java
@@ -32,4 +32,11 @@ public interface RedInformationService {
      * @return : com.jianshui.common.core.domain.AjaxResult
      */
     AjaxResult findRedWord(FindRedWordDTO dto);
+
+    /**
+     * 功能描述: 红字信息明细查询
+     * @param id
+     * @return : com.jianshui.common.core.domain.AjaxResult
+     */
+    AjaxResult findRedWordDetail(Long id);
 }
diff --git a/jianshui-platform/src/main/java/com/jianshui/platform/service/impl/RedInformationServiceImpl.java b/jianshui-platform/src/main/java/com/jianshui/platform/service/impl/RedInformationServiceImpl.java
index c7d61c7..74e151c 100644
--- a/jianshui-platform/src/main/java/com/jianshui/platform/service/impl/RedInformationServiceImpl.java
+++ b/jianshui-platform/src/main/java/com/jianshui/platform/service/impl/RedInformationServiceImpl.java
@@ -278,4 +278,37 @@ public class RedInformationServiceImpl implements RedInformationService {
         return AjaxResult.success(pageFindRedWordVO);
     }
 
+    /**
+     * 功能描述: 红字信息明细查询
+     * @param id
+     * @return : com.jianshui.common.core.domain.AjaxResult
+     */
+    @Override
+    public AjaxResult findRedWordDetail(Long id) {
+        if (id == null){
+            return AjaxResult.error(ExceptionInformationConstants.REDWORDINFOISEMPT);
+        }
+        Redinfo redinfo = redinfoMapper.selectRedinfoById(id);
+        if (redinfo == null){
+            return AjaxResult.error(ExceptionInformationConstants.NOTFINREDWORDINFO);
+        }
+        //封装红字信息返回
+        RedWordDTO redWordDTO = new RedWordDTO();
+        BeanUtils.copyProperties(redinfo,redWordDTO);
+        redWordDTO.setStatus(RedWordConstants.NOTTAXINVOICE);
+        redWordDTO.setTotalMoney(redinfo.getTaxfreeamt());
+        //封装红字信息详情
+        List<Redinfodetail> redinfodetailList = redinfo.getRedinfodetailList();
+        List<RedinfodetailDTO> redinfodetailDTOS = new ArrayList<>();
+        for (Redinfodetail redinfodetail : redinfodetailList) {
+            RedinfodetailDTO redinfodetailDTO = new RedinfodetailDTO();
+            BeanUtils.copyProperties(redinfodetail,redinfodetailDTO);
+            redinfodetailDTO.setCost(redinfodetail.getPrice());
+            redinfodetailDTO.setMoney(redinfodetail.getTaxfreeamt());
+            redinfodetailDTOS.add(redinfodetailDTO);
+        }
+        redWordDTO.setRedinfodetailList(redinfodetailDTOS);
+        return AjaxResult.success(redWordDTO);
+    }
+
 }
diff --git a/jianshui-platform/src/main/java/com/jianshui/platform/vo/invoicered/RedWordDetailVO.java b/jianshui-platform/src/main/java/com/jianshui/platform/vo/invoicered/RedWordDetailVO.java
new file mode 100644
index 0000000..87350c5
--- /dev/null
+++ b/jianshui-platform/src/main/java/com/jianshui/platform/vo/invoicered/RedWordDetailVO.java
@@ -0,0 +1,16 @@
+package com.jianshui.platform.vo.invoicered;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @Author: kane
+ * @Description: 红字信息明细返回类
+ * @CreateTime: 2023-06-26  12:03
+ * @Version: 1.0
+ **/
+@ApiModel("发票明细返回类")
+@Data
+public class RedWordDetailVO {
+
+}