Parcourir la source

保险箱交易详情列表 所属区块链、币种筛选查询

kongxiangyang il y a 1 mois
Parent
commit
37ef293c99

+ 2 - 2
crm-manager/src/main/java/com/crm/manager/controller/VaultodyController.java

@@ -62,8 +62,8 @@ public class VaultodyController {
      * @throws Exception
      */
     @PostMapping("/export")
-    public void export(@RequestBody VaultTransactionsEntity entity, HttpServletResponse response) throws Exception {
-        List<TransactionItemTable> items = vaultodyService.queryExportItems(entity);
+    public void export(@RequestBody VaultTransactionsSearchEntity entity, HttpServletResponse response) throws Exception {
+        List<TransactionItemTable> items = (List<TransactionItemTable>)searchList(entity).getData();
         List<TransactionItemExport> exportDtos = Lists.newArrayList();
         for (TransactionItemTable item : items) {
             TransactionItemExport exportDto = new TransactionItemExport();

+ 6 - 0
crm-manager/src/main/resources/mapper/TransactionItemMapper.xml

@@ -21,6 +21,12 @@
             <if test="entity.vaultId != null and entity.vaultId != ''">
                 and ti.`vault_id` = #{entity.vaultId}
             </if>
+            <if test="entity.blockchain != null and entity.blockchain != ''">
+                and ti.`blockchain` = #{entity.blockchain}
+            </if>
+            <if test="entity.unit != null and entity.unit != ''">
+                and ti.`recipient_amount_unit` = #{entity.unit}
+            </if>
             <!-- 时间范围查询 -->
             <if test="startSecond != null">
                 AND created_timestamp &gt;= #{startSecond}

+ 15 - 5
crm-model/src/main/java/com/crm/rely/backend/model/entity/vaultody/vaults/VaultTransactionsSearchEntity.java

@@ -12,11 +12,6 @@ public class VaultTransactionsSearchEntity extends BaseSearchPageEntity {
      */
     private String vaultId;
 
-    /**
-     * 交易状态
-     */
-    private String status;
-
     /**
      * 发送方保险库地址
      */
@@ -44,4 +39,19 @@ public class VaultTransactionsSearchEntity extends BaseSearchPageEntity {
      * 结束时间
      */
     private Date endTime;
+
+    /**
+     * 交易状态
+     */
+    private String status;
+
+    /**
+     * 所属区块链
+     */
+    private String blockchain;
+
+    /**
+     * 币种
+     */
+    private String unit;
 }