Upd:修复部分商户下载文件无法查看订单备注问题

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>

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 = "-";

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);

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>