yangdamao 2 years ago
parent
commit
5ea69e1a26

+ 1 - 1
zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/system/SysTenantController.java

@@ -84,7 +84,7 @@ public class SysTenantController extends BaseController {
      */
     @ApiOperation("获取系统商户银行账号信息")
     @GetMapping("/bank/{tenantId}")
-    public AjaxResult<List<SysTenantBankAccountVo>> getBankAccountList(@PathVariable("tenantId" ) Long tenantId) {
+    public AjaxResult<List<SysTenantBankAccountVo>> getBankAccountList(@PathVariable("tenantId" ) String tenantId) {
         return AjaxResult.success(iSysTenantService.getBankAccountList(tenantId));
     }
 

+ 2 - 2
zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/SysTenantServiceImpl.java

@@ -407,8 +407,8 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
     }
 
     @Override
-    public List<SysTenantBankAccountVo> getBankAccountList(Long tenantId) {
-        SysTenant tenant = getById(tenantId);
+    public List<SysTenantBankAccountVo> getBankAccountList(String tenantId) {
+        SysTenant tenant = getById(Long.valueOf(tenantId));
         if (ObjectUtils.isNull(tenant)){
             throw new CustomException("机构信息获取失败!");
         }

+ 1 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/system/service/ISysTenantService.java

@@ -62,5 +62,5 @@ public interface ISysTenantService extends IService<SysTenant> {
 
 	void updateDictTenant(List<Long> tenantIds);
 
-	List<SysTenantBankAccountVo> getBankAccountList(Long tenantId);
+	List<SysTenantBankAccountVo> getBankAccountList(String tenantId);
 }

+ 1 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopOldOrderServiceImpl.java

@@ -1489,7 +1489,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
         SysTenant tenant = sysTenantService.getById(orderVo.getTenantId());
         vo.setApplyName(String.format("%s(%s)",tenant.getTenantName(),orderVo.getCreateUsername()));
         vo.setCheckType(1);
-        vo.setTenantId(tenant.getTenantId());
+        vo.setTenantId(tenant.getTenantId().toString());
         //审核进度
         List<TopOldOrderCheckLog> checkLogs = topOldOrderCheckLogService
                 .list(new LambdaQueryWrapper<TopOldOrderCheckLog>()

+ 1 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/vo/TopRefundOrderDetailVo.java

@@ -54,6 +54,6 @@ public class TopRefundOrderDetailVo {
     private Long buyTime;
 
     @ApiModelProperty("机构ID")
-    private Long tenantId;
+    private String tenantId;
 
 }