From 076384bd026a7f75c87dd99f6826cd3cd980edf0 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期六, 28 三月 2026 13:24:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hxsj' into hxsj
---
src/main/java/com/ruoyi/account/pojo/EnterpriseFixedAssets.java | 60 ++++++++++++
src/main/java/com/ruoyi/basic/pojo/Customer.java | 30 ++++++
src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java | 5
src/main/java/com/ruoyi/account/service/EnterpriseFixedAssetsService.java | 13 ++
src/main/java/com/ruoyi/account/service/impl/EnterpriseFixedAssetsServiceImpl.java | 27 +++++
src/main/java/com/ruoyi/account/mapper/EnterpriseFixedAssetsMapper.java | 9 +
src/main/java/com/ruoyi/account/controller/EnterpriseFixedAssetsController.java | 52 ++++++++++
src/main/resources/mapper/account/EnterpriseFixedAssetsMapper.xml | 17 +++
src/main/java/com/ruoyi/basic/controller/SupplierManageController.java | 5
src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java | 76 ++++++++++++++-
10 files changed, 284 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/ruoyi/account/controller/EnterpriseFixedAssetsController.java b/src/main/java/com/ruoyi/account/controller/EnterpriseFixedAssetsController.java
new file mode 100644
index 0000000..2482b18
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/controller/EnterpriseFixedAssetsController.java
@@ -0,0 +1,52 @@
+package com.ruoyi.account.controller;
+
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.ruoyi.account.pojo.EnterpriseFixedAssets;
+import com.ruoyi.account.service.EnterpriseFixedAssetsService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.http.HttpHeaders;
+import lombok.AllArgsConstructor;
+import io.swagger.annotations.ApiOperation;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import java.util.List;
+
+@RestController
+@AllArgsConstructor
+@RequestMapping("/enterpriseFixedAssets")
+@Api(value = "EnterpriseFixedAssets", tags = "鍥哄畾璧勪骇")
+public class EnterpriseFixedAssetsController {
+
+ private EnterpriseFixedAssetsService enterpriseFixedAssetsservice;
+
+ @GetMapping("/listPage")
+ @ApiOperation("鍒嗛〉鏌ヨ鎵�鏈�")
+ public AjaxResult listPage(Page page, EnterpriseFixedAssets enterpriseFixedAssets) {
+ IPage<EnterpriseFixedAssets> listPage = enterpriseFixedAssetsservice.listPage(page, enterpriseFixedAssets);
+ return AjaxResult.success(listPage);
+ }
+
+ @PostMapping("/add")
+ @ApiOperation("鏂板")
+ public AjaxResult add(@RequestBody EnterpriseFixedAssets enterpriseFixedAssets) {
+ return AjaxResult.success(enterpriseFixedAssetsservice.save(enterpriseFixedAssets));
+ }
+
+ @PostMapping("/update")
+ @ApiOperation("淇敼")
+ public AjaxResult update(@RequestBody EnterpriseFixedAssets enterpriseFixedAssets) {
+ return AjaxResult.success(enterpriseFixedAssetsservice.updateById(enterpriseFixedAssets));
+ }
+
+ @DeleteMapping("/delete")
+ @ApiOperation("鍒犻櫎")
+ public AjaxResult delete(@RequestBody List<Long> ids) {
+ if (CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return AjaxResult.success(enterpriseFixedAssetsservice.removeBatchByIds(ids));
+ }
+}
diff --git a/src/main/java/com/ruoyi/account/mapper/EnterpriseFixedAssetsMapper.java b/src/main/java/com/ruoyi/account/mapper/EnterpriseFixedAssetsMapper.java
new file mode 100644
index 0000000..02ef5ba
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/mapper/EnterpriseFixedAssetsMapper.java
@@ -0,0 +1,9 @@
+package com.ruoyi.account.mapper;
+
+import com.ruoyi.account.pojo.EnterpriseFixedAssets;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface EnterpriseFixedAssetsMapper extends BaseMapper<EnterpriseFixedAssets> {
+}
diff --git a/src/main/java/com/ruoyi/account/pojo/EnterpriseFixedAssets.java b/src/main/java/com/ruoyi/account/pojo/EnterpriseFixedAssets.java
new file mode 100644
index 0000000..4a7daca
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/pojo/EnterpriseFixedAssets.java
@@ -0,0 +1,60 @@
+package com.ruoyi.account.pojo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+
+@Data
+@TableName("enterprise_fixed_assets")
+@ApiModel(description="")
+public class EnterpriseFixedAssets implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ *
+ */
+ @ApiModelProperty(value="")
+ private Long id;
+ /**
+ * 鍚嶇О
+ */
+ @ApiModelProperty(value="鍚嶇О")
+ private String name;
+ /**
+ * 鍨嬪彿
+ */
+ @ApiModelProperty(value="鍨嬪彿")
+ private String model;
+ /**
+ * 浠锋牸
+ */
+ @ApiModelProperty(value="浠锋牸")
+ private BigDecimal price;
+ /**
+ * 鍦板潃
+ */
+ @ApiModelProperty(value="鍦板潃")
+ private String address;
+
+
+ @ApiModelProperty(value = "绉熸埛ID")
+ @TableField(fill = FieldFill.INSERT)
+ private Long tenantId;
+
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @TableField(fill = FieldFill.INSERT)
+ private LocalDateTime createTime;
+
+ @ApiModelProperty(value = "淇敼鏃堕棿")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private LocalDateTime updateTime;
+}
diff --git a/src/main/java/com/ruoyi/account/service/EnterpriseFixedAssetsService.java b/src/main/java/com/ruoyi/account/service/EnterpriseFixedAssetsService.java
new file mode 100644
index 0000000..6606c03
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/service/EnterpriseFixedAssetsService.java
@@ -0,0 +1,13 @@
+package com.ruoyi.account.service;
+
+import com.ruoyi.account.pojo.EnterpriseFixedAssets;
+import com.ruoyi.account.mapper.EnterpriseFixedAssetsMapper;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.List;
+
+public interface EnterpriseFixedAssetsService extends IService<EnterpriseFixedAssets> {
+ IPage<EnterpriseFixedAssets> listPage(Page<EnterpriseFixedAssets> page, EnterpriseFixedAssets enterpriseFixedAssets);
+
+}
diff --git a/src/main/java/com/ruoyi/account/service/impl/EnterpriseFixedAssetsServiceImpl.java b/src/main/java/com/ruoyi/account/service/impl/EnterpriseFixedAssetsServiceImpl.java
new file mode 100644
index 0000000..c117747
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/service/impl/EnterpriseFixedAssetsServiceImpl.java
@@ -0,0 +1,27 @@
+package com.ruoyi.account.service.impl;
+
+import com.ruoyi.account.pojo.EnterpriseFixedAssets;
+import com.ruoyi.account.service.EnterpriseFixedAssetsService;
+import com.ruoyi.account.mapper.EnterpriseFixedAssetsMapper;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.AllArgsConstructor;
+import lombok.RequiredArgsConstructor;
+import org.springframework.transaction.annotation.Transactional;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import java.util.List;
+
+@Service
+@RequiredArgsConstructor
+@Transactional(rollbackFor = Exception.class)
+public class EnterpriseFixedAssetsServiceImpl extends ServiceImpl<EnterpriseFixedAssetsMapper, EnterpriseFixedAssets> implements EnterpriseFixedAssetsService {
+
+ private final EnterpriseFixedAssetsMapper enterpriseFixedAssetsmapper;
+
+ @Override
+ public IPage<EnterpriseFixedAssets> listPage(Page<EnterpriseFixedAssets> page, EnterpriseFixedAssets enterpriseFixedAssets) {
+ return enterpriseFixedAssetsmapper.selectPage(page, null);
+ }
+}
diff --git a/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java b/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java
index 32cad29..826869d 100644
--- a/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java
+++ b/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java
@@ -1,8 +1,8 @@
package com.ruoyi.basic.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.basic.dto.SupplierManageDto;
-import com.ruoyi.basic.pojo.Customer;
import com.ruoyi.basic.pojo.SupplierManage;
import com.ruoyi.basic.service.ISupplierService;
import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -118,6 +118,7 @@
*/
@GetMapping("/getOptions")
public AjaxResult getOptions() {
- return AjaxResult.success(supplierService.list());
+ return AjaxResult.success(supplierService.list(new LambdaQueryWrapper<SupplierManage>()
+ .eq(SupplierManage::getIsWhite, 0)));
}
}
diff --git a/src/main/java/com/ruoyi/basic/pojo/Customer.java b/src/main/java/com/ruoyi/basic/pojo/Customer.java
index 511e691..538e348 100644
--- a/src/main/java/com/ruoyi/basic/pojo/Customer.java
+++ b/src/main/java/com/ruoyi/basic/pojo/Customer.java
@@ -1,7 +1,10 @@
package com.ruoyi.basic.pojo;
import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
import java.util.Date;
+import java.util.List;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -99,4 +102,31 @@
@ApiModelProperty(value = "寮�鎴疯鍙�")
@Excel(name = "寮�鎴疯鍙�")
private String bankCode;
+
+ @ApiModelProperty(value = "瀹㈡埛鍋忓ソ")
+ private String preferences;
+
+ @ApiModelProperty(value = "鏄惁浠锋牸鏁忔劅")
+ @Excel(name = "鏄惁浠锋牸鏁忔劅")
+ private Boolean isPriceSensitive;
+
+ @ApiModelProperty(value = "鏄惁浼氬憳")
+ @Excel(name = "鏄惁浼氬憳")
+ private Boolean isVip;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "璐拱娆℃暟")
+ private Integer purchaseCount;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "骞冲潎閲戦")
+ private BigDecimal averageAmount;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鏈�杩戣喘涔版椂闂�")
+ private LocalDate latestPurchaseTime;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "甯歌喘浜у搧")
+ private List<String> topProducts;
}
diff --git a/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
index f24a2d2..8539492 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
@@ -17,17 +17,17 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.sales.mapper.SalesLedgerMapper;
+import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
import com.ruoyi.sales.pojo.SalesLedger;
+import com.ruoyi.sales.pojo.SalesLedgerProduct;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.web.multipart.MultipartFile;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.math.BigDecimal;
+import java.util.*;
import java.util.stream.Collectors;
@@ -42,6 +42,7 @@
@Slf4j
public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> implements ICustomerService {
private final SalesLedgerMapper salesLedgerMapper;
+ private final SalesLedgerProductMapper salesLedgerProductMapper;
private CustomerMapper customerMapper;
/**
@@ -93,6 +94,71 @@
String address = StringUtils.defaultString(c.getCompanyAddress(), "");
String phone = StringUtils.defaultString(c.getCompanyPhone(), "");
c.setAddressPhone(address + "(" + phone + ")"); // 浼樺寲瀛楃涓叉嫾鎺�
+ // 鏌ヨ璇ュ鎴峰叧鑱旂殑閿�鍞彴璐︿腑锛岃喘涔版鏁般�佸钩鍧囬噾棰濄�佹渶杩戣喘涔版椂闂�
+ List<SalesLedger> salesLedgers = salesLedgerMapper.selectList(new QueryWrapper<SalesLedger>().lambda().eq(SalesLedger::getCustomerId, c.getId()));
+ if (!CollectionUtils.isEmpty(salesLedgers)) {
+ // 璁＄畻璐拱娆℃暟
+ int purchaseCount = salesLedgers.size();
+ c.setPurchaseCount(purchaseCount);
+
+ // 璁＄畻骞冲潎閲戦
+ if (purchaseCount > 0) {
+ BigDecimal totalAmount = salesLedgers.stream()
+ .map(SalesLedger::getContractAmount)
+ .filter(Objects::nonNull)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+ BigDecimal averageAmount = totalAmount.divide(BigDecimal.valueOf(purchaseCount), 2, BigDecimal.ROUND_HALF_UP);
+ c.setAverageAmount(averageAmount);
+ } else {
+ c.setAverageAmount(BigDecimal.ZERO);
+ }
+
+ // 璁＄畻鏈�杩戣喘涔版椂闂�
+ SalesLedger latestLedger = salesLedgers.stream()
+ .max((l1, l2) -> l1.getExecutionDate().compareTo(l2.getExecutionDate()))
+ .orElse(null);
+ if (latestLedger != null) {
+ c.setLatestPurchaseTime(latestLedger.getExecutionDate());
+ }
+
+ // 璁＄畻甯歌喘浜у搧锛坱op 3锛�
+ List<SalesLedgerProduct> allProducts = new ArrayList<>();
+ for (SalesLedger ledger : salesLedgers) {
+ List<SalesLedgerProduct> products = salesLedgerProductMapper.selectList(
+ new QueryWrapper<SalesLedgerProduct>().lambda()
+ .eq(SalesLedgerProduct::getSalesLedgerId, ledger.getId())
+ );
+ if (!CollectionUtils.isEmpty(products)) {
+ allProducts.addAll(products);
+ }
+ }
+
+ if (!CollectionUtils.isEmpty(allProducts)) {
+ // 鎸変骇鍝佺被鍒拰瑙勬牸鍨嬪彿鍒嗙粍锛岀粺璁¤喘涔版鏁�
+ Map<String, Long> productCountMap = allProducts.stream()
+ .collect(Collectors.groupingBy(
+ p -> p.getProductCategory() + "-" + p.getSpecificationModel(),
+ Collectors.counting()
+ ));
+
+ // 鎺掑簭骞跺彇鍓�3
+ List<String> topProducts = productCountMap.entrySet().stream()
+ .sorted(Map.Entry.<String, Long>comparingByValue().reversed())
+ .limit(3)
+ .map(Map.Entry::getKey)
+ .collect(Collectors.toList());
+
+ c.setTopProducts(topProducts);
+ } else {
+ c.setTopProducts(new ArrayList<>());
+ }
+ } else {
+ // 娌℃湁閿�鍞褰曟椂璁剧疆榛樿鍊�
+ c.setPurchaseCount(0);
+ c.setAverageAmount(BigDecimal.ZERO);
+ c.setLatestPurchaseTime(null);
+ c.setTopProducts(new ArrayList<>());
+ }
})
.collect(Collectors.toList());
@@ -212,4 +278,4 @@
}
return sb.toString();
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
index 4c09f45..bc61060 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
@@ -29,7 +29,6 @@
import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.List;
import java.util.Objects;
import java.util.concurrent.atomic.AtomicInteger;
@@ -284,7 +283,7 @@
public AjaxResult getProductInventory(SalesLedgerProduct salesLedgerProduct){
List<SalesLedgerProduct> list = salesLedgerProductService.selectSalesLedgerProductList(salesLedgerProduct);
if(CollectionUtils.isEmpty(list)){
- return AjaxResult.error("璇ヤ骇鍝佷笉瀛樺湪");
+ throw new RuntimeException("璇ヤ骇鍝佷笉瀛樺湪");
}
List<ProcurementPageDto> procurementPageDtoList = new ArrayList<>();
list.forEach(item -> {
@@ -295,7 +294,7 @@
procurementPageDtoList.addAll(procurementPageDtoIPage.getRecords());
});
if(!CollectionUtils.isEmpty(procurementPageDtoList)){
- return AjaxResult.error("璇ヤ骇鍝佸簱瀛樹笉瀛樺湪");
+ throw new RuntimeException("璇ヤ骇鍝佸簱瀛樹笉瀛樺湪");
}
AtomicInteger num = new AtomicInteger();
list.forEach(item -> {
diff --git a/src/main/resources/mapper/account/EnterpriseFixedAssetsMapper.xml b/src/main/resources/mapper/account/EnterpriseFixedAssetsMapper.xml
new file mode 100644
index 0000000..9c68425
--- /dev/null
+++ b/src/main/resources/mapper/account/EnterpriseFixedAssetsMapper.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.account.mapper.EnterpriseFixedAssetsMapper">
+ <resultMap id="BaseResultMap" type="com.ruoyi.account.pojo.EnterpriseFixedAssets">
+ <id column="id" property="id" />
+ <result column="name" property="name" />
+ <result column="model" property="model" />
+ <result column="price" property="price" />
+ <result column="address" property="address" />
+ <result column="create_time" property="createTime" />
+ <result column="update_time" property="updateTime" />
+ <result column="tenant_id" property="tenantId" />
+
+ </resultMap>
+</mapper>
--
Gitblit v1.9.3