From 917eadf0f17a65cde02f069b8770131540f5f744 Mon Sep 17 00:00:00 2001
From: dulingling <dll19920503@qq.com>
Date: Fri, 3 Apr 2020 17:53:44 +0800
Subject: [PATCH] =?UTF-8?q?Upd:=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E5=95=86=E6=88=B7=E4=B8=8B=E8=BD=BD=E6=96=87=E4=BB=B6=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E6=9F=A5=E7=9C=8B=E8=AE=A2=E5=8D=95=E5=A4=87=E6=B3=A8?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                       | 2 +-
 .../management/clearing/core/impl/CleanServiceImpl.java       | 2 +-
 .../manage/tradelog/core/impls/TradeLogServiceImpl.java       | 4 ++--
 .../ui/static/payment/tradelog/templates/balance_report.html  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index f712fd758..b9e26810d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.4.29</version>
+    <version>1.4.30</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>1.8.0</jib-maven-plugin.version>
diff --git a/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java
index 7cd89a462..5eac63bed 100644
--- a/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java
@@ -1110,7 +1110,7 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
                         settle.getBigDecimal("settle_amount").setScale(2, BigDecimal.ROUND_DOWN).toPlainString() :
                         "-" + settle.getBigDecimal("settle_amount").setScale(2, BigDecimal.ROUND_DOWN).toPlainString());
                 cell.setCellStyle(!"Credit".equals(settle.getString("transaction_type")) ? analysisStyle2 : null);
-                row.createCell(15, Cell.CELL_TYPE_STRING).setCellValue(settle.getString("order_detail"));
+                row.createCell(15, Cell.CELL_TYPE_STRING).setCellValue(settle.containsKey("order_detail")?settle.getString("order_detail"):settle.getString("remark"));
                 String clientDevId = StringUtils.defaultString(settle.getString("dev_id"), "-");
                 JSONObject device = clientDeviceMapper.find(settle.getString("dev_id"));
                 String clientDevRemark = "-";
diff --git a/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java
index 64a28bfde..fcc6e4a94 100644
--- a/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java
@@ -853,7 +853,7 @@ public class TradeLogServiceImpl implements TradeLogService {
         row.createCell(17, Cell.CELL_TYPE_STRING).setCellValue(data.getString("trans_type"));
         row.createCell(18, Cell.CELL_TYPE_STRING).setCellValue(data.getString("clear_status"));
         row.createCell(19, Cell.CELL_TYPE_STRING).setCellValue(data.getString("gateway"));
-        row.createCell(20, Cell.CELL_TYPE_STRING).setCellValue(data.getString("order_detail"));
+        row.createCell(20, Cell.CELL_TYPE_STRING).setCellValue(data.containsKey("order_detail")&&!"".equals(data.getString("order_detail"))?data.getString("order_detail"):data.getString("remark"));
         row.createCell(21, Cell.CELL_TYPE_STRING).setCellValue(data.getString("dev_id"));
 
     }
@@ -958,7 +958,7 @@ public class TradeLogServiceImpl implements TradeLogService {
                     String credit = dataItem.getString("transaction_type").equals("Credit") ? dataItem.getBigDecimal("clearing_amount").toString()
                             : "-";
                     HSSFRichTextString text3 = new HSSFRichTextString(credit);
-                    HSSFRichTextString text4 = new HSSFRichTextString(dataItem.getString("order_detail"));
+                    HSSFRichTextString text4 = new HSSFRichTextString(dataItem.containsKey("order_detail")?dataItem.getString("order_detail"):dataItem.getString("remark"));
                     cell0.setCellValue(text0);
                     cell1.setCellValue(text1);
                     cell2.setCellValue(text2);
diff --git a/src/main/ui/static/payment/tradelog/templates/balance_report.html b/src/main/ui/static/payment/tradelog/templates/balance_report.html
index 344e0591c..0cb9a5e59 100644
--- a/src/main/ui/static/payment/tradelog/templates/balance_report.html
+++ b/src/main/ui/static/payment/tradelog/templates/balance_report.html
@@ -586,7 +586,7 @@
                                         -
                                     </p>
                                 </td>
-                                <td ng-bind="trade.order_detail"></td>
+                                <td ng-bind="trade.order_detail?trade.order_detail:trade.remark"></td>
                             </tr>
                             </tbody>
                         </table>