|
|
|
@ -91,21 +91,21 @@ public class DfOrderController extends BaseController {
|
|
|
|
|
}
|
|
|
|
|
List<DfOrder> list = dfOrderService.list(queryWrapper);
|
|
|
|
|
List<DfOrder> dfOrders = setOrderList(list);
|
|
|
|
|
if (StringUtils.isNotEmpty(dfOrder.getUserName())) {
|
|
|
|
|
dfOrders = dfOrders.stream()
|
|
|
|
|
.filter(info -> info.getUserName() != null && info.getUserName().contains(dfOrder.getUserName()))
|
|
|
|
|
.collect(Collectors.toList());
|
|
|
|
|
}
|
|
|
|
|
// if (StringUtils.isNotEmpty(dfOrder.getUserName())) {
|
|
|
|
|
// dfOrders = dfOrders.stream()
|
|
|
|
|
// .filter(info -> info.getUserName() != null && info.getUserName().contains(dfOrder.getUserName()))
|
|
|
|
|
// .collect(Collectors.toList());
|
|
|
|
|
// }
|
|
|
|
|
if (StringUtils.isNotEmpty(dfOrder.getBrokerName())) {
|
|
|
|
|
dfOrders = dfOrders.stream()
|
|
|
|
|
.filter(info -> info.getBrokerName() != null && info.getBrokerName().contains(dfOrder.getBrokerName()))
|
|
|
|
|
.collect(Collectors.toList());
|
|
|
|
|
}
|
|
|
|
|
if (StringUtils.isNotEmpty(dfOrder.getPhone())) {
|
|
|
|
|
dfOrders = dfOrders.stream()
|
|
|
|
|
.filter(info -> info.getPhone() != null && info.getPhone().contains(dfOrder.getPhone()))
|
|
|
|
|
.collect(Collectors.toList());
|
|
|
|
|
}
|
|
|
|
|
// if (StringUtils.isNotEmpty(dfOrder.getPhone())) {
|
|
|
|
|
// dfOrders = dfOrders.stream()
|
|
|
|
|
// .filter(info -> info.getPhone() != null && info.getPhone().contains(dfOrder.getPhone()))
|
|
|
|
|
// .collect(Collectors.toList());
|
|
|
|
|
// }
|
|
|
|
|
Integer start = (pageNum - 1) * pageSize;
|
|
|
|
|
List<DfOrder> result = dfOrders.stream()
|
|
|
|
|
.skip(start)
|
|
|
|
@ -137,15 +137,15 @@ public class DfOrderController extends BaseController {
|
|
|
|
|
String userName = userIdToNameMap.get(order.getId().toString());
|
|
|
|
|
String userJJName = userIdToNameMapVo.get(order.getBrokerId());
|
|
|
|
|
String phone = orderIdToPhoneMap.get(order.getId().toString());
|
|
|
|
|
if (null != userName) {
|
|
|
|
|
order.setUserName(userName);
|
|
|
|
|
}
|
|
|
|
|
// if (null != userName) {
|
|
|
|
|
// order.setUserName(userName);
|
|
|
|
|
// }
|
|
|
|
|
if (null != userJJName) {
|
|
|
|
|
order.setBrokerName(userJJName);
|
|
|
|
|
}
|
|
|
|
|
if (null != phone) {
|
|
|
|
|
order.setPhone(phone);
|
|
|
|
|
}
|
|
|
|
|
// if (null != phone) {
|
|
|
|
|
// order.setPhone(phone);
|
|
|
|
|
// }
|
|
|
|
|
});
|
|
|
|
|
return list;
|
|
|
|
|
}
|
|
|
|
@ -223,26 +223,26 @@ public class DfOrderController extends BaseController {
|
|
|
|
|
DfBizClue::getOrderId, // Key mapper
|
|
|
|
|
DfBizClue::getNickName, // Value mapper
|
|
|
|
|
(existingValue, newValue) -> existingValue)); // Merge function (keep existing value)
|
|
|
|
|
Map<String, String> orderIdToPhoneMap = clueList.stream()
|
|
|
|
|
.filter(clue -> clue.getOrderId() != null && clue.getPhone() != null)
|
|
|
|
|
.collect(Collectors.toMap(
|
|
|
|
|
DfBizClue::getOrderId, // Key mapper
|
|
|
|
|
DfBizClue::getPhone, // Value mapper
|
|
|
|
|
(existingValue, newValue) -> existingValue)); // Merge function (keep existing value)
|
|
|
|
|
// Map<String, String> orderIdToPhoneMap = clueList.stream()
|
|
|
|
|
// .filter(clue -> clue.getOrderId() != null && clue.getPhone() != null)
|
|
|
|
|
// .collect(Collectors.toMap(
|
|
|
|
|
// DfBizClue::getOrderId, // Key mapper
|
|
|
|
|
// DfBizClue::getPhone, // Value mapper
|
|
|
|
|
// (existingValue, newValue) -> existingValue)); // Merge function (keep existing value)
|
|
|
|
|
Map<Long, String> userIdToNameMapVo = userList.stream()
|
|
|
|
|
.collect(Collectors.toMap(SysUser::getUserId, SysUser::getUserName));
|
|
|
|
|
String userName = userIdToNameMap.get(byId.getId().toString());
|
|
|
|
|
// String userName = userIdToNameMap.get(byId.getId().toString());
|
|
|
|
|
String userJJName = userIdToNameMapVo.get(byId.getBrokerId());
|
|
|
|
|
String phone = orderIdToPhoneMap.get(byId.getId().toString());
|
|
|
|
|
if (null != userName) {
|
|
|
|
|
byId.setUserName(userName);
|
|
|
|
|
}
|
|
|
|
|
// String phone = orderIdToPhoneMap.get(byId.getId().toString());
|
|
|
|
|
// if (null != userName) {
|
|
|
|
|
// byId.setUserName(userName);
|
|
|
|
|
// }
|
|
|
|
|
if (null != userJJName) {
|
|
|
|
|
byId.setBrokerName(userJJName);
|
|
|
|
|
}
|
|
|
|
|
if (null != phone) {
|
|
|
|
|
byId.setPhone(phone);
|
|
|
|
|
}
|
|
|
|
|
//if (null != phone) {
|
|
|
|
|
// byId.setPhone(phone);
|
|
|
|
|
//}
|
|
|
|
|
return success(byId);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -262,15 +262,15 @@ public class DfOrderController extends BaseController {
|
|
|
|
|
@PostMapping("/visitorAdd")
|
|
|
|
|
@Anonymous
|
|
|
|
|
public AjaxResult visitorAdd(@RequestBody DfOrder dfOrder) {
|
|
|
|
|
SysUser sysUser = sysUserMapper.selectById(dfOrder.getShareUser());
|
|
|
|
|
if (sysUser == null) {
|
|
|
|
|
return AjaxResult.warn("链接有误");
|
|
|
|
|
}
|
|
|
|
|
List<Long> productIdsByBrokerId = dfBrokerService.getProductIdsByBrokerIdByUserId(Long.valueOf(dfOrder.getShareUser()));
|
|
|
|
|
Long productId = Long.valueOf(dfOrder.getProductId());
|
|
|
|
|
if (!productIdsByBrokerId.contains(productId)) {
|
|
|
|
|
return AjaxResult.warn("链接有误");
|
|
|
|
|
}
|
|
|
|
|
// SysUser sysUser = sysUserMapper.selectById(dfOrder.getShareUser());
|
|
|
|
|
// if (sysUser == null) {
|
|
|
|
|
// return AjaxResult.warn("链接有误");
|
|
|
|
|
// }
|
|
|
|
|
// List<Long> productIdsByBrokerId = dfBrokerService.getProductIdsByBrokerIdByUserId(Long.valueOf(dfOrder.getShareUser()));
|
|
|
|
|
// Long productId = Long.valueOf(dfOrder.getProductId());
|
|
|
|
|
// if (!productIdsByBrokerId.contains(productId)) {
|
|
|
|
|
// return AjaxResult.warn("链接有误");
|
|
|
|
|
// }
|
|
|
|
|
Date date = new Date();
|
|
|
|
|
dfOrder.setCreateTimeVo(date);
|
|
|
|
|
String billNumber = dfOrderService.getBillNumber("RK");
|
|
|
|
@ -368,6 +368,14 @@ public class DfOrderController extends BaseController {
|
|
|
|
|
queryWrapper.like(DfOrder::getProductName, dfOrder.getProductName());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (Validator.isNotEmpty(dfOrder.getPhone())) {
|
|
|
|
|
queryWrapper.like(DfOrder::getPhone, dfOrder.getPhone());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (Validator.isNotEmpty(dfOrder.getUserName())) {
|
|
|
|
|
queryWrapper.like(DfOrder::getUserName, dfOrder.getUserName());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//提交时间
|
|
|
|
|
if (Validator.isNotEmpty(dfOrder.getSubmitTime())) {
|
|
|
|
|
queryWrapper.eq(DfOrder::getSubmitTime, dfOrder.getSubmitTime());
|
|
|
|
|