diff --git a/cloud-market2-common/src/main/java/com/muyu/market/admain/Apis.java b/cloud-market2-common/src/main/java/com/muyu/market/admain/Apis.java new file mode 100644 index 0000000..28790c0 --- /dev/null +++ b/cloud-market2-common/src/main/java/com/muyu/market/admain/Apis.java @@ -0,0 +1,70 @@ +package com.muyu.market.admain; + + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.common.core.web.domain.BaseEntity; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.util.Date; + +@Data +@SuperBuilder +@AllArgsConstructor +@NoArgsConstructor +@TableName(value = "market_apis",autoResultMap = true) +@EqualsAndHashCode(callSuper = true) +public class Apis extends BaseEntity { + + + /** + * 接口文档ID + */ + @TableId(value = "api_id",type = IdType.AUTO) + private Long apiId; + /** + * 接口地址 + */ + @Schema(type = "String",description = "接口地址") + private String apiAddr; + /** + * 请求方式 + */ + @Schema(type = "String",description = "请求方式") + private String requestWay; + /** + * 请求类型 + */ + @Schema(type = "String",description = "请求类型") + private String type; + /** + * 接口描述 + */ + @Schema(type = "String",description = "接口描述") + private String apiDesc; + /** + * 请求参数说明 + */ + @Schema(type = "Long",description = "请求参数说明") + private Long requestId; + /** + * JSON返回示例 + */ + @Schema(type = "String",description = "JSON返回示例") + private String jsonSuch; + + + private Date updateTime; + private String updateBy; + private String createBy; + private Date createTime; + private String remark; + + +} diff --git a/cloud-market2-common/src/main/java/com/muyu/market/admain/request/OrdersListReq.java b/cloud-market2-common/src/main/java/com/muyu/market/admain/request/OrdersListReq.java index 0dc61f2..255e2d2 100644 --- a/cloud-market2-common/src/main/java/com/muyu/market/admain/request/OrdersListReq.java +++ b/cloud-market2-common/src/main/java/com/muyu/market/admain/request/OrdersListReq.java @@ -76,9 +76,4 @@ public class OrdersListReq { private String remark; - - - - - } diff --git a/cloud-market2-server/src/main/java/com/muyu/market/server/controller/AliPayController.java b/cloud-market2-server/src/main/java/com/muyu/market/server/controller/AliPayController.java index bf89358..c7e35bb 100644 --- a/cloud-market2-server/src/main/java/com/muyu/market/server/controller/AliPayController.java +++ b/cloud-market2-server/src/main/java/com/muyu/market/server/controller/AliPayController.java @@ -29,6 +29,7 @@ import java.util.UUID; @Tag(name = "调用第三方支付控制层",description = "调用第三方支付控制层") public class AliPayController { + @Resource AliPayConfig aliPayConfig; @@ -37,6 +38,7 @@ public class AliPayController { private static final String CHARSET ="utf-8"; private static final String SIGN_TYPE ="RSA2"; + @GetMapping("/pay") @ResponseBody public Result pay(@Validated AliPay aliPay, HttpServletResponse httpResponse) throws Exception { @@ -97,8 +99,6 @@ public class AliPayController { System.out.println("买家付款金额: " + params.get("buyer_pay_amount")); // 更新订单已支付的逻辑代码 - - } } return "success"; diff --git a/cloud-market2-server/src/main/java/com/muyu/market/server/controller/ApisController.java b/cloud-market2-server/src/main/java/com/muyu/market/server/controller/ApisController.java new file mode 100644 index 0000000..6380d65 --- /dev/null +++ b/cloud-market2-server/src/main/java/com/muyu/market/server/controller/ApisController.java @@ -0,0 +1,38 @@ +package com.muyu.market.server.controller; + +import com.muyu.common.core.domain.Result; +import com.muyu.market.admain.Apis; +import com.muyu.market.admain.Myapi; +import com.muyu.market.server.service.ApisService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + + +@Slf4j +@RestController +@RequestMapping("/apis") +@Tag(name = "api接口文档展示控制层",description = "api接口文档展示控制层") +@RequiredArgsConstructor +public class ApisController { + + @Autowired + private ApisService apisService; + + + @PostMapping("/selectByApisId") + @Operation(summary = "api接口文档查询展示",description = "根据ID查询接口文档展示") + public Result selectByApisId(@Validated @RequestParam( value = "apiId") Long apiId){ + Apis byId = apisService.getById(apiId); + return Result.success(byId,"操作成功"); + } + + +} diff --git a/cloud-market2-server/src/main/java/com/muyu/market/server/controller/OrdersController.java b/cloud-market2-server/src/main/java/com/muyu/market/server/controller/OrdersController.java index f2b00c1..50dbfea 100644 --- a/cloud-market2-server/src/main/java/com/muyu/market/server/controller/OrdersController.java +++ b/cloud-market2-server/src/main/java/com/muyu/market/server/controller/OrdersController.java @@ -3,6 +3,8 @@ package com.muyu.market.server.controller; import com.muyu.common.core.domain.Result; import com.muyu.market.admain.Myapi; +import com.muyu.market.admain.request.OrdersListReq; +import com.muyu.market.admain.response.OrdersListResp; import com.muyu.market.server.service.OrdersService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -13,6 +15,8 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + @Slf4j @RestController @RequestMapping("/orders") @@ -22,6 +26,12 @@ public class OrdersController { @Autowired private OrdersService ordersService; + + /** + * 订单的添加 + * @param myapi + * @return + */ @PostMapping("/Saveorders") @Operation(summary = "订单添加",description = "订单的添加") public Result createOrders(@RequestBody Myapi myapi){ @@ -29,4 +39,24 @@ public class OrdersController { ordersService.saveOrders(myapi); return Result.success(); } + + + + /** + * 查询订单信息 + * @param ordersListReq + * @return + */ + @PostMapping("/ordersSelect") + @Operation(summary = "查询订单信息",description = "查询订单信息") + public Result> ordersSelect(@RequestBody OrdersListReq ordersListReq){ + List selList = ordersService.ordersSelect(ordersListReq); + return Result.success(selList); + } + + + + + + } diff --git a/cloud-market2-server/src/main/java/com/muyu/market/server/mapper/ApisMapper.java b/cloud-market2-server/src/main/java/com/muyu/market/server/mapper/ApisMapper.java new file mode 100644 index 0000000..6b7aaa4 --- /dev/null +++ b/cloud-market2-server/src/main/java/com/muyu/market/server/mapper/ApisMapper.java @@ -0,0 +1,9 @@ +package com.muyu.market.server.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.market.admain.Apis; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface ApisMapper extends BaseMapper { +} diff --git a/cloud-market2-server/src/main/java/com/muyu/market/server/mapper/OrdersMapper.java b/cloud-market2-server/src/main/java/com/muyu/market/server/mapper/OrdersMapper.java index b039807..b7c1d54 100644 --- a/cloud-market2-server/src/main/java/com/muyu/market/server/mapper/OrdersMapper.java +++ b/cloud-market2-server/src/main/java/com/muyu/market/server/mapper/OrdersMapper.java @@ -3,10 +3,15 @@ package com.muyu.market.server.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.market.admain.Orders; +import com.muyu.market.admain.request.OrdersListReq; +import com.muyu.market.admain.response.OrdersListResp; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + @Mapper public interface OrdersMapper extends BaseMapper { + List ordersSelect(OrdersListReq ordersListReq); } diff --git a/cloud-market2-server/src/main/java/com/muyu/market/server/service/ApisService.java b/cloud-market2-server/src/main/java/com/muyu/market/server/service/ApisService.java new file mode 100644 index 0000000..cff6ed6 --- /dev/null +++ b/cloud-market2-server/src/main/java/com/muyu/market/server/service/ApisService.java @@ -0,0 +1,8 @@ +package com.muyu.market.server.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.market.admain.Apis; + +public interface ApisService extends IService { +} diff --git a/cloud-market2-server/src/main/java/com/muyu/market/server/service/Impl/ApisServiceImpl.java b/cloud-market2-server/src/main/java/com/muyu/market/server/service/Impl/ApisServiceImpl.java new file mode 100644 index 0000000..a31d3c6 --- /dev/null +++ b/cloud-market2-server/src/main/java/com/muyu/market/server/service/Impl/ApisServiceImpl.java @@ -0,0 +1,11 @@ +package com.muyu.market.server.service.Impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.market.admain.Apis; +import com.muyu.market.server.mapper.ApisMapper; +import com.muyu.market.server.service.ApisService; +import org.springframework.stereotype.Service; + +@Service +public class ApisServiceImpl extends ServiceImpl implements ApisService { +} diff --git a/cloud-market2-server/src/main/java/com/muyu/market/server/service/Impl/OrdersServiceImpl.java b/cloud-market2-server/src/main/java/com/muyu/market/server/service/Impl/OrdersServiceImpl.java index 22fbc7d..61e61da 100644 --- a/cloud-market2-server/src/main/java/com/muyu/market/server/service/Impl/OrdersServiceImpl.java +++ b/cloud-market2-server/src/main/java/com/muyu/market/server/service/Impl/OrdersServiceImpl.java @@ -4,12 +4,15 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.market.admain.Myapi; import com.muyu.market.admain.Orders; +import com.muyu.market.admain.request.OrdersListReq; +import com.muyu.market.admain.response.OrdersListResp; import com.muyu.market.server.mapper.OrdersMapper; import com.muyu.market.server.service.OrdersService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.Date; +import java.util.List; @Service public class OrdersServiceImpl extends ServiceImpl implements OrdersService { @@ -42,4 +45,9 @@ public class OrdersServiceImpl extends ServiceImpl impleme } + + @Override + public List ordersSelect(OrdersListReq ordersListReq) { + return ordersMapper.ordersSelect(ordersListReq); + } } diff --git a/cloud-market2-server/src/main/java/com/muyu/market/server/service/OrdersService.java b/cloud-market2-server/src/main/java/com/muyu/market/server/service/OrdersService.java index c393d00..f56ddcf 100644 --- a/cloud-market2-server/src/main/java/com/muyu/market/server/service/OrdersService.java +++ b/cloud-market2-server/src/main/java/com/muyu/market/server/service/OrdersService.java @@ -3,7 +3,13 @@ package com.muyu.market.server.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.market.admain.Myapi; import com.muyu.market.admain.Orders; +import com.muyu.market.admain.request.OrdersListReq; +import com.muyu.market.admain.response.OrdersListResp; + +import java.util.List; public interface OrdersService extends IService { void saveOrders(Myapi myapi); + + List ordersSelect(OrdersListReq ordersListReq); } diff --git a/cloud-market2-server/src/main/resources/bootstrap.yml b/cloud-market2-server/src/main/resources/bootstrap.yml index 91a7d1a..30207df 100644 --- a/cloud-market2-server/src/main/resources/bootstrap.yml +++ b/cloud-market2-server/src/main/resources/bootstrap.yml @@ -61,3 +61,4 @@ alipay: alipayPublicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvAodOIG6vaqMsl5DXjcRYPRro+C/SeTswVo5gqQdikK3qy118GWkVwL9gvEovq23EMCTmSV+KAFsHz8f0UxLEK9FZcfRuM5E7GfnP7sdY0ctjfmUhQ7fWVOTGLuH0h5DiQ+4voO/2Hi6SElvtLXAUBSqMKw6J0PsJ0uUY9CBZCQnZkFJWAAroUWw5ARUMy62KPZSAW2s8Qg4gacdhSk7SBACNGBFcJZHCS09xQJi5SxCHaTRLhhIckLBvuKEWhBsh+jU75BKYAC4ovoWhMAFnIWKwCmubhXqmYjuJ4egUQTQBbD1hasK99I1YzdXRH8OKwKD4Lufb42B9buZ/2hOywIDAQAB notifyUrl: http://12.2.1.1:8080/market2/alipay/notify + diff --git a/cloud-market2-server/src/main/resources/mapper/OrdersMapper.xml b/cloud-market2-server/src/main/resources/mapper/OrdersMapper.xml new file mode 100644 index 0000000..58b496b --- /dev/null +++ b/cloud-market2-server/src/main/resources/mapper/OrdersMapper.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + +