added Muthalvar Padaippagam

src/main/java/com/gcc/erppostdata/common/MySchduler.java

@@ -1,8 +1,10 @@
 package com.gcc.erppostdata.common;
 
 import com.gcc.erppostdata.communityhall.CmhQueryBank;
+import com.gcc.erppostdata.mudhalvarpadaipagam.CoworkQueryBank;
 import com.gcc.erppostdata.petregistration.PetQueryBank;
 import com.gcc.erppostdata.repo.CommunityHallLogRepo;
+import com.gcc.erppostdata.repo.CoworkLogRepo;
 import com.gcc.erppostdata.repo.PetLogRepo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
@@ -30,20 +32,32 @@ public class MySchduler {
     @Autowired
     PetLogRepo petLogRepo;
 
+    @Autowired
+    CoworkLogRepo coworkLogRepo;
+
+    @Autowired
+    CoworkQueryBank coworkQueryBank;
+
     @Scheduled(fixedRate = 3600000) // Runs every 1 hour
     public void hourlyScheduled() {
-        try {
-            oneHourCmhSch();
-        } catch (Exception e) {
-            System.err.println("Error in oneHourCmhSch: " + e.getMessage());
-            e.printStackTrace();
-        }
-
-        try {
-            oneHourPetSch();
-        } catch (Exception e) {
-            System.err.println("Error in oneHourPetSch: " + e.getMessage());
-            e.printStackTrace();
+//        try {
+//            oneHourCmhSch();
+//        } catch (Exception e) {
+//            System.err.println("Error in oneHourCmhSch: " + e.getMessage());
+//            e.printStackTrace();
+//        }
+//
+//        try {
+//            oneHourPetSch();
+//        } catch (Exception e) {
+//            System.err.println("Error in oneHourPetSch: " + e.getMessage());
+//            e.printStackTrace();
+//        }
+
+        try{
+            oneHourCoworkSch();
+        }catch (Exception e){
+            System.err.println("Error in oneHourCowork: " + e.getMessage());
         }
     }
 
@@ -107,4 +121,23 @@ public class MySchduler {
 
     }
 
+
+    @Transactional
+    public void oneHourCoworkSch() {
+        System.out.println("Cowork Hourly Post data: " + new Date());
+        coworkQueryBank.PushAllData(); // or .hourlyPushData(...) if applicable
+    }
+
+    @Transactional
+    public void threeHourCoworkSch() {
+        System.out.println("Cowork Three Hour Post data: " + new Date());
+        List<Map<String, Object>> dataByStatus = coworkLogRepo.getDataByStatus("0");
+        for (Map<String, Object> data : dataByStatus) {
+            coworkQueryBank.resendPushData(
+                    data.get("unique_receipt_id").toString(),
+                    data.get("id").toString()
+            );
+        }
+    }
+
 }

src/main/java/com/gcc/erppostdata/communityhall/CHPostData.java

@@ -92,7 +92,8 @@ public class CHPostData {
             data.put("TRANSACTIONDATE", row[3]); // paymentdate
 
             // Corrected numeric fields
-            data.put("TOTALTRANSACTIONAMOUNT", Double.parseDouble(String.valueOf(row[2]))); // amount
+
+            data.put("TOTALTRANSACTIONAMOUNT", row[2]!= null ? Double.parseDouble(String.valueOf(row[2])):"0.0"); // amount
 
             data.put("HALLAMOUNT", Double.parseDouble(String.valueOf(row[5]))); // hall_amount
             data.put("DEPOSITAMOUNT", Double.parseDouble(String.valueOf(row[6]))); // deposit_amount
@@ -134,9 +135,9 @@ public class CHPostData {
 
             try {
                 boolean firstParam = true;
-                SimpleDateFormat inputFormat = new SimpleDateFormat("dd-MM-yyyy HH:mm:ss"); //  Correct format
-                SimpleDateFormat outputFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");  // Expected format
-                outputFormat.setTimeZone(TimeZone.getTimeZone("Asia/Kolkata")); // Adjust timezone if needed
+//                SimpleDateFormat inputFormat = new SimpleDateFormat("dd-MM-yyyy HH:mm:ss"); //  Correct format
+//                SimpleDateFormat outputFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");  // Expected format
+//                outputFormat.setTimeZone(TimeZone.getTimeZone("Asia/Kolkata")); // Adjust timezone if needed
 
                 for (Map.Entry<String, Object> entry : data.entrySet()) {
                     if (!firstParam) {
@@ -153,15 +154,15 @@ public class CHPostData {
                     } else {
                         value = entry.getValue().toString();
 
-                        // ✅ Fix Date Formatting
-                        if (entry.getKey().equals("TRANSACTIONDATE")) {
-                            try {
-                                Date date = inputFormat.parse(value);
-                                value = outputFormat.format(date);
-                            } catch (Exception e) {
-                                System.out.println(" Error parsing TRANSACTIONDATE: " + value);
-                            }
-                        }
+//                        // ✅ Fix Date Formatting
+//                        if (entry.getKey().equals("TRANSACTIONDATE")) {
+//                            try {
+//                                Date date = inputFormat.parse(value);
+//                                value = outputFormat.format(date);
+//                            } catch (Exception e) {
+//                                System.out.println(" Error parsing TRANSACTIONDATE: " + value);
+//                            }
+//                        }
                     }
 
                     encodedUrl.append(key).append("=").append(URLEncoder.encode(value, "UTF-8"));
@@ -232,6 +233,7 @@ public class CHPostData {
         com.setBookingId(map.get("bookingId").toString());
         com.setTransactionId(map.get("TRANSACTIONNO").toString());
         String conFailure = "Connection Failure";
+
         if(conFailure.equals(msgStatus) ) {
             com.setStatus(2);;
         }else if(status.equals("true")){
@@ -240,9 +242,8 @@ public class CHPostData {
             com.setStatus(1);
         } else if ("Failure".equals(msgStatus) && status.equals("false")) {
             com.setStatus(2);
-        } else {
-            com.setStatus(0);
         }
+
         com.setResponse(response.toString());
         cmhRepo.insert(com.getTransactionId(),com.getBookingId(),com.getStatus()+"",com.getResponse());
     }
@@ -277,8 +278,8 @@ public class CHPostData {
             com.setStatus(1);
         } else if ("Failure".equals(msgStatus) && status.equals("false")) {
             com.setStatus(2);
-        } else {
-            com.setStatus(0);
+        } else if(status.equals("true")) {
+            com.setStatus(1);
         }
         com.setResponse(response.toString());
         cmhRepo.updateLog(com.getStatus()+"",com.getResponse(),id);

src/main/java/com/gcc/erppostdata/communityhall/CmhQueryBank.java

@@ -29,7 +29,7 @@ public class CmhQueryBank {
 //                "AND bk.booking_status IN ('APPROVED', 'CANCELED', 'COMPLETED', 'GCC_BLOCKED') " +
 //                "AND STR_TO_DATE(tr.date, '%d-%m-%Y %H:%i:%s') >= NOW() - INTERVAL 2 HOUR"
                 " AND STR_TO_DATE(tr.date, '%d-%m-%Y %H:%i:%s') <= NOW() - INTERVAL 1 HOUR" +
-                " AND bk.booking_id >'"+bookingId+"' LIMIT 1000"
+                " AND bk.booking_id >'"+bookingId+"' order by bk.booking_id LIMIT 1000"
                 ;
         System.out.println(hourlysql);
         chPostData.fetchChData(hourlysql,null,null);
@@ -54,7 +54,7 @@ public class CmhQueryBank {
                 "INNER JOIN booking_details bk ON bk.booking_id = tr.booking_id " +
                 "WHERE tr.status_code = '0300' " +
 //                "AND bk.booking_status IN ('APPROVED', 'CANCELED', 'COMPLETED', 'GCC_BLOCKED') " +
-                "AND tr.date < NOW() - INTERVAL 1 HOUR;";
+                "AND tr.date < NOW() - INTERVAL 1 HOUR order by bk.booking_id;";
 
         chPostData.fetchChData(sql,null,null);
     }
@@ -81,7 +81,7 @@ public class CmhQueryBank {
 //                "AND bk.booking_status IN ('APPROVED', 'CANCELED', 'COMPLETED', 'GCC_BLOCKED') " +
 //                "AND STR_TO_DATE(tr.date, '%d-%m-%Y %H:%i:%s') <= NOW() - INTERVAL 2 HOUR"
 //                " AND STR_TO_DATE(tr.date, '%d-%m-%Y %H:%i:%s') >= NOW() - INTERVAL 1 HOUR"
-                " AND tr.status_code = '0300' "
+                " AND tr.status_code = '0300' order by bk.booking_id"
                 ;
         chPostData.fetchChData(sql,transactionId,id);
     }

src/main/java/com/gcc/erppostdata/config/DatabaseConfig.java

@@ -27,6 +27,8 @@ public class DatabaseConfig {
     String chDb="communityhall_live";//communityhall_live
     String petDb="gcc_pets";
 
+    String mulPDb="coworkspace";
+
     String userName="root";
     String password="root";
 
@@ -134,9 +136,9 @@ public class DatabaseConfig {
     public DataSource mysqlmudhalvarpadaipagamDataSource() {
         DriverManagerDataSource dataSource = new DriverManagerDataSource();
         dataSource.setDriverClassName("com.mysql.cj.jdbc.Driver");
-        dataSource.setUrl("jdbc:mysql://localhost:3306/mudhalavarpadaipagam");
-        dataSource.setUsername("root");
-        dataSource.setPassword("root");
+        dataSource.setUrl("jdbc:mysql://localhost:3306/"+this.mulPDb);
+        dataSource.setUsername(this.userName);
+        dataSource.setPassword(this.password);
         return dataSource;
     }
 

src/main/java/com/gcc/erppostdata/mudhalvarpadaipagam/CWPostData.java

@@ -0,0 +1,229 @@
+package com.gcc.erppostdata.mudhalvarpadaipagam;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.gcc.erppostdata.config.AppConfig;
+import com.gcc.erppostdata.repo.CoworkLogRepo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Component;
+
+import javax.sql.DataSource;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.util.*;
+
+@Component
+public class CWPostData {
+
+    @Autowired
+    private JdbcTemplate jdbcTemplate;
+
+    @Autowired
+    private AppConfig appConfig;
+
+    @Autowired
+    private CoworkLogRepo coworkLogRepo;
+
+    private List<Map<String, Object>> coworkDataList;
+
+//    @PersistenceContext(unitName = "coworkspace")
+//    private EntityManager entityManager;
+
+
+//    @Autowired
+//    @Qualifier("mysqlmudhalvarpadaipagamDataSource")
+//    private EntityManager entityManager;
+
+    @Autowired
+    public void setDataSource(@Qualifier("mysqlmudhalvarpadaipagamDataSource") DataSource dataSource) {
+        this.jdbcTemplate = new JdbcTemplate(dataSource);
+    }
+
+    public void fetchCoworkData(String sql, String id) {
+        System.out.println("SQL: " + sql);
+
+        coworkDataList = new ArrayList<>();
+
+        List<Map<String, Object>> results = jdbcTemplate.queryForList(sql);
+
+        for (Map<String, Object> row : results) {
+            Map<String, Object> data = new TreeMap<>();
+
+            String assessmentNo = LocalDate.now().getYear() + "/MUTHAPADAI/" + row.get("booking_id").toString();
+
+            // Static mandatory input
+            data.put("serviceId", "getOtherCollection");
+            data.put("COLLECTION_TYPE", "Muthalvar Padaippagam");
+            data.put("TOTALTRANSACTIONCODE", "450310000");
+
+            // Unique data
+            data.put("ASSESSMENTNO", assessmentNo);
+            data.put("UNIQUERECEIPTID", row.get("booking_id").toString());
+            data.put("TRANSACTIONNO", row.get("order_id").toString());
+            data.put("TRANSACTIONREFNO", row.get("payment_id").toString());
+            data.put("TRANSACTIONDATE", row.get("paymentdate").toString());
+            data.put("TOTALTRANSACTIONAMOUNT", Double.parseDouble(row.get("amount").toString()));
+
+            // Amount breakdown
+            data.put("MSTRCODEONE", "019");
+            data.put("SPLITAMOUNTONE", row.get("amount").toString());
+
+            // Party details
+            data.put("PARTYNAME", row.get("user_name").toString());
+            data.put("PARTYMOBILE", row.get("mobile").toString());
+            data.put("PARTYADDRESS", "NA");// For internal tracking
+
+            coworkDataList.add(data);
+        }
+
+        postDataToERP(coworkDataList, id);
+    }
+
+
+    public void postDataToERP(List<Map<String, Object>> coworkList, String id) {
+        for (Map<String, Object> data : coworkList) {
+            StringBuilder response = new StringBuilder();
+            System.out.println("Sending Data: " + data);
+            StringBuilder encodedUrl = new StringBuilder(appConfig.getErpUrl());
+
+            try {
+                boolean firstParam = true;
+//                SimpleDateFormat inputFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
+//
+//                SimpleDateFormat outputFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
+//
+//                outputFormat.setTimeZone(TimeZone.getTimeZone("Asia/Kolkata"));
+
+                for (Map.Entry<String, Object> entry : data.entrySet()) {
+                    if (!firstParam) {
+                        encodedUrl.append("&");
+                    }
+                    firstParam = false;
+
+                    String key = URLEncoder.encode(entry.getKey(), "UTF-8");
+                    String value = "";
+
+                    if (entry.getValue() == null) {
+                        value = "";
+                    } else {
+                        value = entry.getValue().toString();
+//                        if (entry.getKey().equals("TRANSACTIONDATE")) {
+//                            try {
+//                                Date date = inputFormat.parse(value);
+//                                value = outputFormat.format(date);
+//                            } catch (Exception e) {
+//                                System.out.println("Error parsing TRANSACTIONDATE: " + value);
+//                            }
+//                        }
+                    }
+
+                    encodedUrl.append(key).append("=").append(URLEncoder.encode(value, "UTF-8"));
+                }
+
+                String finalUrl = encodedUrl.toString();
+                System.out.println("Final Encoded URL: " + finalUrl);
+
+                HttpURLConnection connection = (HttpURLConnection) new URL(finalUrl).openConnection();
+                connection.setRequestMethod("GET");
+
+                int responseCode = connection.getResponseCode();
+                System.out.println("Response Code: " + responseCode);
+
+                if (responseCode == HttpURLConnection.HTTP_OK) {
+                    BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream()));
+                    String inputLine;
+                    while ((inputLine = in.readLine()) != null) {
+                        response.append(inputLine);
+                    }
+                    in.close();
+                } else {
+                    System.out.println("GET request failed.");
+                }
+
+                if (id != null) {
+                    updateTheLog(data, response, id);
+                } else {
+                    saveTheLog(data, response);
+                }
+
+            } catch (Exception e) {
+                try {
+                    if (id != null) {
+                        updateTheLog(data, response, id);
+                    } else {
+                        saveTheLog(data, response);
+                    }
+                } catch (Exception ex) {
+                    ex.printStackTrace();
+                }
+                e.printStackTrace();
+            }
+        }
+    }
+
+    public void saveTheLog(Map<String, Object> map, StringBuilder response) throws JsonProcessingException {
+        String status = "", msgStatus = "";
+        if (response != null) {
+            ObjectMapper objectMapper = new ObjectMapper();
+            Map<String, Object> res = objectMapper.readValue(response.toString(), Map.class);
+            msgStatus = String.valueOf(res.get("Message"));
+            if (res.get("ResultStatus") != null) {
+                status = String.valueOf(res.get("ResultStatus"));
+            }
+        }
+
+        System.out.println("ResultStatus: " + status + " msgStatus: " + msgStatus);
+
+        String statusCode = "0";
+        if ("Connection Failure".equals(msgStatus)) {
+            statusCode = "2";
+        } else if ("Already Updated this collection".equals(msgStatus) && "false".equals(status)) {
+            statusCode = "1";
+        } else if ("Failure".equals(msgStatus) && "false".equals(status)) {
+            statusCode = "2";
+        } else if ("true".equals(status)) {
+            statusCode = "1";
+        }
+
+        map.put("status", statusCode);
+        map.put("response", response.toString());
+        coworkLogRepo.insert(map);
+
+
+
+    }
+
+    public void updateTheLog(Map<String, Object> map, StringBuilder response, String id) throws JsonProcessingException {
+        String status = "", msgStatus = "";
+        if (response != null) {
+            ObjectMapper objectMapper = new ObjectMapper();
+            Map<String, Object> res = objectMapper.readValue(response.toString(), Map.class);
+            msgStatus = String.valueOf(res.get("Message"));
+            if (res.get("ResultStatus") != null) {
+                status = String.valueOf(res.get("ResultStatus"));
+            }
+        }
+
+        System.out.println("ResultStatus: " + status + " msgStatus: " + msgStatus);
+
+        String statusCode = "0";
+        if ("Connection Failure".equals(msgStatus)) {
+            statusCode = "2";
+        } else if ("Already Updated this collection".equals(msgStatus) && "false".equals(status)) {
+            statusCode = "1";
+        } else if ("Failure".equals(msgStatus) && "false".equals(status)) {
+            statusCode = "2";
+        } else if ("true".equals(status)) {
+            statusCode = "1";
+        }
+
+        coworkLogRepo.updateLog(statusCode, response.toString(), id);
+    }
+}

src/main/java/com/gcc/erppostdata/mudhalvarpadaipagam/CoworkQueryBank.java

@@ -0,0 +1,40 @@
+package com.gcc.erppostdata.mudhalvarpadaipagam;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class CoworkQueryBank {
+
+    @Autowired
+    private CWPostData cwPostData;
+
+
+    public void PushAllData() {
+        String sql = "SELECT b.user_name, b.mobile, p.amount, p.payment_status, " +
+                "   DATE_FORMAT(p.paymentdate,'%d/%m/%Y') as paymentdate, p.payment_id, " +
+                     "b.booking_id, b.booking_status,p.order_id  FROM booking b " +
+                     "JOIN payment p ON b.booking_id = p.booking_id " +
+                     "WHERE b.booking_status = 'success' order by b.booking_id";
+        cwPostData.fetchCoworkData(sql, null);
+    }
+
+    public void hourlyPushData(int bookingId) {
+        String sql = "SELECT b.user_name, b.mobile, p.amount, p.payment_status, " +
+                "DATE_FORMAT(p.paymentdate,'%d/%m/%Y') as paymentdate, p.payment_id, " +
+                     "b.booking_id, b.booking_status,p.order_id  FROM booking b " +
+                     "JOIN payment p ON b.booking_id = p.booking_id " +
+                     "WHERE b.booking_status = 'success' AND p.paymentdate <= NOW() - INTERVAL 1 HOUR " +
+                     "AND b.booking_id > '" + bookingId + "' order by b.booking_id LIMIT 1000";
+        cwPostData.fetchCoworkData(sql, null);
+    }
+
+    public void resendPushData(String bookingId, String id) {
+        String sql = "SELECT b.user_name, b.mobile, p.amount, p.payment_status, " +
+                "DATE_FORMAT(p.paymentdate,'%d/%m/%Y') as paymentdate, p.payment_id, " +
+                     "b.booking_id, b.booking_status,p.order_id  FROM booking b " +
+                     "JOIN payment p ON b.booking_id = p.booking_id " +
+                     "WHERE b.booking_status = 'success' AND b.booking_id = '" + bookingId + "' order by b.booking_id";
+        cwPostData.fetchCoworkData(sql, id);
+    }
+}

src/main/java/com/gcc/erppostdata/mudhalvarpadaipagam/MPPostData.java

@@ -1,21 +0,0 @@
-package com.gcc.erppostdata.mudhalvarpadaipagam;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.stereotype.Component;
-
-import javax.sql.DataSource;
-
-@Component
-public class MPPostData {
-
-    @Autowired
-    private JdbcTemplate jdbcTemplate;
-
-    @Autowired
-    public void setDataSource (@Qualifier("mysqlmudhalvarpadaipagamDataSource") DataSource dataSource){
-        this.jdbcTemplate = new JdbcTemplate(dataSource);
-    }
-
-}

src/main/java/com/gcc/erppostdata/petregistration/PRPostData.java

@@ -66,10 +66,12 @@ public class PRPostData {
 
             // Unique data
             data.put("ASSESSMENTNO", row[10].toString());
-            data.put("UNIQUERECEIPTID", row[0].toString()); // uniqueid
-            data.put("TRANSACTIONNO", row[9].toString()); // order_id
+            data.put("UNIQUERECEIPTID", row[0].toString());
+            // uniqueid
+
+            data.put("TRANSACTIONNO", row[9]!=null ?row[9].toString():""); // order_id
             data.put("TRANSACTIONREFNO", row[6].toString()); // payment_id
-            data.put("TRANSACTIONDATE", row[8].toString()); // paymentdate
+            data.put("TRANSACTIONDATE", row[8]!=null ?row[8].toString():""); // paymentdate
             data.put("TOTALTRANSACTIONAMOUNT", Double.parseDouble(row[5].toString())); // amount
 
             // Amount breakdown
@@ -96,9 +98,9 @@ public class PRPostData {
 //            String erpBaseUrl = "http://coc-staging.egovernments.org:9980/pgr/external/mobileservice?";
             StringBuilder encodedUrl = new StringBuilder(appConfig.getErpUrl());
             boolean firstParam = true;
-            SimpleDateFormat inputFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.S"); // Original format
-            SimpleDateFormat outputFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");  // Expected format
-            outputFormat.setTimeZone(TimeZone.getTimeZone("Asia/Kolkata")); // Adjust timezone if needed
+//            SimpleDateFormat inputFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.S"); // Original format
+//            SimpleDateFormat outputFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");  // Expected format
+//            outputFormat.setTimeZone(TimeZone.getTimeZone("Asia/Kolkata")); // Adjust timezone if needed
 
 
                 try {
@@ -117,15 +119,15 @@ public class PRPostData {
                         } else {
                             value = entry.getValue().toString();
 
-                            // ✅ Fix Date Formatting
-                            if (entry.getKey().equals("TRANSACTIONDATE")) {
-                                try {
-                                    Date date = inputFormat.parse(value);
-                                    value = outputFormat.format(date);
-                                } catch (Exception e) {
-                                    System.out.println(" Error parsing TRANSACTIONDATE: " + value);
-                                }
-                            }
+//                            // ✅ Fix Date Formatting
+//                            if (entry.getKey().equals("TRANSACTIONDATE")) {
+//                                try {
+//                                    Date date = inputFormat.parse(value);
+//                                    value = outputFormat.format(date);
+//                                } catch (Exception e) {
+//                                    System.out.println(" Error parsing TRANSACTIONDATE: " + value);
+//                                }
+//                            }
                         }
 
                         encodedUrl.append(key).append("=").append(URLEncoder.encode(value, "UTF-8"));
@@ -183,7 +185,6 @@ public class PRPostData {
     public void saveTheLog(Map<String, Object> map,StringBuilder response) throws JsonProcessingException {
         System.out.println(response);
         String status ="";
-        String statusCode = "";
         String msgStatus ="";
         if(response != null) {
             ObjectMapper objectMapper = new ObjectMapper();
@@ -198,16 +199,18 @@ public class PRPostData {
         System.out.println("ResultStatus: " + status);
         String msg = "Already Updated this collection";
         String conFailure = "Connection Failure";
-        if(conFailure.equals(msgStatus) ) {
-            statusCode="2";
-        }
-        else if(msg.equals(msgStatus) && status.equals("false")) {
-            statusCode="1";
-        } else if ("Failure".equals(msgStatus) && status.equals("false")) {
-            statusCode="2";
-        } else {
-            statusCode="0";
+
+        String statusCode = "0";
+        if ("Connection Failure".equals(msgStatus)) {
+            statusCode = "2";
+        } else if ("Already Updated this collection".equals(msgStatus) && "false".equals(status)) {
+            statusCode = "1";
+        } else if ("Failure".equals(msgStatus) && "false".equals(status)) {
+            statusCode = "2";
+        } else if ("true".equals(status)) {
+            statusCode = "1";
         }
+
         petLogRepo.insert(
                 map.get("UNIQUERECEIPTID")+"",
                 map.get("TRANSACTIONNO")+"",
@@ -221,7 +224,6 @@ public class PRPostData {
         System.out.println(response);
         String status ="";
         String msgStatus ="";
-        String statusCode = "";
         if(response != null) {
             ObjectMapper objectMapper = new ObjectMapper();
             Map<String, Object> res = objectMapper.readValue(response.toString(), Map.class);
@@ -234,16 +236,15 @@ public class PRPostData {
         System.out.println("ResultStatus: " + status +"msgStatus: " + msgStatus);
         String msg = "Already Updated this collection";
         String conFailure = "Connection Failure";
-        if(conFailure.equals(msgStatus) ) {
-            statusCode="2";
-        }else if(status.equals("true")){
-            statusCode ="1";
-        }else if(msg.equals(msgStatus) && status.equals("false")) {
-            statusCode ="1";
-        } else if ("Failure".equals(msgStatus) && status.equals("false")) {
-            statusCode ="2";
-        } else {
-            statusCode ="0";
+        String statusCode = "0";
+        if ("Connection Failure".equals(msgStatus)) {
+            statusCode = "2";
+        } else if ("Already Updated this collection".equals(msgStatus) && "false".equals(status)) {
+            statusCode = "1";
+        } else if ("Failure".equals(msgStatus) && "false".equals(status)) {
+            statusCode = "2";
+        } else if ("true".equals(status)) {
+            statusCode = "1";
         }
         petLogRepo.updateLog(statusCode,response.toString(),id);
 

src/main/java/com/gcc/erppostdata/petregistration/PetQueryBank.java

@@ -19,7 +19,7 @@ public class PetQueryBank {
                 "    pay.amount, " +
                 "    pay.payment_id, " +
                 "    pay.payment_status, " +
-                "    pay.paymentdate, " +
+                "    DATE_FORMAT(pay.paymentdate,'%d/%m/%Y' ), " +
                 "    pay.order_id, " +
                 "    l.license_no, " +
                 "    l.validity " +
@@ -27,7 +27,7 @@ public class PetQueryBank {
                 "INNER JOIN payment pay ON p.uniqueid = pay.uniqueid " +
                 "INNER JOIN pet_license l ON p.uniqueid = l.uniqueid " +
                 "INNER JOIN pet_owner o ON p.mobilenum = o.phone " +
-                "WHERE p.status = 2;";
+                "WHERE p.status = 2 order by p.uniqueid;";
 
         prPostData.fetpetData(sql,null);
     }
@@ -42,7 +42,7 @@ public class PetQueryBank {
                 "    pay.amount, " +
                 "    pay.payment_id, " +
                 "    pay.payment_status, " +
-                "    pay.paymentdate, " +
+                "    DATE_FORMAT(pay.paymentdate,'%d/%m/%Y' ), " +
                 "    pay.order_id, " +
                 "    l.license_no, " +
                 "    l.validity " +
@@ -52,7 +52,7 @@ public class PetQueryBank {
                 "INNER JOIN pet_owner o ON p.mobilenum = o.phone " +
                 "WHERE p.status = 2 " +
                 " AND pay.paymentdate <= NOW() - INTERVAL 1 HOUR" +
-                " AND p.uniqueid > '"+uniqueId+"' LIMIT 1000";
+                " AND p.uniqueid > '"+uniqueId+"' order by p.uniqueid LIMIT 1000";
 
         System.out.println(sql);
         prPostData.fetpetData(sql,null);
@@ -70,7 +70,7 @@ public class PetQueryBank {
                 "    pay.amount, " +
                 "    pay.payment_id, " +
                 "    pay.payment_status, " +
-                "    pay.paymentdate, " +
+                "    DATE_FORMAT(pay.paymentdate,'%d/%m/%Y' ), " +
                 "    pay.order_id, " +
                 "    l.license_no, " +
                 "    l.validity " +
@@ -78,7 +78,7 @@ public class PetQueryBank {
                 "INNER JOIN payment pay ON p.uniqueid = pay.uniqueid " +
                 "INNER JOIN pet_license l ON p.uniqueid = l.uniqueid " +
                 "INNER JOIN pet_owner o ON p.mobilenum = o.phone " +
-                "WHERE p.status = 2 AND  p.uniqueid = '" + uniqueId + "'";
+                "WHERE p.status = 2 AND  p.uniqueid = '" + uniqueId + "' order by p.uniqueid";
 
         prPostData.fetpetData(sql,id);
     }

src/main/java/com/gcc/erppostdata/repo/CoworkLogRepo.java

@@ -0,0 +1,77 @@
+package com.gcc.erppostdata.repo;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+
+import javax.sql.DataSource;
+import java.sql.Timestamp;
+import java.text.SimpleDateFormat;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class CoworkLogRepo {
+
+    @Autowired
+    private JdbcTemplate jdbcTemplate;
+
+    @Autowired
+    public void setDataSource (@Qualifier("mysqlerpPostData") DataSource dataSource){
+        this.jdbcTemplate = new JdbcTemplate(dataSource);
+    }
+
+    public int insert(Map<String, Object> data) {
+        String sql = "INSERT INTO cowork_post_data (" +
+                "mobile, assessment_no, collection_type, mstr_code_one, split_amount_one, " +
+                "total_transaction_amount, total_transaction_code, transaction_date, " +
+                "transaction_no, transaction_ref_no, unique_receipt_id, booking_id, user_name, status, response) " +
+                "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
+
+
+
+        return jdbcTemplate.update(sql,
+                data.get("PARTYMOBILE"),
+                data.get("ASSESSMENTNO"),
+                data.get("COLLECTION_TYPE"),
+                data.get("MSTRCODEONE"),
+                data.get("SPLITAMOUNTONE"),
+                data.get("TOTALTRANSACTIONAMOUNT"),
+                data.get("TOTALTRANSACTIONCODE"),
+                data.get("TRANSACTIONDATE"),  // ✅ Now will correctly insert DATETIME
+                data.get("TRANSACTIONNO"),
+                data.get("TRANSACTIONREFNO"),
+                data.get("UNIQUERECEIPTID"),
+                data.get("bookingId"),
+                data.get("PARTYNAME"),
+                data.get("status"),
+                data.get("response")
+        );
+    }
+
+
+
+
+
+
+
+    public List<Map<String,Object>> getDataByStatus(String status) {
+        String sql = "SELECT * FROM cowork_post_data WHERE status = ?";
+        return jdbcTemplate.queryForList(sql, status);
+    }
+
+
+    public int updateLog(String status, String response, String id) {
+        String sql = "UPDATE cowork_post_data SET status = ?, response = ? WHERE id = ?";
+        return jdbcTemplate.update(sql, status, response, id);
+    }
+
+    public int getLastBookingIdInserted() {
+        String sql = "SELECT uniqueId FROM cowork_post_data ORDER BY uniqueId DESC LIMIT 1";
+        return jdbcTemplate.queryForObject(sql, Integer.class);
+    }
+
+
+
+}

src/main/resources/application.properties

@@ -8,5 +8,5 @@ spring.application.name=erppostdata
 #spring.jpa.database-platform=org.hibernate.dialect.MySQL8Dialect
 #spring.jpa.hibernate.ddl-auto=update
 
-spring.profiles.active=prod
+spring.profiles.active=dev
 server.port=8067