From 9280df16ebf66731e77b5b5fee89b120b8c5ea23 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 11 Aug 2023 17:00:05 +0800
Subject: [PATCH] 数据修改

---
 src/main/java/cc/mrbird/febs/dapp/controller/ApiCommonController.java |   31 +++++++++++++++++++------------
 1 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/dapp/controller/ApiCommonController.java b/src/main/java/cc/mrbird/febs/dapp/controller/ApiCommonController.java
index 0a1c382..54eccf0 100644
--- a/src/main/java/cc/mrbird/febs/dapp/controller/ApiCommonController.java
+++ b/src/main/java/cc/mrbird/febs/dapp/controller/ApiCommonController.java
@@ -3,14 +3,12 @@
 import cc.mrbird.febs.common.annotation.EncryptEnable;
 import cc.mrbird.febs.common.contants.AppContants;
 import cc.mrbird.febs.common.entity.FebsResponse;
-import cc.mrbird.febs.dapp.dto.ApproveDto;
-import cc.mrbird.febs.dapp.dto.ConnectDto;
-import cc.mrbird.febs.dapp.dto.EncryptDto;
-import cc.mrbird.febs.dapp.dto.SystemDto;
+import cc.mrbird.febs.dapp.dto.*;
 import cc.mrbird.febs.dapp.entity.DappMemberEntity;
 import cc.mrbird.febs.dapp.service.DappMemberService;
 import cc.mrbird.febs.dapp.service.DappSimulateDataService;
 import cc.mrbird.febs.dapp.service.DappSystemService;
+import cc.mrbird.febs.dapp.vo.MallGoodsListVo;
 import cc.mrbird.febs.dapp.vo.SimulateDataVo;
 import cc.mrbird.febs.rabbit.producer.ChainProducer;
 import io.swagger.annotations.Api;
@@ -36,9 +34,6 @@
 public class ApiCommonController {
 
     private final DappMemberService dappMemberService;
-    private final DappSystemService dappSystemService;
-    @Autowired
-    private ChainProducer chainProducer;
 
     @ApiOperation(value = "地址是否存在", notes = "地址是否存在")
     @GetMapping(value = "/exist/{address}")
@@ -56,13 +51,25 @@
         return new FebsResponse().success();
     }
 
-    @ApiOperation(value = "根据flowID,重新消费", notes = "根据flowID,重新消费")
-    @GetMapping(value = "/sendFlow/{flowId}")
-    public FebsResponse sendFlow(@PathVariable("flowId") String flowId) {
-        chainProducer.sendContractAnDao(Long.parseLong(flowId));
-        return new FebsResponse().success();
+    @ApiOperation(value = "商品列表", notes = "商品列表")
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "success", response = MallGoodsListVo.class)
+    })
+    @PostMapping(value = "/findMallGoodsList")
+    public FebsResponse findMallGoodsList(@RequestBody MallGoodsQueryDto queryDto) {
+        return new FebsResponse().success().data(dappMemberService.findMallGoodsListInPage(queryDto));
     }
 
+    @ApiOperation(value = "商品详情", notes = "商品详情")
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "success", response = MallGoodsListVo.class)
+    })
+    @GetMapping(value = "/goodsDetails/{id}")
+    public FebsResponse goodsDetails(@PathVariable("id") Long id) {
+        return new FebsResponse().success().data(dappMemberService.findGoodsDetailsById(id));
+    }
+
+
 //    @ApiOperation(value = "头部数据", notes = "头部数据")
 //    @GetMapping(value = "/totalIncome")
 //    public FebsResponse totalIncome() {

--
Gitblit v1.9.1