From e6b548cf83ff9ed26332a94d491070d380b63a40 Mon Sep 17 00:00:00 2001
From: Gauthier LO <lo.gauthier.glo@gmail.com>
Date: Mon, 26 Aug 2024 14:30:50 +0200
Subject: [PATCH] feat : update SKU isGift via MabangSkuSyncJob,add groupId to
 PurchaseOrderPage

---
 .../jeecg/modules/business/domain/job/MabangSkuSyncJob.java | 6 ++++--
 .../jeecg/modules/business/mapper/PurchaseOrderMapper.java  | 3 +++
 .../modules/business/mapper/xml/PurchaseOrderMapper.xml     | 5 +++++
 .../modules/business/service/IPurchaseOrderService.java     | 2 ++
 .../business/service/impl/ProviderMabangServiceImpl.java    | 1 +
 .../business/service/impl/SkuListMabangServiceImpl.java     | 5 +++++
 .../service/impl/purchase/PurchaseOrderServiceImpl.java     | 6 ++++++
 .../org/jeecg/modules/business/vo/PurchaseOrderPage.java    | 4 ++++
 8 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/job/MabangSkuSyncJob.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/job/MabangSkuSyncJob.java
index 3b00544b0..d9e3f6506 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/job/MabangSkuSyncJob.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/job/MabangSkuSyncJob.java
@@ -29,8 +29,10 @@ import java.time.temporal.ChronoUnit;
 import java.util.*;
 
 /**
- * A Job that retrieves all Sku from Mabang
- * if the sku is of status 3 (normal) and not in DB, then we insert it in DB
+ * Updates product name (en, zh), sku status, weight and isGift
+ * By default checks sku updates within the last 5 days
+ * If "skus" param is not empty then, dates are ignored and it will only update the given skus (erpCode)
+ * Execution periodicity : everyday at 2:10pm : 10 14 * * *
  */
 @Slf4j
 @Component
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/PurchaseOrderMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/PurchaseOrderMapper.java
index 079fabe8b..d3dc5ae71 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/PurchaseOrderMapper.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/PurchaseOrderMapper.java
@@ -122,6 +122,9 @@ public interface PurchaseOrderMapper extends BaseMapper<PurchaseOrder> {
     long countPurchaseOrders();
 
     void updatePurchaseOrderStatus(@Param("invoiceNumber") String invoiceNumber, @Param("isOrdered") boolean isOrdered);
+
+    void updatePurchaseOrderGroupIds(@Param("invoiceNumber") String invoiceCode, @Param("groupIds") String groupIds);
+
     InvoiceKpi countPurchaseInvoices(@Param("start") LocalDateTime start, @Param("end") LocalDateTime end, @Param("showAllData") boolean showAllData, @Param("username") String username);
 
     void setPaid(@Param("invoiceNumbers") List<String> invoiceNumbers);
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PurchaseOrderMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PurchaseOrderMapper.xml
index aad5ddbcd..b09095fcd 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PurchaseOrderMapper.xml
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PurchaseOrderMapper.xml
@@ -142,6 +142,11 @@
         SET ordered = #{isOrdered}
         WHERE invoice_number = #{invoiceNumber}
     </update>
+    <update id="updatePurchaseOrderGroupIds">
+        UPDATE purchase_order
+        SET group_id = #{groupIds}
+        WHERE invoice_number = #{invoiceNumber};
+    </update>
     <select id="countPurchaseInvoices" resultType="org.jeecg.modules.business.vo.InvoiceKpi">
         WITH purchaseEur AS (
             SELECT IFNULL(count(*),0) as qty, IFNULL(sum(final_amount),0) as total
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/IPurchaseOrderService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/IPurchaseOrderService.java
index 148b67990..d6f5353c0 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/IPurchaseOrderService.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/IPurchaseOrderService.java
@@ -131,10 +131,12 @@ public interface IPurchaseOrderService extends IService<PurchaseOrder> {
     void setPageForList(Page<PurchaseOrderPage> page, String clientId);
 
     void updatePurchaseOrderStatus(String invoiceNumber, boolean isOrdered);
+    void updatePurchaseOrderGroupIds(String invoiceCode, List<String> groupIds);
 
     void setPaid(List<String> invoiceNumbers);
 
     PurchaseOrder getPurchaseByInvoiceNumberAndClientId(String invoiceNumber, String clientId);
 
     List<PurchaseOrder> getPurchasesByInvoices(List<Invoice> invoices);
+
 }
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/ProviderMabangServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/ProviderMabangServiceImpl.java
index 036f2a65f..3f98af35b 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/ProviderMabangServiceImpl.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/ProviderMabangServiceImpl.java
@@ -191,6 +191,7 @@ public class ProviderMabangServiceImpl extends ServiceImpl<ProviderMabangMapper,
         // change status of purchase order to 'ordered' = true
         if(nbSuccesses == stockProviderMap.size()) {
             purchaseOrderService.updatePurchaseOrderStatus(metaData.getInvoiceCode(), true);
+            purchaseOrderService.updatePurchaseOrderGroupIds(metaData.getInvoiceCode(), groupIds);
             return true;
         }
         return false;
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SkuListMabangServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SkuListMabangServiceImpl.java
index 0488806d5..5b1621cf6 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SkuListMabangServiceImpl.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/SkuListMabangServiceImpl.java
@@ -236,6 +236,11 @@ public class SkuListMabangServiceImpl extends ServiceImpl<SkuListMabangMapper, S
                             }
                         }
                     }
+                    // updating isGift
+                    if(!Objects.equals(s.getIsGift(), skuData.getIsGift())) {
+                        s.setIsGift(skuData.getIsGift());
+                        isUpdated = true;
+                    }
                     if(isUpdated)
                         skusToUpdate.add(s);
 
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/purchase/PurchaseOrderServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/purchase/PurchaseOrderServiceImpl.java
index 0d3d21eb8..b450bcbc9 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/purchase/PurchaseOrderServiceImpl.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/purchase/PurchaseOrderServiceImpl.java
@@ -618,6 +618,12 @@ public class PurchaseOrderServiceImpl extends ServiceImpl<PurchaseOrderMapper, P
         purchaseOrderMapper.updatePurchaseOrderStatus(invoiceNumber, isOrdered);
     }
 
+    @Override
+    public void updatePurchaseOrderGroupIds(String invoiceCode, List<String> groupIds) {
+        String groupIdsStr = String.join(",", groupIds);
+        purchaseOrderMapper.updatePurchaseOrderGroupIds(invoiceCode, groupIdsStr);
+    }
+
     @Override
     public void setPaid(List<String> invoiceNumber) {
         purchaseOrderMapper.setPaid(invoiceNumber);
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/vo/PurchaseOrderPage.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/vo/PurchaseOrderPage.java
index 0b31ae556..0600c9410 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/vo/PurchaseOrderPage.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/vo/PurchaseOrderPage.java
@@ -76,6 +76,10 @@ public class PurchaseOrderPage {
 	@Excel(name = "订单是否下了单", width = 15)
 	@ApiModelProperty(value = "订单是否下了单")
 	private boolean ordered;
+	/**采购批次号*/
+	@Excel(name = "采购批次号", width = 15)
+	@ApiModelProperty(value = "采购批次号")
+	private String groupId;
 
 	/**
 	 * Payment document