提交 5883f3e5 authored 作者: inroi's avatar inroi

调整

上级 b9d89aab
package com.system.controller;
import com.system.serivce.IDockingService;
import com.system.transfer.docking.DockingDistributionMemberBalanceInVo;
import com.system.transfer.docking.DockingDistributionMemberCreateInVo;
import com.system.transfer.docking.DockingDistributionMemberSubordinateListInVo;
import com.system.transfer.response.RestResponse;
......@@ -31,5 +32,11 @@ public class DockingController {
return dockingService.dockingDistributionMemberSubordinateList(inVo);
}
@ApiOperation("分销会员余额")
@GetMapping("/docking/distribution/member/balance")
public RestResponse dockingDistributionMemberBalance(@RequestBody DockingDistributionMemberBalanceInVo inVo) {
return dockingService.dockingDistributionMemberBalance(inVo);
}
}
......@@ -41,5 +41,14 @@ public interface IDockingDistributionService {
*/
String dockingDistributionMemberSubordinateList(String queueId, String memberId);
/**
* 会员余额
*
* @param memberId 会员标识
* @param queueId 唯一标识
* @return 结果
*/
String dockingDistributionMemberBalance(String queueId, String memberId);
}
package com.system.serivce;
import com.system.transfer.docking.DockingDistributionMemberBalanceInVo;
import com.system.transfer.docking.DockingDistributionMemberCreateInVo;
import com.system.transfer.docking.DockingDistributionMemberSubordinateListInVo;
import com.system.transfer.response.RestResponse;
......@@ -25,5 +26,13 @@ public interface IDockingService {
*/
RestResponse dockingDistributionMemberSubordinateList(DockingDistributionMemberSubordinateListInVo inVo);
/**
* 查询分销会员下级列表
*
* @param inVo 条件
* @return 结果
*/
RestResponse dockingDistributionMemberBalance(DockingDistributionMemberBalanceInVo inVo);
}
......@@ -109,5 +109,21 @@ public class DockingDistributionServiceImpl implements IDockingDistributionServi
}
}
@Override
public String dockingDistributionMemberBalance(String queueId, String memberId) {
try {
Map<String, Object> data = new HashMap<>(2);
data.put("secret", secret);
data.put("memberId", memberId);
String result = HttpClientUtil.sendPost("http://192.168.0.34:8080/api/v1/member/balance", JsonUtil.toString(data));
thirdPartyLogUtil.thirdPartyLogCreate("分销会员余额查询", "0001", queueId, "平台->分销", JsonUtil.toString(data), result, 1);
return result;
} catch (IOException e) {
e.printStackTrace();
return "";
}
}
}
......@@ -3,6 +3,7 @@ package com.system.serivce.impl;
import com.system.constants.Constants;
import com.system.serivce.IDockingDistributionService;
import com.system.serivce.IDockingService;
import com.system.transfer.docking.DockingDistributionMemberBalanceInVo;
import com.system.transfer.docking.DockingDistributionMemberCreateInVo;
import com.system.transfer.docking.DockingDistributionMemberSubordinateListInVo;
import com.system.transfer.response.RestResponse;
......@@ -58,13 +59,25 @@ public class DockingServiceImpl implements IDockingService {
List<Map<String, Object>> temp01List = tempList.stream().filter(m -> inVo.getMemberId().equals(m.get("parentId"))).collect(Collectors.toList());
for (Map<String, Object> temp : temp01List) {
List<Map<String, Object>> temp02List = tempList.stream().filter(m -> temp.get("memberId").equals(m.get("parentId"))).collect(Collectors.toList());
temp.put("children", temp02List);
recordsList.add(temp);
recordsList.addAll(temp02List);
}
}
return RestResponse.success(recordsList);
}
@Override
public RestResponse dockingDistributionMemberBalance(DockingDistributionMemberBalanceInVo inVo) {
String result = dockingDistributionService.dockingDistributionMemberBalance(inVo.getQueueId(), inVo.getMemberId());
Map<String, Object> map = JsonUtil.toMap(result, String.class, Object.class);
if (!CollectionUtils.isEmpty(map) && Constants.SUCCESS_CODE.equals(String.valueOf(map.get(Constants.SUCCESS_NAME)))) {
return RestResponse.success(map.get("data"));
}
return RestResponse.success();
}
}
package com.system.transfer.docking;
import lombok.Data;
/**
* @author Inori
*/
@Data
public class DockingDistributionMemberBalanceInVo {
/**
* 唯一标识
*/
private String queueId;
/**
* 会员标识
*/
private String memberId;
}
......@@ -47,7 +47,7 @@ spring:
threadsInheritContextClassLoaderOfInitializingThread: true
datasource:
url: jdbc:mysql://127.0.0.1:3306/db_semiconductor?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
url: jdbc:mysql://127.0.0.1:3306/db_integrate?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
username: inori
password: inori
driver-class-name: com.mysql.cj.jdbc.Driver
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论