clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

fix bug

This commit is contained in:
YiFei Kuang 2025-03-03 11:47:33 +08:00
parent c58346349c
commit ffb560da51
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ghy-admin/src/main/java/com/ghy/web/controller/customer/CustomerController.java
View File

@ -76,6 +76,7 @@ public class CustomerController extends BaseController {
startPage(); startPage();
List<Customer> list = customerService.getCustomerList(customer); List<Customer> list = customerService.getCustomerList(customer);
for (Customer curCustomer: list) { for (Customer curCustomer: list) {
Long teamNum = 0L;
List<Long> customerIds = new ArrayList<Long>(){{ List<Long> customerIds = new ArrayList<Long>(){{
add(curCustomer.getCustomerId()); add(curCustomer.getCustomerId());
}}; }};
@ -85,8 +86,9 @@ public class CustomerController extends BaseController {
customerQry.setCustomerPlace(curCustomer.getCustomerId()); customerQry.setCustomerPlace(curCustomer.getCustomerId());
customerQry.setStatus(Integer.valueOf(UserStatus.OK.getCode())); customerQry.setStatus(Integer.valueOf(UserStatus.OK.getCode()));
List<Customer> nextLevelCustomers = customerService.getCustomerList(customerQry); List<Customer> nextLevelCustomers = customerService.getCustomerList(customerQry);
teamNum = teamNum + nextLevelCustomers.stream().filter(x->PlaceStatus.CAN_PLACE.getCode().equals(x.getPlaceStatus())).count();
List<Long> nextLevelCustomerIds = nextLevelCustomers.stream().map(Customer::getCustomerId).collect(Collectors.toList()); List<Long> nextLevelCustomerIds = nextLevelCustomers.stream().map(Customer::getCustomerId).collect(Collectors.toList());
customerIds.addAll(nextLevelCustomerIds); // customerIds.addAll(nextLevelCustomerIds);
} }
// 本月第一天 // 本月第一天
@ -107,26 +109,31 @@ public class CustomerController extends BaseController {
.setValue(customerService.countCustomer(customerParams)); .setValue(customerService.countCustomer(customerParams));
analyseItems.add(aItem1); analyseItems.add(aItem1);
// 本月绑定客户数 // 本月绑定客户数
customerParams.setPlaceStatus(null);
customerParams.setUpdateTimeStart(firstDayCurMonth.atStartOfDay()); customerParams.setUpdateTimeStart(firstDayCurMonth.atStartOfDay());
AnalyseItem aItem2 = new AnalyseItem() AnalyseItem aItem2 = new AnalyseItem()
.setType(AnalyseItemEnum.CUSTOMER_NUM_ADDED_CUR_MONTH.getType()) .setType(AnalyseItemEnum.CUSTOMER_NUM_ADDED_CUR_MONTH.getType())
.setTitle(AnalyseItemEnum.CUSTOMER_NUM_ADDED_CUR_MONTH.getTitle()) .setTitle(AnalyseItemEnum.CUSTOMER_NUM_ADDED_CUR_MONTH.getTitle())
.setUnit(AnalyseItemEnum.CUSTOMER_NUM_ADDED_CUR_MONTH.getUnit()) .setUnit(AnalyseItemEnum.CUSTOMER_NUM_ADDED_CUR_MONTH.getUnit())
.setValue(customerService.countCustomer(customerParams)); .setValue(customerService.countCustomer(customerParams));
analyseItems.add(aItem2); analyseItems.add(aItem2);
// 团队 // 团队
customerParams.setUpdateTimeStart(null);
customerParams.setPlaceStatus(PlaceStatus.CAN_PLACE.getCode());
AnalyseItem aItem11 = new AnalyseItem() AnalyseItem aItem11 = new AnalyseItem()
.setType(AnalyseItemEnum.TEAM_MEMBER_NUM.getType()) .setType(AnalyseItemEnum.TEAM_MEMBER_NUM.getType())
.setTitle(AnalyseItemEnum.TEAM_MEMBER_NUM.getTitle()) .setTitle(AnalyseItemEnum.TEAM_MEMBER_NUM.getTitle())
.setUnit(AnalyseItemEnum.TEAM_MEMBER_NUM.getUnit()) .setUnit(AnalyseItemEnum.TEAM_MEMBER_NUM.getUnit())
.setValue(aItem1.getValue()); .setValue(customerService.countCustomer(customerParams));
analyseItems.add(aItem11); analyseItems.add(aItem11);
// 本月绑定客户数 // 本月绑定客户数
customerParams.setUpdateTimeStart(firstDayCurMonth.atStartOfDay());
customerParams.setPlaceStatus(PlaceStatus.CAN_PLACE.getCode());
AnalyseItem aItem12 = new AnalyseItem() AnalyseItem aItem12 = new AnalyseItem()
.setType(AnalyseItemEnum.TEAM_MEMBER_ADDED_CUR_MONTH.getType()) .setType(AnalyseItemEnum.TEAM_MEMBER_ADDED_CUR_MONTH.getType())
.setTitle(AnalyseItemEnum.TEAM_MEMBER_ADDED_CUR_MONTH.getTitle()) .setTitle(AnalyseItemEnum.TEAM_MEMBER_ADDED_CUR_MONTH.getTitle())
.setUnit(AnalyseItemEnum.TEAM_MEMBER_ADDED_CUR_MONTH.getUnit()) .setUnit(AnalyseItemEnum.TEAM_MEMBER_ADDED_CUR_MONTH.getUnit())
.setValue(aItem2.getValue()); .setValue(customerService.countCustomer(customerParams));
analyseItems.add(aItem12); analyseItems.add(aItem12);
// 本月订单数及本月订单额 // 本月订单数及本月订单额
@ -212,7 +219,7 @@ public class CustomerController extends BaseController {
OrderMaster orderParams4 = new OrderMaster(); OrderMaster orderParams4 = new OrderMaster();
orderParams4.setCustomerIds(customerIds); orderParams4.setCustomerIds(customerIds);
orderParams4.setCreateTimeStart(firstDayCurWeek.atStartOfDay()); orderParams4.setCreateTimeStart(firstDayCurWeek.atStartOfDay());
List<OrderMaster> ordersCurWeek = orderMasterService.selectOrderMasterList(orderParams3); List<OrderMaster> ordersCurWeek = orderMasterService.selectOrderMasterList(orderParams4);
List<Long> orderIdsCurWeek = ordersCurWeek.stream().map(OrderMaster::getId).collect(Collectors.toList()); List<Long> orderIdsCurWeek = ordersCurWeek.stream().map(OrderMaster::getId).collect(Collectors.toList());
BigDecimal totalMoneyCurWeek = new BigDecimal(0); BigDecimal totalMoneyCurWeek = new BigDecimal(0);
if (CollectionUtils.isNotEmpty(orderIdsCurWeek)) { if (CollectionUtils.isNotEmpty(orderIdsCurWeek)) {

3
ghy-custom/src/main/resources/mapper/customer/CustomerMapper.xml
View File

@ -60,6 +60,9 @@
<if test="openId != null and openId != ''"> <if test="openId != null and openId != ''">
AND open_id = #{openId} AND open_id = #{openId}
</if> </if>
<if test="placeStatus != null and placeStatus != ''">
AND place_status = #{placeStatus}
</if>
<if test="customerPlace != null and customerPlace != ''"> <if test="customerPlace != null and customerPlace != ''">
AND customer_place = #{customerPlace} AND customer_place = #{customerPlace}
</if> </if>