From 811cecc744b0b58f1ef13a2d9c179d6872e0b8ab Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期一, 19 四月 2021 15:36:42 +0800
Subject: [PATCH] Add:互调接口
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 2 +-
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/ClazzUtils.java | 2 +-
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ShopApi.java | 38 +++++++++++++++++++++++++++++++++++---
springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/FundsApi.java | 2 +-
springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/OrderApi.java | 2 +-
5 files changed, 39 insertions(+), 7 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ShopApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ShopApi.java
index aee805a..88b1b33 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ShopApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ShopApi.java
@@ -3,8 +3,8 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.controller.BaseController;
-import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO;
-import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO;
+import com.panzhihua.common.interfaces.ShopOperLog;
+import com.panzhihua.common.model.dtos.shop.*;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.shop.*;
@@ -13,11 +13,13 @@
import com.panzhihua.common.model.vos.user.SysUserVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.user.UserService;
+import com.panzhihua.common.utlis.ClazzUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -142,7 +144,37 @@
return communityService.changeStatus(id,status);
}
- @ApiOperation(value = "商家资金的订单详情",response = CapitalDetailVO.class)
+ @ApiOperation(value = "订单_分页列表")
+ @PostMapping("")
+ public R page(@RequestBody @Validated PageComShopOrderSearchDTO pageComShopOrderSearchDTO){
+ pageComShopOrderSearchDTO.setUserId(this.getUserId());
+ ClazzUtils.setIfStringIsEmpty(pageComShopOrderSearchDTO);
+ return communityService.pageShopOrder(pageComShopOrderSearchDTO);
+ }
+
+
+ @ApiOperation(value = "订单_详细")
+ @GetMapping("/order/detail")
+ @ShopOperLog(operType = 11)
+ public R detail(@RequestParam("orderId") Long orderId){
+ return communityService.orderDetail(orderId);
+ }
+
+ @ApiOperation(value = "资金_统计信息")
+ @GetMapping("/stat")
+ public R stat(){
+ return communityService.getFundsStat(getUserId());
+ }
+
+ @ApiOperation(value = "资金_分页列表")
+ @PostMapping("/page")
+ public R page(@RequestBody PageComShopFundsSearchDTO pageComShopFundsSearchDTO){
+ pageComShopFundsSearchDTO.setUserId(getUserId());
+ ClazzUtils.setIfStringIsEmpty(pageComShopFundsSearchDTO);
+ return communityService.pageShopFunds(pageComShopFundsSearchDTO);
+ }
+
+ @ApiOperation(value = "资金_详情",response = CapitalDetailVO.class)
@ApiImplicitParam(name = "id",value = "订单Id")
@GetMapping("/order/capitalDetailByStore")
R capitalDetailByStore(@RequestParam("id") Long id){
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index b46fcc5..d9ba034 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -1855,7 +1855,7 @@
R pageShopOperLog(@RequestBody PageDTO pageDTO);
/**
- * 分页查询 商家后台操作日志
+ * 订单分页查询
* @param pageComShopOrderSearchDTO 分页数据
* @return 分页日志
*/
diff --git a/springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/utils/ClazzUtils.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/ClazzUtils.java
similarity index 96%
rename from springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/utils/ClazzUtils.java
rename to springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/ClazzUtils.java
index 4006457..0540f30 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/utils/ClazzUtils.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/ClazzUtils.java
@@ -1,4 +1,4 @@
-package com.panzhihua.shop_backstage.utils;
+package com.panzhihua.common.utlis;
import com.panzhihua.common.model.dtos.shop.PageComShopOrderSearchDTO;
diff --git a/springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/FundsApi.java b/springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/FundsApi.java
index 5df1912..7c51fa2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/FundsApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/FundsApi.java
@@ -14,7 +14,7 @@
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.SFTPUtil;
import com.panzhihua.shop_backstage.excel.CustomSheetWriteHandler;
-import com.panzhihua.shop_backstage.utils.ClazzUtils;
+import com.panzhihua.common.utlis.ClazzUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
diff --git a/springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/OrderApi.java b/springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/OrderApi.java
index dadb8b4..8bdc2ab 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/OrderApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/OrderApi.java
@@ -14,7 +14,7 @@
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.SFTPUtil;
import com.panzhihua.shop_backstage.excel.CustomSheetWriteHandler;
-import com.panzhihua.shop_backstage.utils.ClazzUtils;
+import com.panzhihua.common.utlis.ClazzUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
--
Gitblit v1.7.1