From aaff1b1d7f3a31b80c72043285e224f2a4faa16a Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Mon, 15 May 2023 20:45:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E7=B3=BB=E7=BB=9F=E7=B9=81?=
 =?UTF-8?q?=E5=BF=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inout/IoOrderInvoiceController.java       |  2 +-
 .../mapper/inout/InvUserProductDao.xml        |  9 +++--
 .../mapper/inout/IoOrderDetailBizDao.xml      | 34 ++++++++++---------
 3 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderInvoiceController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderInvoiceController.java
index 3a4e50908..a22eed8d1 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoOrderInvoiceController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoOrderInvoiceController.java
@@ -39,7 +39,7 @@ public class IoOrderInvoiceController {
     @AuthRuleAnnotation("")
     @PostMapping("/udiwms/inout/order/refrshInvoice")
     @Log(title = "发票", businessType = BusinessType.INSERT)
-    public BaseResponse addBizProduct(@RequestBody RefreshInoiceRequest refreshInoiceRequest) {
+    public BaseResponse refrshInvoice(@RequestBody RefreshInoiceRequest refreshInoiceRequest) {
         BaseResponse<RefreshInoiceResponse> baseResponse = spGetHttpClient.getIoOrderInvoices(refreshInoiceRequest);
         if (baseResponse.getCode() == 20000) {
             RefreshInoiceResponse refreshInoiceResponse = baseResponse.getData();
diff --git a/src/main/resources/mybatis/mapper/inout/InvUserProductDao.xml b/src/main/resources/mybatis/mapper/inout/InvUserProductDao.xml
index 2984b40cd..45072669e 100644
--- a/src/main/resources/mybatis/mapper/inout/InvUserProductDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/InvUserProductDao.xml
@@ -13,11 +13,11 @@
     <select id="selectOrderInvoice" parameterType="com.glxp.api.req.inout.IoOrderInvoiceRequest"
             resultType="com.glxp.api.entity.inout.IoOrderInvoiceEntity">
         SELECT ic.*,
-        (select cpmctymc from basic_products where basic_products.uuid = bu.uuid) cpmctymc,
-        (select ggxh from basic_products where basic_products.uuid = bu.uuid)     ggxh
+               bp.cpmctymc,
+               bp.ggxh
         FROM io_order_invoice ic
-        LEFT JOIN basic_udirel bu ON bu.id = ic.bindRlFk
-        LEFT JOIN basic_products bp ON bu.uuid = bp.uuid
+                     LEFT JOIN basic_udirel bu ON bu.id = ic.bindRlFk
+                     LEFT JOIN basic_products bp ON bu.uuid = bp.uuid
         <where>
             <if test="orderIdFk != null and orderIdFk != ''">
                 AND ic.orderIdFk = #{orderIdFk}
@@ -34,7 +34,6 @@
             <if test="batchNo == null || batchNo == ''">
                 AND (ic.batchNo is null or ic.batchNo = '')
             </if>
-
         </where>
         GROUP BY ic.id
     </select>
diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml
index bc473e0ab..3519d3172 100644
--- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml
@@ -4,8 +4,8 @@
     <select id="filterList" resultType="com.glxp.api.res.inout.IoOrderDetailBizResponse">
         select io_order_detail_biz.*
         from io_order_detail_biz
-        left join basic_udirel bu on bu.id = io_order_detail_biz.bindRlFk
-        left join basic_products bp on bu.uuid = bp.uuid
+                     left join basic_udirel bu on bu.id = io_order_detail_biz.bindRlFk
+                     left join basic_products bp on bu.uuid = bp.uuid
         <where>
             <if test="orderIdFk != null and orderIdFk != ''">
                 AND orderIdFk = #{orderIdFk}
@@ -23,20 +23,22 @@
         group by io_order_detail_biz.id
     </select>
 
-    <select id="selectByinvoiceId" parameterType="java.lang.Long"  resultType="com.glxp.api.res.inout.IoOrderInvoiceResponse">
-        select * from io_order_invoice where id= #{id}
+    <select id="selectByinvoiceId" parameterType="java.lang.Long"
+            resultType="com.glxp.api.res.inout.IoOrderInvoiceResponse">
+        select *
+        from io_order_invoice
+        where id = #{id}
     </select>
 
 
-
     <select id="getfilterList" resultType="com.glxp.api.res.inout.IoOrderDetailCodeResponse">
         select io_order_detail_code.*,
-        (select count(*)
-        FROM io_order_invoice
-        where io_order_invoice.orderIdFk = io_order_detail_code.orderIdFk) as sucCount
+               (select count(*)
+                FROM io_order_invoice
+                where io_order_invoice.orderIdFk = io_order_detail_code.orderIdFk) as sucCount
         from io_order_detail_code
-        left join basic_udirel bu on bu.id = io_order_detail_code.bindRlFk
-        left join basic_products bp on bu.uuid = bp.uuid
+                     left join basic_udirel bu on bu.id = io_order_detail_code.bindRlFk
+                     left join basic_products bp on bu.uuid = bp.uuid
         <where>
             <if test="orderIdFk != null and orderIdFk != ''">
                 AND orderIdFk = #{orderIdFk}
@@ -56,11 +58,11 @@
 
     <select id="filterListInv" resultType="com.glxp.api.res.inout.IoOrderInvoiceResponse">
         SELECT ic.*,
-        (select cpmctymc from basic_products where basic_products.uuid = bu.uuid) cpmctymc,
-        (select ggxh from basic_products where basic_products.uuid = bu.uuid)     ggxh
+               bp.cpmctymc,
+               bp.ggxh
         FROM io_order_invoice ic
-        LEFT JOIN basic_udirel bu ON bu.id = ic.bindRlFk
-        LEFT JOIN basic_products bp ON bu.uuid = bp.uuid
+                     LEFT JOIN basic_udirel bu ON bu.id = ic.bindRlFk
+                     LEFT JOIN basic_products bp ON bu.uuid = bp.uuid
         <where>
             <if test="orderIdFk != null and orderIdFk != ''">
                 AND ic.orderIdFk = #{orderIdFk}
@@ -77,13 +79,13 @@
             <if test="batchNo == null || batchNo == ''">
                 AND (ic.batchNo is null or ic.batchNo = '')
             </if>
-
         </where>
         GROUP BY ic.id
     </select>
 
     <select id="selectOrderDetailBiz" resultType="com.glxp.api.entity.inout.IoOrderDetailBizEntity">
-        select * from io_order_detail_biz
+        select *
+        from io_order_detail_biz
         <where>
             <if test="orderId != null and orderId != ''">
                 AND orderIdFk = #{orderId}