From: qiaowei <jov123@163.com>
Date: Mon, 15 Jul 2019 09:44:06 +0000 (+0800)
Subject: 修改商户开户接口
X-Git-Tag: 1.0.0^2~44
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=0c08b12deeed4afd5d494bbf0b2805c626836d3d;p=epayment%2Ffood_payapi.git

修改商户开户接口
---

diff --git a/payapi-common/src/main/java/com/supwisdom/dlpay/api/APIRequestParam.java b/payapi-common/src/main/java/com/supwisdom/dlpay/api/APIRequestParam.java
index 75eadc6e..86315713 100644
--- a/payapi-common/src/main/java/com/supwisdom/dlpay/api/APIRequestParam.java
+++ b/payapi-common/src/main/java/com/supwisdom/dlpay/api/APIRequestParam.java
@@ -20,9 +20,19 @@ public abstract class APIRequestParam {
   private String sign_type;
   @Sign
   private String version;
+  @Sign
+  private String tenantid;
 
   private static final Logger logger = LoggerFactory.getLogger(APIRequestParam.class);
 
+  public String getTenantid() {
+    return tenantid;
+  }
+
+  public void setTenantid(String tenantid) {
+    this.tenantid = tenantid;
+  }
+
   public String getSign() {
     return sign;
   }
diff --git a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/shop_api_controller.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/shop_api_controller.kt
index 48bff6e4..a722aece 100644
--- a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/shop_api_controller.kt
+++ b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/shop_api_controller.kt
@@ -7,6 +7,7 @@ import com.supwisdom.dlpay.framework.ResponseBodyBuilder
 import com.supwisdom.dlpay.api.service.ShopService
 import com.supwisdom.dlpay.exception.TransactionException
 import com.supwisdom.dlpay.framework.service.CommonService
+import com.supwisdom.dlpay.framework.tenant.TenantContext
 import com.supwisdom.dlpay.framework.util.TradeErrorCode
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.http.ResponseEntity
@@ -26,6 +27,7 @@ class ShopAPIController {
     @PostMapping("/open")
     fun openAccount(@RequestBody param: OpenShopParam): ResponseEntity<Any> {
         try {
+            TenantContext.setTenantSchema(param.tenantid)
             shopService.findByThirdUniqueId(param.shopUniqueId)?.let {
                 return ResponseEntity.ok(ResponseBodyBuilder.create()
                         .fail(TradeErrorCode.BUSINESS_SHOP_EXISTS, "该商户唯一号[${param.shopUniqueId}]已经存在"))
@@ -52,6 +54,7 @@ class ShopAPIController {
     @GetMapping("/query")
     fun queryShop(@RequestBody param: QueryShopParam): ResponseEntity<Any> {
         try {
+            TenantContext.setTenantSchema(param.tenantid)
             shopService.findByShopBySearch(param.shopid, param.shopaccno, param.shopUniqueId)?.let {
                 return ResponseEntity.ok(ResponseBodyBuilder.create()
                         .data("shop", it)