Skip to content

P
pay-provider
Commit 637736ed authored by david.zhong's avatar david.zhong
Browse files
Options

资质供应商第一次上线版本

parent 2022189d
Show whitespace changes
Inline Side-by-side
Showing with 233 additions and 38 deletions
pom.xml
View file @ 637736ed
......@@ -12,7 +12,7 @@
<artifactId>pay-provider</artifactId>
<name>Micro :: Project :: As :: Provider</name>
<name>Micro :: Project :: As :: Pay-Provider</name>
<dependencies>
<dependency>
<groupId>org.apache.poi</groupId>
......
src/main/java/com/ost/micro/provider/common/ServiceUrl.java
View file @ 637736ed
......@@ -51,9 +51,6 @@ public class ServiceUrl {
break;
case "test":
case "sit":
serviceUrl = LOCAL_DEV_URL_AS_SERVICE;
break;
// formal
default:
List<ServiceInstance> serviceInstanceList = consulDiscoveryClient.getInstances(asService);
if (CollectionUtils.isEmpty(serviceInstanceList)) {
......
src/main/java/com/ost/micro/provider/controller/AuditController.java 0 → 100644
View file @ 637736ed
package com.ost.micro.provider.controller;
import com.google.common.reflect.TypeToken;
import com.google.gson.Gson;
import com.ost.micro.core.aop.DataToUnderline;
import com.ost.micro.core.context.model.response.DataResponse;
import com.ost.micro.core.pay.modules.sys.dto.AuditApproveDto;
import com.ost.micro.core.pay.modules.sys.dto.BizAuditmpDto;
import com.ost.micro.core.pay.modules.sys.excel.BizAuditmpBean;
import com.ost.micro.core.utils.ExcelUtils;
import com.ost.micro.core.utils.ResponseUtils;
import com.ost.micro.provider.common.PaymentServiceClient;
import com.ost.micro.provider.common.ServiceUrl;
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.beans.factory.annotation.Autowired;
import org.springframework.cloud.consul.discovery.ConsulDiscoveryClient;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@RestController
@RequestMapping("/provider/audit")
@Api(tags = "审核管理接口")
@Slf4j
public class AuditController {
@Autowired
private PaymentServiceClient paymentServiceClient;
@Autowired
private ConsulDiscoveryClient consulDiscoveryClient;
@Autowired
private ServiceUrl serviceUrl;
private String url = null;
// private String url = ServiceUrl.INSTACE.getUrl(consulDiscoveryClient) + "/api/audit";// 商家审核
@GetMapping("")
@ApiOperation("查询审核列表")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "query", name = "keyword", value = "关键字", required = false, dataType = "String"),
@ApiImplicitParam(paramType = "query", name = "biz_ids", value = "商家id列表", required = false, dataType = "List"),
@ApiImplicitParam(paramType = "query", name = "apply_type", value = "申请类型", required = false, dataType = "int"),
@ApiImplicitParam(paramType = "query", name = "audit_status", value = "审核状态", required = false, dataType = "int"),
@ApiImplicitParam(paramType = "query", name = "from_date", value = "起始日期", required = false, dataType = "long"),
@ApiImplicitParam(paramType = "query", name = "to_date", value = "结束日期", required = false, dataType = "long"),
@ApiImplicitParam(paramType = "query", name = "page_index", value = "页码", required = true, dataType = "int"),
@ApiImplicitParam(paramType = "query", name = "page_size", value = "每页数码条数", required = true, dataType = "int")})
@DataToUnderline()
public DataResponse searchBiz(@RequestParam(required = false) String keyword,
@RequestParam(required = false, name = "biz_ids") String[] bizIds,
@RequestParam(required = false, name = "apply_type") Long applyType,
@RequestParam(required = false, name = "audit_status") Integer auditStatus,
@RequestParam(required = false, name = "from_date") Long fromDate,
@RequestParam(required = false, name = "to_date") Long toDate,
@RequestParam(name = "page_index") Integer pageIndex,
@RequestParam(name = "page_size") Integer pageSize) {
StringBuilder urlBuilder = new StringBuilder();
urlBuilder.append(serviceUrl.getAsServiceUrl(consulDiscoveryClient));
urlBuilder.append("/api/provider/audit");
urlBuilder.append("?keyword={keyword}");
urlBuilder.append("&bizIds={bizIds}");
urlBuilder.append("&apply_type={applyType}");
urlBuilder.append("&auditStatus={auditStatus}");
urlBuilder.append("&fromDate={fromDate}");
urlBuilder.append("&toDate={toDate}");
urlBuilder.append("&pageIndex={pageIndex}");
urlBuilder.append("&pageSize={pageSize}");
ResponseEntity<DataResponse> result = paymentServiceClient.getRestTemplate()
.getForEntity(urlBuilder.toString(), DataResponse.class, keyword, bizIds,applyType, auditStatus, fromDate, toDate, pageIndex, pageSize);
return result.getBody();
}
@PutMapping("")
@ApiOperation("审核认证资料")
@DataToUnderline()
public DataResponse auditCertifile(@RequestBody AuditApproveDto dto) {
url = serviceUrl.getAsServiceUrl(consulDiscoveryClient) + "/api/provider/audit";
paymentServiceClient.put(url, dto);
return ResponseUtils.getInstance().success(null);
}
@GetMapping("{id}")
@ApiOperation("认证资料详情")
@ApiImplicitParam(paramType = "path", name = "id", value = "id", required = true, dataType = "long")
@DataToUnderline()
public DataResponse getCertifile(@PathVariable Long id) {
url = serviceUrl.getAsServiceUrl(consulDiscoveryClient) + "/api/provider/audit";
return paymentServiceClient.get(url, id);
}
/**
* 导出
*/
@ApiOperation("认证资料导出")
@GetMapping("/export")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "query", name = "keyword", value = "关键字", required = false, dataType = "String"),
@ApiImplicitParam(paramType = "query", name = "apply_type", value = "申请类型", required = false, dataType = "int"),
@ApiImplicitParam(paramType = "query", name = "audit_status", value = "审核状态", required = false, dataType = "int"),
@ApiImplicitParam(paramType = "query", name = "from_date", value = "起始日期", required = false, dataType = "long"),
@ApiImplicitParam(paramType = "query", name = "to_date", value = "结束日期", required = false, dataType = "long"),
@ApiImplicitParam(paramType = "query", name = "page_index", value = "页码", required = true, dataType = "int"),
@ApiImplicitParam(paramType = "query", name = "page_size", value = "每页数码条数", required = true, dataType = "int")})
public void export(@RequestParam(required = false) String keyword,
@RequestParam(required = false, name = "apply_type") Integer applyType,
@RequestParam(required = false, name = "audit_status") Integer auditStatus,
@RequestParam(required = false, name = "from_date") Long fromDate,
@RequestParam(required = false, name = "to_date") Long toDate,
@RequestParam(name = "page_index") Integer pageIndex,
@RequestParam(name = "page_size") Integer pageSize, HttpServletResponse response) {
url = serviceUrl.getAsServiceUrl(consulDiscoveryClient) + "/api/provider/audit";
Map params = new HashMap();
params.put("keyword", keyword);
params.put("applayType", applyType);
params.put("auditStatus", auditStatus);
params.put("fromDate", fromDate);
params.put("toDate", toDate);
params.put("pageIndex", pageIndex);
params.put("pageSize", pageSize);
DataResponse dataResponse = paymentServiceClient.get(url + "/export", params);
if (null != dataResponse && null != dataResponse.getData()) {
Object obj = dataResponse.getData().getList();
Gson gson = new Gson();
if (null != obj && obj instanceof List) {
List<BizAuditmpDto> dataList = gson.fromJson(gson.toJson(obj), new TypeToken<List<BizAuditmpDto>>() {
}.getType());
try {
ExcelUtils.exportExcelToTarget(response, "认证资料导出", dataList, BizAuditmpBean.class);
} catch (Exception e) {
log.error("export 认证资料 error", e);
// e.printStackTrace();
}
}
}
/* Page page = ${classname}Service.queryPage(params); */
}
}
src/main/java/com/ost/micro/provider/controller/BizController.java
View file @ 637736ed
......@@ -19,6 +19,7 @@ import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.consul.discovery.ConsulDiscoveryClient;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import java.util.HashMap;
......@@ -54,7 +55,7 @@ public class BizController {
@ApiOperation("查询商家列表")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "query", name = "keyword", value = "关键字，如：商家编号/法人姓名/手机号码/公司名称", required = false, dataType = "String"),
@ApiImplicitParam(paramType = "query", name = "bizIds", value = "商家id", required = false, allowMultiple = true,dataType = "String"),
@ApiImplicitParam(paramType = "query", name = "biz_ids", value = "商家id列表", required = false, dataType = "List"),
@ApiImplicitParam(paramType = "query", name = "audit_status", value = "资料认证状态", required = false, dataType = "int"),
@ApiImplicitParam(paramType = "query", name = "status", value = "启用状态", required = false, dataType = "int"),
@ApiImplicitParam(paramType = "query", name = "comp_id", value = "签约公司id", required = false, dataType = "long"),
......@@ -64,20 +65,25 @@ public class BizController {
public DataResponse searchBiz(@RequestParam(required = false, name = "keyword") String keyword,
@RequestParam(required = false, name = "status") Integer status,
@RequestParam(required = false, name = "audit_status") Integer auditStatus,
@RequestParam(required = false) String[] bizIds,
@RequestParam(required = false, name = "biz_ids") String[] bizIds,
@RequestParam(required = false, name = "comp_id") Long compId,
@RequestParam(name = "page_index") Integer pageIndex,
@RequestParam(name = "page_size") Integer pageSize) {
bizUrl = serviceUrl.getAsServiceUrl(consulDiscoveryClient) + "/api/provider/biz";
Map params = new HashMap();
params.put("keyword", keyword);
params.put("auditStatus", auditStatus);
params.put("status", status);
params.put("bizIds", bizIds);
params.put("compId", compId);
params.put("pageIndex", pageIndex);
params.put("pageSize", pageSize);
return paymentServiceClient.get(bizUrl, params);
StringBuilder urlBuilder = new StringBuilder();
urlBuilder.append(serviceUrl.getAsServiceUrl(consulDiscoveryClient));
urlBuilder.append("/api/provider/biz");
urlBuilder.append("?keyword={keyword}");
urlBuilder.append("&auditStatus={auditStatus}");
urlBuilder.append("&status={status}");
urlBuilder.append("&bizIds={bizIds}");
urlBuilder.append("&compId={compId}");
urlBuilder.append("&pageIndex={pageIndex}");
urlBuilder.append("&pageSize={pageSize}");
ResponseEntity<DataResponse> result = paymentServiceClient.getRestTemplate()
.getForEntity(urlBuilder.toString(), DataResponse.class, keyword, auditStatus, status, bizIds, compId, pageIndex, pageSize);
return result.getBody();
}
@PostMapping("")
......@@ -87,6 +93,7 @@ public class BizController {
bizUrl = serviceUrl.getAsServiceUrl(consulDiscoveryClient) + "/api/provider/biz";
dto.setCreateBy(currentBiz);
dto.setUpdateBy(currentBiz);
dto.setType(1);
return paymentServiceClient.post(bizUrl, dto);
}
......
src/main/java/com/ost/micro/provider/controller/BizTradeStaticsController.java
View file @ 637736ed
......@@ -51,6 +51,8 @@ public class BizTradeStaticsController {
@ApiOperation("交易统计查询")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "query", name = "biz_id", value = "商家id", required = false, dataType = "long"),
@ApiImplicitParam(paramType = "query", name = "current_biz_id", value = "当前登录的商家id", required = false, dataType = "long"),
@ApiImplicitParam(paramType = "query", name = "is_biz_id_from_permission", value = "bizId是否是权限系统中", required = false, dataType = "boolean"),
@ApiImplicitParam(paramType = "query", name = "biz_ids", value = "商家id", required = false, allowMultiple = true, dataType = "String"),
@ApiImplicitParam(paramType = "query", name = "comp_id", value = "签约公司id", required = false, dataType = "long"),
@ApiImplicitParam(paramType = "query", name = "supplier_id", value = "支付供应商id", required = false, dataType = "long"),
......@@ -63,6 +65,8 @@ public class BizTradeStaticsController {
@DataToUnderline()
public DataResponse search(
@RequestParam(required = false, name = "biz_id") Long bizId,
@RequestParam(required = false, name = "current_biz_id") Long currentBizId,
@RequestParam(required = false, name = "is_biz_id_from_permission") Boolean isBizIdFromPermission,
@RequestParam(required = false, name = "biz_ids") String[] bizIds,
@RequestParam(required = false, name = "comp_id") Long compId,
@RequestParam(required = false, name = "supplier_id") Long supplierId,
......@@ -72,11 +76,12 @@ public class BizTradeStaticsController {
@RequestParam(required = false) Integer currency,
@RequestParam(name = "page_index") Integer pageIndex,
@RequestParam(name = "page_size") Integer pageSize) {
staticUrl = serviceUrl.getAsServiceUrl(consulDiscoveryClient) + "/api/provider/statics";
StringBuilder urlBuilder = new StringBuilder();
urlBuilder.append(serviceUrl.getAsServiceUrl(consulDiscoveryClient));
urlBuilder.append("/api/statics");
urlBuilder.append("/api/provider/statics");
urlBuilder.append("?bizId={bizId}");
urlBuilder.append("&currentBizId={currentBizId}");
urlBuilder.append("&isBizIdFromPermission={isBizIdFromPermission}");
urlBuilder.append("&bizIds={bizIds}");
urlBuilder.append("&compId={compId}");
urlBuilder.append("&supplierId={supplierId}");
......@@ -87,7 +92,7 @@ public class BizTradeStaticsController {
urlBuilder.append("&pageIndex={pageIndex}");
urlBuilder.append("&pageSize={pageSize}");
ResponseEntity<DataResponse> result = paymentServiceClient.getRestTemplate().getForEntity(urlBuilder.toString(),
DataResponse.class, bizId, bizIds, compId, supplierId, mchId, beginTime, endTime, currency, pageIndex, pageSize);
DataResponse.class, bizId, currentBizId,isBizIdFromPermission,bizIds, compId, supplierId, mchId, beginTime, endTime, currency, pageIndex, pageSize);
return result.getBody();
}
......@@ -105,6 +110,8 @@ public class BizTradeStaticsController {
@ApiImplicitParam(paramType = "query", name = "keyword", value = "商家id", required = false, dataType = "String"),
@ApiImplicitParam(paramType = "query", name = "trade_type", value = "交易类型", required = false, dataType = "Integer"),
@ApiImplicitParam(paramType = "query", name = "biz_id", value = "商家id", required = true, dataType = "long"),
@ApiImplicitParam(paramType = "query", name = "current_biz_id", value = "当前登录的商家id", required = false, dataType = "long"),
@ApiImplicitParam(paramType = "query", name = "is_biz_id_from_permission", value = "bizId是否是权限系统中", required = false, dataType = "boolean"),
@ApiImplicitParam(paramType = "query", name = "mch_id", value = "商户id", required = true, dataType = "long"),
@ApiImplicitParam(paramType = "query", name = "begin_time", value = "开始时间", required = false, dataType = "long"),
@ApiImplicitParam(paramType = "query", name = "end_time", value = "结束时间", required = false, dataType = "long"),
......@@ -115,17 +122,21 @@ public class BizTradeStaticsController {
public DataResponse tradePage(@RequestParam(required = false) String keyword,
@RequestParam(required = false, name = "trade_type") Integer tradeType,
@RequestParam(name = "biz_id") Long bizId,
@RequestParam(required = false, name = "current_biz_id") Long currentBizId,
@RequestParam(required = false, name = "is_biz_id_from_permission") Boolean isBizIdFromPermission,
@RequestParam(name = "mch_id") Long mchId,
@RequestParam(required = false, name = "begin_time") Long beginTime,
@RequestParam(required = false, name = "end_time") Long endTime,
@RequestParam(required = false) Integer currency,
@RequestParam(name = "page_index") Integer pageIndex,
@RequestParam(name = "page_size") Integer pageSize) {
staticUrl = serviceUrl.getAsServiceUrl(consulDiscoveryClient) + "/api/provider/statics/tradePage";
String staticUrl = serviceUrl.getAsServiceUrl(consulDiscoveryClient) + "/api/provider/statics/tradePage";
Map<String, Object> params = new HashMap<>();
params.put("keyword", keyword);
params.put("tradeType", tradeType);
params.put("bizId", bizId);
params.put("currentBizId", currentBizId);
params.put("isBizIdFromPermission", isBizIdFromPermission);
params.put("mchId", mchId);
params.put("beginTime", beginTime);
params.put("endTime", endTime);
......@@ -139,6 +150,8 @@ public class BizTradeStaticsController {
@ApiOperation("导出交易统计")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "query", name = "biz_id", value = "商家id", required = false, dataType = "long"),
@ApiImplicitParam(paramType = "query", name = "current_biz_id", value = "当前登录的商家id", required = false, dataType = "long"),
@ApiImplicitParam(paramType = "query", name = "is_biz_id_from_permission", value = "bizId是否是权限系统中", required = false, dataType = "boolean"),
@ApiImplicitParam(paramType = "query", name = "biz_ids", value = "商家id", required = false, allowMultiple = true, dataType = "String"),
@ApiImplicitParam(paramType = "query", name = "comp_id", value = "公司id", required = false, dataType = "long"),
@ApiImplicitParam(paramType = "query", name = "supplier_id", value = "支付供应商", required = false, dataType = "long"),
......@@ -149,6 +162,8 @@ public class BizTradeStaticsController {
@ApiImplicitParam(paramType = "query", name = "page_index", value = "页码", required = false, dataType = "int"),
@ApiImplicitParam(paramType = "query", name = "page_size", value = "每页数码条数", required = false, dataType = "int")})
public void exportTradeStatic(@RequestParam(required = false, name = "biz_id") Long bizId,
@RequestParam(required = false, name = "current_biz_id") Long currentBizId,
@RequestParam(required = false, name = "is_biz_id_from_permission") Boolean isBizIdFromPermission,
@RequestParam(required = false, name = "biz_ids") String[] bizIds,
@RequestParam(required = false, name = "comp_id") Long compId,
@RequestParam(required = false, name = "supplier_id") Long supplierId,
......@@ -160,12 +175,12 @@ public class BizTradeStaticsController {
@RequestParam(required = false, name = "page_size") Integer pageSize,
HttpServletResponse response) {
staticUrl = serviceUrl.getAsServiceUrl(consulDiscoveryClient) + "/api/provider/statics/exportTradeStatic";
StringBuilder urlBuilder = new StringBuilder();
urlBuilder.append(serviceUrl.getAsServiceUrl(consulDiscoveryClient));
urlBuilder.append("/api/statics/exportTradeStatic");
urlBuilder.append("/api/provider/statics/exportTradeStatic");
urlBuilder.append("?bizId={bizId}");
urlBuilder.append("&currentBizId={currentBizId}");
urlBuilder.append("&isBizIdFromPermission={isBizIdFromPermission}");
urlBuilder.append("&bizIds={bizIds}");
urlBuilder.append("&compId={compId}");
urlBuilder.append("&supplierId={supplierId}");
......@@ -175,9 +190,9 @@ public class BizTradeStaticsController {
urlBuilder.append("&currency={currency}");
urlBuilder.append("&pageIndex={pageIndex}");
urlBuilder.append("&pageSize={pageSize}");
log.info("bizId={},bizIds={},compId={},supplierId={},mchId={},beginTime={},endTime={},pageIndex={},pageSize={}", bizId, bizIds, compId, supplierId, mchId, beginTime, endTime, pageIndex, pageSize);
log.info("bizId={},currentBizId={},isBizIdFromPermission={}，bizIds={},compId={},supplierId={},mchId={},beginTime={},endTime={},pageIndex={},pageSize={}", bizId,currentBizId,isBizIdFromPermission,bizIds, compId, supplierId, mchId, beginTime, endTime, pageIndex, pageSize);
ResponseEntity<DataResponse> result = paymentServiceClient.getRestTemplate().getForEntity(urlBuilder.toString(),
DataResponse.class, bizId, bizIds, compId, supplierId, mchId, beginTime, endTime, currency, pageIndex, pageSize);
DataResponse.class, bizId, currentBizId,isBizIdFromPermission,bizIds, compId, supplierId, mchId, beginTime, endTime, currency, pageIndex, pageSize);
DataResponse dataResponse = result.getBody();
if (null != dataResponse && null != dataResponse.getData()) {
Object obj = dataResponse.getData().getList();
......@@ -201,6 +216,8 @@ public class BizTradeStaticsController {
@ApiImplicitParam(paramType = "query", name = "keyword", value = "商家id", required = false, dataType = "String"),
@ApiImplicitParam(paramType = "query", name = "trade_type", value = "交易类型", required = false, dataType = "Integer"),
@ApiImplicitParam(paramType = "query", name = "biz_id", value = "商家id", required = true, dataType = "long"),
@ApiImplicitParam(paramType = "query", name = "current_biz_id", value = "当前登录的商家id", required = false, dataType = "long"),
@ApiImplicitParam(paramType = "query", name = "is_biz_id_from_permission", value = "bizId是否是权限系统中", required = false, dataType = "boolean"),
@ApiImplicitParam(paramType = "query", name = "mch_id", value = "商户id", required = true, dataType = "long"),
@ApiImplicitParam(paramType = "query", name = "begin_time", value = "开始时间", required = false, dataType = "long"),
@ApiImplicitParam(paramType = "query", name = "end_time", value = "结束时间", required = false, dataType = "long"),
......@@ -210,6 +227,8 @@ public class BizTradeStaticsController {
public void exportTradePage(@RequestParam(required = false) String keyword,
@RequestParam(required = false, name = "trade_type") Integer tradeType,
@RequestParam(name = "biz_id") Long bizId,
@RequestParam(required = false, name = "current_biz_id") Long currentBizId,
@RequestParam(required = false, name = "is_biz_id_from_permission") Boolean isBizIdFromPermission,
@RequestParam(name = "mch_id") Long mchId,
@RequestParam(required = false, name = "begin_time") Long beginTime,
@RequestParam(required = false, name = "end_time") Long endTime,
......@@ -217,11 +236,13 @@ public class BizTradeStaticsController {
@RequestParam(required = false, name = "page_index") Integer pageIndex,
@RequestParam(required = false, name = "page_size") Integer pageSize,
HttpServletResponse response) {
staticUrl = serviceUrl.getAsServiceUrl(consulDiscoveryClient) + "/api/provider/statics/exportTradePage";
String staticUrl = serviceUrl.getAsServiceUrl(consulDiscoveryClient) + "/api/provider/statics/exportTradePage";
Map<String, Object> params = new HashMap<>();
params.put("keyword", keyword);
params.put("tradeType", tradeType);
params.put("bizId", bizId);
params.put("currentBizId", currentBizId);
params.put("isBizIdFromPermission", isBizIdFromPermission);
params.put("mchId", mchId);
params.put("beginTime", beginTime);
params.put("endTime", endTime);
......
src/main/java/com/ost/micro/provider/controller/CommonController.java
View file @ 637736ed
......@@ -137,21 +137,23 @@ public class CommonController {
@ApiImplicitParams({
@ApiImplicitParam(paramType = "query", name = "is_biz_id_from_permission", value = "bizId是否是权限系统中", required = false, dataType = "boolean"),
@ApiImplicitParam(paramType = "query", name = "is_entry_info", value = "是否是资质录入员", required = false, dataType = "int"),
@ApiImplicitParam(paramType = "query", name = "is_entry_info_admin", value = "是否是资质录入员admin", required = false, dataType = "int"),
@ApiImplicitParam(paramType = "query", name = "biz_Id", value = "所属商家", required = false, dataType = "long"),
@ApiImplicitParam(paramType = "query", name = "biz_ids", value = "所属商家集合", required = false, allowMultiple = true, dataType = "String")
})
@DataToUnderline()
public DataResponse getCompany(@RequestParam(required = false, name = "is_entry_info") Integer isEntryInfo,
@RequestParam(required = false, name = "is_biz_id_from_permission") Boolean isBizIdFromPermission,
@RequestParam(required = false, name = "is_entry_info_admin") Integer isEntryInfoAdmin,
@RequestParam(required = false, name = "biz_id") Long bizId,
@RequestParam(required = false, name = "biz_ids") String[] bizIds) {
log.info("isEntryInfo ={}, isBizIdFromPermission = {},bizId ={},bizIds={}", isEntryInfo, isBizIdFromPermission, bizId, bizIds);
StringBuilder urlBuilder = new StringBuilder();
urlBuilder.append(serviceUrl.getAsServiceUrl(consulDiscoveryClient));
urlBuilder.append(BASE_URL);
urlBuilder.append("/company?bizId={bizId}&bizIds={bizIds}&isEntryInfo={isEntryInfo}&isBizIdFromPermission={isBizIdFromPermission}");
urlBuilder.append("/company?bizId={bizId}&bizIds={bizIds}&isEntryInfo={isEntryInfo}&isBizIdFromPermission={isBizIdFromPermission}&isEntryInfoAdmin={isEntryInfoAdmin}");
ResponseEntity<DataResponse> result = paymentServiceClient.getRestTemplate().getForEntity(urlBuilder.toString(),
DataResponse.class, bizId, bizIds, isEntryInfo, isBizIdFromPermission);
DataResponse.class, bizId, bizIds, isEntryInfo, isBizIdFromPermission,isEntryInfoAdmin);
return result.getBody();
}
......
src/main/java/com/ost/micro/provider/controller/CompanyController.java
View file @ 637736ed
......@@ -49,6 +49,7 @@ public class CompanyController {
@ApiImplicitParams({
@ApiImplicitParam(paramType = "query", name = "keyword", value = "关键字", required = false, dataType = "String"),
@ApiImplicitParam(paramType = "query", name = "is_entry_info", value = "是否是资质录入员", required = false, dataType = "int"),
@ApiImplicitParam(paramType = "query", name = "is_entry_info_admin", value = "是否是资质录入员admin", required = false, dataType = "int"),
@ApiImplicitParam(paramType = "query", name = "biz_id", value = "商家id", required = false, dataType = "Long"),
@ApiImplicitParam(paramType = "query", name = "biz_ids", value = "商家id列表", required = false, dataType = "List"),
@ApiImplicitParam(paramType = "query", name = "enable", value = "启用状态", required = false, dataType = "int"),
......@@ -58,6 +59,7 @@ public class CompanyController {
public DataResponse search(@RequestParam(required = false) String keyword,
@RequestParam(required = false) Integer enable,
@RequestParam(required = false, name = "is_entry_info") Integer isEntryInfo,
@RequestParam(required = false, name = "is_entry_info_admin") Integer isEntryInfoAdmin,
@RequestParam(required = false, name = "biz_id") Long bizId,
@RequestParam(required = false, name = "biz_ids") String[] bizIds,
@RequestParam(name = "page_index") Integer pageIndex,
......@@ -67,13 +69,14 @@ public class CompanyController {
urlBuilder.append(BASE_URL);
urlBuilder.append("?keyword={keyword}");
urlBuilder.append("&isEntryInfo={isEntryInfo}");
urlBuilder.append("&isEntryInfoAdmin={isEntryInfoAdmin}");
urlBuilder.append("&bizId={bizId}");
urlBuilder.append("&bizIds={bizIds}");
urlBuilder.append("&enable={enable}");
urlBuilder.append("&pageIndex={pageIndex}");
urlBuilder.append("&pageSize={pageSize}");
ResponseEntity<DataResponse> result = paymentServiceClient.getRestTemplate()
.getForEntity(urlBuilder.toString(), DataResponse.class, keyword, isEntryInfo, bizId, bizIds, enable, pageIndex, pageSize);
.getForEntity(urlBuilder.toString(), DataResponse.class, keyword, isEntryInfo,isEntryInfoAdmin, bizId, bizIds, enable, pageIndex, pageSize);
return result.getBody();
}
......
src/main/java/com/ost/micro/provider/controller/OrderController.java
View file @ 637736ed
......@@ -9,6 +9,7 @@ import com.ost.micro.core.pay.modules.sys.dto.BizTradeDetailDto;
import com.ost.micro.core.pay.modules.sys.excel.BizTradeDetailBean;
import com.ost.micro.core.utils.DateUtil;
import com.ost.micro.core.utils.ExcelUtils;
import com.ost.micro.core.utils.GsonUtil;
import com.ost.micro.core.utils.ResponseUtils;
import com.ost.micro.provider.common.PaymentServiceClient;
import com.ost.micro.provider.common.ServiceUrl;
......@@ -52,7 +53,9 @@ public class OrderController {
@ApiImplicitParam(paramType = "query", name = "name", value = "姓名", required = false, dataType = "String"),
@ApiImplicitParam(paramType = "query", name = "remark", value = "附言", required = false, dataType = "String"),
@ApiImplicitParam(paramType = "query", name = "biz_id", value = "商家id", required = false, dataType = "long"),
@ApiImplicitParam(paramType = "query", name = "biz_ids", value = "商家id", required = false, allowMultiple = true, dataType = "String"),
@ApiImplicitParam(paramType = "query", name = "current_biz_id", value = "当前登录的商家id", required = false, dataType = "long"),
@ApiImplicitParam(paramType = "query", name = "biz_ids", value = "商家id集合", required = false, allowMultiple = true, dataType = "String"),
@ApiImplicitParam(paramType = "query", name = "is_biz_id_from_permission", value = "bizId是否是权限系统中", required = false, dataType = "boolean"),
@ApiImplicitParam(paramType = "query", name = "status", value = "状态", required = false, dataType = "int"),
@ApiImplicitParam(paramType = "query", name = "currency", value = "0人民币1美元", required = false, dataType = "int"),
@ApiImplicitParam(paramType = "query", name = "from_date", value = "起始日期", required = false, dataType = "Long"),
......@@ -64,8 +67,10 @@ public class OrderController {
@RequestParam(required = false) String amount,
@RequestParam(required = false) String name,
@RequestParam(required = false) String remark,
@RequestParam(required = false, name = "current_biz_id") Long currentBizId,
@RequestParam(required = false, name = "biz_id") Long bizId,
@RequestParam(required = false, name = "biz_ids") String[] bizIds,
@RequestParam(required = false, name = "is_biz_id_from_permission") Boolean isBizIdFromPermission,
@RequestParam(required = false) Integer status,
@RequestParam(required = false) Integer currency,
@RequestParam(required = false, name = "from_date") Long fromDate,
......@@ -81,16 +86,18 @@ public class OrderController {
urlBuilder.append("&name={name}");
urlBuilder.append("&remark={remark}");
urlBuilder.append("&bizId={bizId}");
urlBuilder.append("&currentBizId={currentBizId}");
urlBuilder.append("&bizIds={bizIds}");
urlBuilder.append("&isBizIdFromPermission={isBizIdFromPermission}");
urlBuilder.append("&status={status}");
urlBuilder.append("&currency={currency}");
urlBuilder.append("&fromDate={fromDate}");
urlBuilder.append("&toDate={toDate}");
urlBuilder.append("&pageIndex={pageIndex}");
urlBuilder.append("&pageSize={pageSize}");
log.info("order provider params currentBizId {}", currentBizId);
ResponseEntity<DataResponse> result = paymentServiceClient.getRestTemplate().getForEntity(
urlBuilder.toString(), DataResponse.class, keyword, amount, name, remark, bizId, bizIds, status, currency, fromDate, toDate,
urlBuilder.toString(), DataResponse.class, keyword, amount, name, remark, bizId,currentBizId, bizIds,isBizIdFromPermission, status, currency, fromDate, toDate,
pageIndex, pageSize);
return result.getBody();
......@@ -142,8 +149,10 @@ public class OrderController {
@ApiImplicitParam(paramType = "query", name = "amount", value = "金额", required = false, dataType = "String"),
@ApiImplicitParam(paramType = "query", name = "name", value = "姓名", required = false, dataType = "String"),
@ApiImplicitParam(paramType = "query", name = "remark", value = "附言", required = false, dataType = "String"),
@ApiImplicitParam(paramType = "query", name = "biz_id", value = "商家id", required = true, dataType = "long"),
@ApiImplicitParam(paramType = "query", name = "biz_ids", value = "商家id集合", required = false, allowMultiple = true, dataType = "String"),
@ApiImplicitParam(paramType = "query", name = "biz_id", value = "商家id", required = false, dataType = "long"),
@ApiImplicitParam(paramType = "query", name = "current_biz_id", value = "当前登录的商家id", required = false, dataType = "long"),
@ApiImplicitParam(paramType = "query", name = "is_biz_id_from_permission", value = "bizId是否是权限系统中", required = false, dataType = "boolean"),
@ApiImplicitParam(paramType = "query", name = "biz_ids", value = "商家id集合", required = false, allowMultiple = false, dataType = "String"),
@ApiImplicitParam(paramType = "query", name = "type", value = "交易类型", required = false, dataType = "int"),
@ApiImplicitParam(paramType = "query", name = "status", value = "状态", required = false, dataType = "int"),
@ApiImplicitParam(paramType = "query", name = "currency", value = "0人民币1美元", required = false, dataType = "int"),
......@@ -155,6 +164,8 @@ public class OrderController {
@RequestParam(required = false) String name,
@RequestParam(required = false) String remark,
@RequestParam(required = false, name = "biz_id") Long bizId,
@RequestParam(required = false, name = "current_biz_id") Long currentBizId,
@RequestParam(required = false, name = "is_biz_id_from_permission") Boolean isBizIdFromPermission,
@RequestParam(required = false, name = "biz_ids") String[] bizIds,
@RequestParam(required = false) Integer type,
@RequestParam(required = false) Integer status,
......@@ -165,12 +176,14 @@ public class OrderController {
StringBuilder urlBuilder = new StringBuilder();
urlBuilder.append(serviceUrl.getAsServiceUrl(consulDiscoveryClient));
urlBuilder.append("/api/order/export");
urlBuilder.append("/api/provider/order/export");
urlBuilder.append("?keyword={keyword}");
urlBuilder.append("&amount={amount}");
urlBuilder.append("&name={name}");
urlBuilder.append("&remark={remark}");
urlBuilder.append("&bizId={bizId}");
urlBuilder.append("&currentBizId={currentBizId}");
urlBuilder.append("&isBizIdFromPermission={isBizIdFromPermission}");
urlBuilder.append("&bizIds={bizIds}");
urlBuilder.append("&type={type}");
urlBuilder.append("&status={status}");
......@@ -178,9 +191,9 @@ public class OrderController {
urlBuilder.append("&fromDate={fromDate}");
urlBuilder.append("&toDate={toDate}");
ResponseEntity<DataResponse> result = paymentServiceClient.getRestTemplate().getForEntity(urlBuilder.toString(),
DataResponse.class, keyword, amount, name, remark, bizId, bizIds, type, status, currency, fromDate, toDate);
DataResponse.class, keyword, amount, name, remark, bizId, currentBizId,isBizIdFromPermission,bizIds, type, status, currency, fromDate, toDate);
DataResponse dataResponse = result.getBody();
log.info("bizids = {}",GsonUtil.toJson(bizIds,true));
if (null != dataResponse && null != dataResponse.getData()) {
Object obj = dataResponse.getData().getList();
Gson gson = new Gson();
......
src/main/java/com/ost/micro/provider/controller/SupplierController.java
View file @ 637736ed
......@@ -118,6 +118,7 @@ public class SupplierController {
@ApiImplicitParam(paramType = "query", name = "sup_id", value = "供应商id", required = false, dataType = "Long"),
@ApiImplicitParam(paramType = "query", name = "keyword", value = "关键字", required = false, dataType = "String"),
@ApiImplicitParam(paramType = "query", name = "is_entry_info", value = "是否是资质录入员", required = false, dataType = "int"),
@ApiImplicitParam(paramType = "query", name = "is_entry_info_admin", value = "是否是资质录入员admin", required = false, dataType = "int"),
@ApiImplicitParam(paramType = "query", name = "biz_id_admin", value = "商户商家id", required = false, dataType = "long"),
@ApiImplicitParam(paramType = "query", name = "is_biz_id_from_permission", value = "bizId是否是权限系统中", required = false, dataType = "boolean"),
@ApiImplicitParam(paramType = "query", name = "biz_id", value = "商家id", required = false, dataType = "Long"),
......@@ -129,6 +130,7 @@ public class SupplierController {
public DataResponse searchMerchant(@RequestParam(required = false, name = "sup_id") Long supId,
@RequestParam(required = false) String keyword,
@RequestParam(required = false, name = "is_entry_info") Integer isEntryInfo,
@RequestParam(required = false, name = "is_entry_info_admin") Integer isEntryInfoAdmin,
@RequestParam(required = false, name = "is_biz_id_from_permission") Boolean isBizIdFromPermission,
@RequestParam(required = false, name = "biz_id") Long bizId,
@RequestParam(required = false, name = "biz_id_admin") Long bizIdAdmin,
......@@ -143,6 +145,7 @@ public class SupplierController {
urlBuilder.append("?supId={supId}");
urlBuilder.append("&keyword={keyword}");
urlBuilder.append("&isEntryInfo={isEntryInfo}");
urlBuilder.append("&isEntryInfoAdmin={isEntryInfoAdmin}");
urlBuilder.append("&isBizIdFromPermission={isBizIdFromPermission}");
urlBuilder.append("&bizId={bizId}");
urlBuilder.append("&bizIdAdmin={bizIdAdmin}");
......@@ -151,7 +154,7 @@ public class SupplierController {
urlBuilder.append("&pageIndex={pageIndex}");
urlBuilder.append("&pageSize={pageSize}");
ResponseEntity<DataResponse> result = paymentServiceClient.getRestTemplate().getForEntity(urlBuilder.toString(),
DataResponse.class, supId, keyword, isEntryInfo, isBizIdFromPermission, bizId, bizIdAdmin, bizIds, enable, pageIndex, pageSize);
DataResponse.class, supId, keyword, isEntryInfo, isEntryInfoAdmin,isBizIdFromPermission, bizId, bizIdAdmin, bizIds, enable, pageIndex, pageSize);
return result.getBody();
}
......@@ -187,6 +190,7 @@ public class SupplierController {
public DataResponse add(@RequestBody(required = false) MchPayDto params, @RequestParam(required = false, name = "biz_id") Long bizId) {
merchantUrl = serviceUrl.getAsServiceUrl(consulDiscoveryClient) + "/api/supplier/merchant";
params.setCreateBy(bizId + "");
params.setSource(1);
DataResponse dataResponse = paymentServiceClient.post(merchantUrl, params);
return dataResponse;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment