Merge remote-tracking branch 'origin/main'

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/insurance/InsuranceController.java

@@ -88,7 +88,7 @@ public class InsuranceController {
     }
 
 
-    @PutMapping("/cancel")
+    @GetMapping("/cancel")
     @Operation(summary = "退保")
     @OperateLog(type = API)
     @PreAuthorize("@ss.hasPermission('trade:insurance:apply')")

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/report/impl/BankTransactionDetailsServiceImpl.java

@@ -149,7 +149,7 @@ public class BankTransactionDetailsServiceImpl implements BankTransactionDetails
 
         BigDecimal totalAmount = BigDecimal.ZERO;
         for (BankTransactionDetailsRespVO item : list) {
-            if (item.getAmount() != null) {
+            if (item.getAmount() != null && item.getAmount().compareTo(BigDecimal.ZERO) > 0) {
                 totalAmount = totalAmount.add(item.getAmount());
             }
         }

ship-module-trade/ship-module-trade-biz/src/main/resources/mapper/report/BankTransactionDetailsMapper.xml

@@ -42,7 +42,7 @@
                 pay.pay_amount AS amount,
                 IFNULL(pay.payment_no, '') AS bankSerialNo
             FROM trade_order_pay pay
-            INNER JOIN trade_order o ON pay.order_id = o.id AND o.deleted = 0
+            LEFT JOIN trade_order o ON pay.order_id = o.id AND o.deleted = 0
             LEFT JOIN product_voyage voy ON o.voyage_id = voy.id AND voy.deleted = 0
             WHERE pay.deleted = 0
               AND pay.pay_status = 1
@@ -62,7 +62,7 @@
                 -IFNULL(pay.refund_amount, 0) AS amount,
                 IFNULL(pay.payment_no, '') AS bankSerialNo
             FROM trade_order_pay pay
-            INNER JOIN trade_order o ON pay.order_id = o.id AND o.deleted = 0
+            LEFT JOIN trade_order o ON pay.order_id = o.id AND o.deleted = 0
             LEFT JOIN product_voyage voy ON o.voyage_id = voy.id AND voy.deleted = 0
             WHERE pay.deleted = 0
               AND pay.pay_status = 1
@@ -82,7 +82,7 @@
                 pay.pay_amount AS amount,
                 IFNULL(pay.payment_no, '') AS bankSerialNo
             FROM trade_order_pay pay
-             INNER JOIN trade_order o ON pay.order_id = o.id AND o.deleted = 0
+             LEFT JOIN trade_order o ON pay.order_id = o.id AND o.deleted = 0
              LEFT JOIN product_voyage voy ON o.voyage_id = voy.id AND voy.deleted = 0
             LEFT JOIN ota_distributor_self_recharge dsr ON pay.order_id = dsr.id AND dsr.deleted = 0 AND dsr.recharge_state = 1
             LEFT JOIN ota_distributor dsrs ON dsr.distributor_id = dsrs.id AND dsrs.deleted = 0
@@ -103,8 +103,8 @@
         pay.pay_amount AS amount,
         IFNULL(pay.payment_no, '') AS bankSerialNo
         FROM trade_order_pay pay
-        INNER JOIN trade_order o ON pay.order_id = o.id AND o.deleted = 0
-        INNER JOIN ota_bill_order obo ON obo.order_id = o.id
+        LEFT JOIN trade_order o ON pay.order_id = o.id AND o.deleted = 0
+        LEFT JOIN ota_bill_order obo ON obo.order_id = o.id
         INNER JOIN ota_bill bill ON bill.id = obo.bill_id AND bill.deleted = 0
         WHERE pay.deleted = 0
         AND pay.pay_status = 1
@@ -130,7 +130,7 @@
                 pay.pay_amount AS amount,
                 IFNULL(pay.payment_no, '') AS bankSerialNo
             FROM trade_order_pay pay
-            INNER JOIN trade_order o ON pay.order_id = o.id AND o.deleted = 0
+            LEFT JOIN trade_order o ON pay.order_id = o.id AND o.deleted = 0
             LEFT JOIN product_voyage voy ON o.voyage_id = voy.id AND voy.deleted = 0
             WHERE pay.deleted = 0
               AND pay.pay_status = 1
@@ -151,7 +151,7 @@
                 -IFNULL(pay.refund_amount, 0) AS amount,
                 IFNULL(pay.payment_no, '') AS bankSerialNo
             FROM trade_order_pay pay
-            INNER JOIN trade_order o ON pay.order_id = o.id AND o.deleted = 0
+            LEFT JOIN trade_order o ON pay.order_id = o.id AND o.deleted = 0
             LEFT JOIN product_voyage voy ON o.voyage_id = voy.id AND voy.deleted = 0
             WHERE pay.deleted = 0
               AND pay.pay_status = 1
@@ -171,7 +171,7 @@
                 pay.pay_amount AS amount,
                 IFNULL(pay.payment_no, '') AS bankSerialNo
             FROM trade_order_pay pay
-        INNER JOIN trade_order o ON pay.order_id = o.id AND o.deleted = 0
+        LEFT JOIN trade_order o ON pay.order_id = o.id AND o.deleted = 0
         LEFT JOIN product_voyage voy ON o.voyage_id = voy.id AND voy.deleted = 0
             LEFT JOIN ota_distributor_self_recharge dsr ON pay.order_id = dsr.id AND dsr.deleted = 0 AND dsr.recharge_state = 1
             LEFT JOIN ota_distributor dsrs ON dsr.distributor_id = dsrs.id AND dsrs.deleted = 0
@@ -192,8 +192,8 @@
         pay.pay_amount AS amount,
         IFNULL(pay.payment_no, '') AS bankSerialNo
         FROM trade_order_pay pay
-        INNER JOIN trade_order o ON pay.order_id = o.id AND o.deleted = 0
-        INNER JOIN ota_bill_order obo ON obo.order_id = o.id
+        LEFT JOIN trade_order o ON pay.order_id = o.id AND o.deleted = 0
+        LEFT JOIN ota_bill_order obo ON obo.order_id = o.id
         INNER JOIN ota_bill bill ON bill.id = obo.bill_id AND bill.deleted = 0
         WHERE pay.deleted = 0
         AND pay.pay_status = 1