From abb51ab390fa6cf9bf3747f57576c1507f89ae00 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期五, 05 九月 2025 17:59:19 +0800
Subject: [PATCH] 修改接口
---
quartz/src/main/java/com/ruoyi/quartz/task/SettlementTask.java | 13 ++++++++++++-
service/src/main/java/com/ruoyi/cwgl/service/impl/KeyCollectionInfoServiceImpl.java | 2 +-
service/src/main/java/com/ruoyi/cwgl/domain/dto/ReturnReportDto.java | 3 ++-
api/src/main/java/com/ruoyi/api/third/controller/LockerApiController.java | 15 +++++++++++++++
service/src/main/java/com/ruoyi/cwgl/service/impl/PendingSettlementBusinessServiceImpl.java | 12 ++++++------
service/src/main/resources/mapper/cwgl/PendingSettlementBusinessMapper.xml | 2 +-
service/src/main/java/com/ruoyi/cwgl/service/IPendingSettlementBusinessService.java | 2 ++
7 files changed, 39 insertions(+), 10 deletions(-)
diff --git a/api/src/main/java/com/ruoyi/api/third/controller/LockerApiController.java b/api/src/main/java/com/ruoyi/api/third/controller/LockerApiController.java
index 1e67639..986cdb2 100644
--- a/api/src/main/java/com/ruoyi/api/third/controller/LockerApiController.java
+++ b/api/src/main/java/com/ruoyi/api/third/controller/LockerApiController.java
@@ -2,6 +2,7 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.RandomUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.cwgl.domain.KeyCollectionInfo;
import com.ruoyi.cwgl.domain.RequestLog;
@@ -15,6 +16,8 @@
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+import java.util.Random;
+import java.util.concurrent.ThreadLocalRandom;
/**
@@ -44,6 +47,17 @@
public AjaxResult takeReview(@Valid @RequestBody TakeReviewDto takeReviewDto){
logger.info("璇锋眰涓婃姤鍙傛暟{}",takeReviewDto);
+ if ("test".equals(takeReviewDto.getDriverCode())){
+ Random random = new Random();
+
+ // 鐢熸垚 1-30 鐨勯殢鏈烘暣鏁�
+ int randomNumber = random.nextInt(30) + 1;
+ AjaxResult success = new AjaxResult(0, "鎴愬姛",1);
+ success.put("boxNumber",randomNumber);
+ logger.info("鎴愬姛杩斿洖{}",success);
+ return success;
+ }
+
KeyCollectionInfo keyCollectionInfo = keyCollectionInfoService.selectCwData(takeReviewDto);
//娣诲姞璇锋眰鏃ュ織
RequestLog requestLog = new RequestLog();
@@ -69,6 +83,7 @@
@PostMapping("/returnReport")
public AjaxResult returnReport(@Valid @RequestBody ReturnReportDto returnReportDto){
+ logger.info("褰掕繕鍙傛暟{}",returnReportDto);
//娣诲姞璇锋眰鏃ュ織
RequestLog requestLog = new RequestLog();
diff --git a/quartz/src/main/java/com/ruoyi/quartz/task/SettlementTask.java b/quartz/src/main/java/com/ruoyi/quartz/task/SettlementTask.java
index a32967c..96d988e 100644
--- a/quartz/src/main/java/com/ruoyi/quartz/task/SettlementTask.java
+++ b/quartz/src/main/java/com/ruoyi/quartz/task/SettlementTask.java
@@ -3,12 +3,15 @@
import cn.hutool.core.collection.CollectionUtil;
import com.ruoyi.common.utils.RandomUtils;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.reflect.ReflectUtils;
import com.ruoyi.cwgl.domain.EstimatedReceivable;
import com.ruoyi.cwgl.domain.PendingSettlementBusiness;
import com.ruoyi.cwgl.domain.ReceivableLineTruckPriceRule;
import com.ruoyi.cwgl.service.IEstimatedReceivableService;
import com.ruoyi.cwgl.service.IPendingSettlementBusinessService;
import com.ruoyi.cwgl.service.impl.ExactPricingRuleMatcher;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -26,7 +29,7 @@
@Component("settlementTask")
public class SettlementTask
{
-
+ private static Logger logger = LoggerFactory.getLogger(SettlementTask.class);
@Autowired
private IPendingSettlementBusinessService pendingSettlementBusinessService;
@Autowired
@@ -96,6 +99,14 @@
estimatedReceivableService.insertEstimatedReceivableBatch(estimatedReceivables);
}
pendingSettlementBusinessService.insertPendingSettlement(pendingSettlementBusinesses);
+
+ //鏇存柊鍚屾鐘舵�佺敤
+ Integer[] ids = pendingSettlementBusinesses.stream().map(PendingSettlementBusiness::getServiceId).toArray(Integer[]::new);
+ int i = pendingSettlementBusinessService.updeteCwData(ids);
+ if (i>0){
+ logger.info("鍚屾鐘舵�佹洿鏂版垚鍔�");
+ }
+
}
diff --git a/service/src/main/java/com/ruoyi/cwgl/domain/dto/ReturnReportDto.java b/service/src/main/java/com/ruoyi/cwgl/domain/dto/ReturnReportDto.java
index bf6493e..e8423ab 100644
--- a/service/src/main/java/com/ruoyi/cwgl/domain/dto/ReturnReportDto.java
+++ b/service/src/main/java/com/ruoyi/cwgl/domain/dto/ReturnReportDto.java
@@ -4,6 +4,7 @@
import lombok.Data;
import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import java.util.Date;
/**
@@ -20,7 +21,7 @@
@NotBlank(message = "鍙告満鍞竴缂栧彿涓嶈兘涓虹┖")
private String driverCode ;
/**鍙告満鍞竴缂栧彿*/
- @NotBlank(message = "瀛樺叆鏃堕棿涓嶈兘涓虹┖")
+ @NotNull(message = "瀛樺叆鏃堕棿涓嶈兘涓虹┖")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date saveTime ;
diff --git a/service/src/main/java/com/ruoyi/cwgl/service/IPendingSettlementBusinessService.java b/service/src/main/java/com/ruoyi/cwgl/service/IPendingSettlementBusinessService.java
index 5d54f33..4c6ba35 100644
--- a/service/src/main/java/com/ruoyi/cwgl/service/IPendingSettlementBusinessService.java
+++ b/service/src/main/java/com/ruoyi/cwgl/service/IPendingSettlementBusinessService.java
@@ -141,4 +141,6 @@
int createBillList(PendingSettlementBusiness pendingSettlementBusiness);
List<String> selectCustomName();
+
+ int updeteCwData(Integer[] ids);
}
diff --git a/service/src/main/java/com/ruoyi/cwgl/service/impl/KeyCollectionInfoServiceImpl.java b/service/src/main/java/com/ruoyi/cwgl/service/impl/KeyCollectionInfoServiceImpl.java
index 31c195c..ea58f52 100644
--- a/service/src/main/java/com/ruoyi/cwgl/service/impl/KeyCollectionInfoServiceImpl.java
+++ b/service/src/main/java/com/ruoyi/cwgl/service/impl/KeyCollectionInfoServiceImpl.java
@@ -215,7 +215,7 @@
logger.info("瑕佹眰鍑哄彂鏃堕棿"+ dateToStr+"锛岄鍙栭挜鍖欒秴鏃�"+keyTimeout+"涓皬鏃�");
return AjaxResult.error("瑕佹眰鍑哄彂鏃堕棿"+ dateToStr+"锛岄鍙栭挜鍖欒秴鏃�"+keyTimeout+"涓皬鏃�");
}
- AjaxResult success = new AjaxResult(0, "鎴愬姛",2);
+ AjaxResult success = new AjaxResult(0, "鎴愬姛",1);
success.put("boxNum",keyCollectionInfo.getBoxNum());
logger.info("鎴愬姛杩斿洖{}",success);
return success;
diff --git a/service/src/main/java/com/ruoyi/cwgl/service/impl/PendingSettlementBusinessServiceImpl.java b/service/src/main/java/com/ruoyi/cwgl/service/impl/PendingSettlementBusinessServiceImpl.java
index 90b16c2..66a884e 100644
--- a/service/src/main/java/com/ruoyi/cwgl/service/impl/PendingSettlementBusinessServiceImpl.java
+++ b/service/src/main/java/com/ruoyi/cwgl/service/impl/PendingSettlementBusinessServiceImpl.java
@@ -212,12 +212,6 @@
@Override
public List<PendingSettlementBusiness> selectPendingSettlement2Cw() {
List<PendingSettlementBusiness> pendingSettlementBusinesses = pendingSettlementBusinessMapper.selectPendingSettlement2Cw();
- //鏇存柊鍚屾鐘舵�佺敤
- /* Integer[] ids = pendingSettlementBusinesses.stream().map(PendingSettlementBusiness::getServiceId).toArray(Integer[]::new);
- int i = pendingSettlementBusinessMapper.updeteCwData(ids);
- if (i>0){
- logger.info("鍚屾鐘舵�佹洿鏂版垚鍔�");
- }*/
return pendingSettlementBusinesses;
}
@@ -375,4 +369,10 @@
public List<String> selectCustomName() {
return pendingSettlementBusinessMapper.selectCustomName();
}
+
+ @Override
+ @DataSource(DataSourceType.CWSJ)
+ public int updeteCwData(Integer[] ids) {
+ return pendingSettlementBusinessMapper.updeteCwData(ids);
+ }
}
diff --git a/service/src/main/resources/mapper/cwgl/PendingSettlementBusinessMapper.xml b/service/src/main/resources/mapper/cwgl/PendingSettlementBusinessMapper.xml
index 5015b18..ad20c35 100644
--- a/service/src/main/resources/mapper/cwgl/PendingSettlementBusinessMapper.xml
+++ b/service/src/main/resources/mapper/cwgl/PendingSettlementBusinessMapper.xml
@@ -532,7 +532,7 @@
</foreach>
</update>
<update id="updeteCwData">
- update pending_settlement_business set IS_SYNC = 1
+ update tms_shipment set IS_SYNC = 1
where ID in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
--
Gitblit v1.8.0