Skip to content

Commit 19761bd

Browse files
touchmegit1touchmegit1
committed
Refactor CRM Ads fields
1 parent 966ef34 commit 19761bd

File tree

6 files changed

+2
-78
lines changed

6 files changed

+2
-78
lines changed

‎backend/src/main/java/com/smalltrend/dto/CRM/AdvertisementResponse.java‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,6 @@ public class AdvertisementResponse {
1818
private String ctaColor;
1919
private String bgColor;
2020
private Boolean isActive;
21-
// Contract fields
22-
private String contractNumber;
23-
private BigDecimal contractValue;
24-
private LocalDate contractStart;
25-
private LocalDate contractEnd;
26-
private String paymentTerms;
27-
private String contactPerson;
28-
private String contactEmail;
29-
private String contactPhone;
30-
private String notes;
3121
private LocalDateTime createdAt;
3222
private LocalDateTime updatedAt;
3323
}

‎backend/src/main/java/com/smalltrend/dto/CRM/SaveAdvertisementRequest.java‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,4 @@ public class SaveAdvertisementRequest {
1616
private String ctaColor;
1717
private String bgColor;
1818
private Boolean isActive;
19-
// Contract
20-
private String contractNumber;
21-
private BigDecimal contractValue;
22-
private LocalDate contractStart;
23-
private LocalDate contractEnd;
24-
private String paymentTerms;
25-
private String contactPerson;
26-
private String contactEmail;
27-
private String contactPhone;
28-
private String notes;
2919
}

‎backend/src/main/java/com/smalltrend/entity/Advertisement.java‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -56,35 +56,6 @@ public class Advertisement {
5656
@Builder.Default
5757
private Boolean isActive = true;
5858

59-
// ─── Hợp đồng ────────────────────────────────────────────────────────────
60-
61-
@Column(name = "contract_number", length = 100)
62-
private String contractNumber;
63-
64-
@Column(name = "contract_value", precision = 15, scale = 2)
65-
private BigDecimal contractValue;
66-
67-
@Column(name = "contract_start")
68-
private LocalDate contractStart;
69-
70-
@Column(name = "contract_end")
71-
private LocalDate contractEnd;
72-
73-
@Column(name = "payment_terms", length = 500)
74-
private String paymentTerms;
75-
76-
@Column(name = "contact_person", length = 200)
77-
private String contactPerson;
78-
79-
@Column(name = "contact_email", length = 200)
80-
private String contactEmail;
81-
82-
@Column(name = "contact_phone", length = 50)
83-
private String contactPhone;
84-
85-
@Column(name = "notes", columnDefinition = "TEXT")
86-
private String notes;
87-
8859
// ─── Timestamps ───────────────────────────────────────────────────────────
8960

9061
@CreationTimestamp

‎backend/src/main/java/com/smalltrend/service/CRM/AdvertisementService.java‎

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -67,19 +67,11 @@ public Map<String, Object> getStats() {
6767
List<Advertisement> all = adRepository.findAll();
6868
long total = all.size();
6969
long active = all.stream().filter(a -> Boolean.TRUE.equals(a.getIsActive())).count();
70-
long expired = all.stream().filter(a ->
71-
a.getContractEnd() != null && a.getContractEnd().isBefore(java.time.LocalDate.now())).count();
72-
java.math.BigDecimal totalValue = all.stream()
73-
.filter(a -> a.getContractValue() != null)
74-
.map(Advertisement::getContractValue)
75-
.reduce(java.math.BigDecimal.ZERO, java.math.BigDecimal::add);
7670

7771
return Map.of(
7872
"total", total,
7973
"active", active,
80-
"inactive", total - active,
81-
"expired", expired,
82-
"totalContractValue", totalValue
74+
"inactive", total - active
8375
);
8476
}
8577

@@ -96,15 +88,6 @@ private void applyRequest(Advertisement ad, SaveAdvertisementRequest req) {
9688
if (req.getCtaColor() != null) ad.setCtaColor(req.getCtaColor());
9789
if (req.getBgColor() != null) ad.setBgColor(req.getBgColor());
9890
if (req.getIsActive() != null) ad.setIsActive(req.getIsActive());
99-
if (req.getContractNumber() != null) ad.setContractNumber(req.getContractNumber());
100-
if (req.getContractValue() != null) ad.setContractValue(req.getContractValue());
101-
if (req.getContractStart() != null) ad.setContractStart(req.getContractStart());
102-
if (req.getContractEnd() != null) ad.setContractEnd(req.getContractEnd());
103-
if (req.getPaymentTerms() != null) ad.setPaymentTerms(req.getPaymentTerms());
104-
if (req.getContactPerson() != null) ad.setContactPerson(req.getContactPerson());
105-
if (req.getContactEmail() != null) ad.setContactEmail(req.getContactEmail());
106-
if (req.getContactPhone() != null) ad.setContactPhone(req.getContactPhone());
107-
if (req.getNotes() != null) ad.setNotes(req.getNotes());
10891
}
10992

11093
private AdvertisementResponse toResponse(Advertisement ad) {
@@ -120,15 +103,6 @@ private AdvertisementResponse toResponse(Advertisement ad) {
120103
r.setCtaColor(ad.getCtaColor());
121104
r.setBgColor(ad.getBgColor());
122105
r.setIsActive(ad.getIsActive());
123-
r.setContractNumber(ad.getContractNumber());
124-
r.setContractValue(ad.getContractValue());
125-
r.setContractStart(ad.getContractStart());
126-
r.setContractEnd(ad.getContractEnd());
127-
r.setPaymentTerms(ad.getPaymentTerms());
128-
r.setContactPerson(ad.getContactPerson());
129-
r.setContactEmail(ad.getContactEmail());
130-
r.setContactPhone(ad.getContactPhone());
131-
r.setNotes(ad.getNotes());
132106
r.setCreatedAt(ad.getCreatedAt());
133107
r.setUpdatedAt(ad.getUpdatedAt());
134108
return r;

‎deploy/clean_localseed.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const skipTables = [
1313
'cash_transactions', 'sale_order_histories', 'purchase_order_items', 'purchase_orders',
1414
'sale_order_items', 'sale_orders', 'stock_movements', 'price_expiry_alert_logs',
1515
'loyalty_gifts', 'product_combos', 'product_combo_items', 'purchase_history',
16-
'salary_configs', 'attendance', 'reports'
16+
'salary_configs', 'attendance', 'reports', 'advertisements'
1717
];
1818

1919
const COLUMN_MAPS = {

‎deploy/fix_seed.sql‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,6 @@ WHERE id > 0
301301
-- =============================================================================
302302
-- ADVERTISEMENTS & AD CONTRACTS
303303
-- =============================================================================
304-
INSERT INTO `advertisements` (id,bg_color,contact_email,contact_person,contact_phone,contract_end,contract_number,contract_start,contract_value,created_at,cta_color,cta_text,image_url,is_active,link_url,notes,payment_terms,slot,sponsor_name,subtitle,title,updated_at) VALUES (1,'#ffffff','marketing@smalltrend.vn','Nguyễn Văn Marketing','0901-234-567','2026-12-31','AD-2026-LEFT-001','2026-01-01',5000000.00,'2026-03-18 01:40:09.000000','#4f46e5','Mua ngay','https://images.unsplash.com/photo-1607082348824-0a96f2a4b9da?w=400&q=80',0,'','Hợp đồng quảng cáo nội bộ, ưu tiên slot trái toàn năm 2026','Thanh toán hàng quý, net 30 ngày','LEFT','SmallTrend Brand','Ưu đãi cuối tuần cho mọi sản phẩm','Mega Sale 50% OFF','2026-03-19 15:39:05.966119'),(2,'#f0fdf4','ads@expressdelivery.vn','Trần Thị Logistics','0912-345-678','2026-06-30','AD-2026-RIGHT-001','2026-01-01',12000000.00,'2026-03-18 01:40:09.000000','#059669','Đặt ngay','https://images.unsplash.com/photo-1556742049-0cfed4f6a45d?w=400&q=80',0,'','Đối tác giao hàng nhanh khu vực HCM & Hà Nội. Hợp đồng gia hạn mỗi 6 tháng.','Thanh toán hàng tháng vào ngày 15','RIGHT','Express Delivery Partner','Đơn từ 200.000đ — giao trong 2h','Giao hàng miễn phí','2026-03-19 14:04:19.055381'),(3,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2026-03-19 14:03:25.455314',NULL,NULL,'https://res.cloudinary.com/didvvefmu/image/upload/v1773928997/smalltrend/crm/ads/ymypqgpfxq3wvajk8ycq.jpg',0,NULL,NULL,NULL,'LEFT','KitKat',NULL,'KitKat- đn là mê','2026-03-19 14:03:25.455314'),(4,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2026-03-19 14:04:02.978638',NULL,NULL,'https://res.cloudinary.com/didvvefmu/image/upload/v1773929027/smalltrend/crm/ads/dhabu2yyxvfnse54t4ds.jpg',0,NULL,NULL,NULL,'RIGHT','HuyHandSome',NULL,'HotDog-Bữa sáng tốt lành cho mọi người','2026-03-19 14:04:02.978638');
305304

306305

307306
-- =============================================================================

0 commit comments

Comments
 (0)