From 533c9a4e44b06c90df7434a38e0da26e10cdac46 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期四, 12 三月 2026 17:24:40 +0800
Subject: [PATCH] 质押还款提醒文案调整
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/timer/JobWarnService.java | 16 +++++++
fzzy-igdss-core/src/main/java/com/fzzy/work/service/BizWorkService.java | 42 +++++++++++++++------
fzzy-igdss-core/src/main/java/com/fzzy/igds/data/PledgeReminders.java | 35 +++++++++++++++++
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/FoodPriceService.java | 4 +
4 files changed, 83 insertions(+), 14 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/PledgeReminders.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/PledgeReminders.java
new file mode 100644
index 0000000..d155c25
--- /dev/null
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/PledgeReminders.java
@@ -0,0 +1,35 @@
+package com.fzzy.igds.data;
+
+
+import lombok.Data;
+
+/**
+ * 璐ㄦ娂鍚堝悓鎻愰啋
+ *
+ * @author sgj
+ * @since 2026/03/12
+
+ */
+@Data
+public class PledgeReminders {
+
+ //浠撳簱ID
+ private String depotId;
+
+ //浠撳簱鍚嶇О
+ private String depotName;
+
+ //绮鍝佺
+ private String foodVariety;
+
+ //鍝佺鍚嶇О
+ private String foodVarietyName;
+
+ //绮鍗曚环
+ private Double foodPrice;
+
+ //瀹為檯搴撳瓨
+ private Double storageReal;
+
+
+}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/FoodPriceService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/FoodPriceService.java
index fdb60e4..a00bc2d 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/FoodPriceService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/FoodPriceService.java
@@ -55,8 +55,10 @@
* @return
*/
public FoodPrice getDataByBankAndFood(String bankId, String foodVariety) {
+ if(StringUtils.isBlank(bankId) || StringUtils.isBlank(foodVariety) ){
+ return null;
+ }
SysUser user = ContextUtil.getLoginUser();
-
QueryWrapper<FoodPrice> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("bank_id", bankId);
queryWrapper.eq("food_variety", foodVariety);
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/timer/JobWarnService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/timer/JobWarnService.java
index 849c201..3ee1044 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/timer/JobWarnService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/timer/JobWarnService.java
@@ -2,6 +2,7 @@
import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.data.BaseResp;
+import com.fzzy.igds.data.PledgeReminders;
import com.fzzy.igds.domain.Depot;
import com.fzzy.igds.domain.FoodPrice;
import com.fzzy.igds.domain.PledgeContract;
@@ -17,6 +18,7 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -38,6 +40,7 @@
@Resource
private BizWorkService workService;
+
/**
* 姣忓ぉ涓ょ偣鎵ц锛氳繕娆炬彁閱�
*/
@@ -58,11 +61,14 @@
Depot depot;
FoodPrice foodPrice;
WorkOrderConf conf;
+
double sumMoney = 0.0;
double per = 0.0;
double backMoney = 0.0;
for (PledgeContract pledgeContract : contractList) {
log.info("-----寮�濮嬪鐞嗚川鎶煎悎鍚岋細{}-----", pledgeContract.getName());
+ List<PledgeReminders> remindersList = new ArrayList<>();
+
//璁＄畻寰呰繕娆鹃噾棰�
backMoney = pledgeContract.getContractAmount() - pledgeContract.getRepaidAmount();
@@ -109,6 +115,14 @@
}
sumMoney += depot.getStorageReal() * foodPrice.getPrice();
+ PledgeReminders reminders = new PledgeReminders();
+ reminders.setDepotId(depot.getId());
+ reminders.setDepotName(depot.getName());
+ reminders.setFoodVariety(depot.getFoodVariety());
+ reminders.setFoodVarietyName(depot.getFoodVarietyName());
+ reminders.setFoodPrice(foodPrice.getPrice());
+ reminders.setStorageReal(depot.getStorageReal());
+ remindersList.add(reminders);
log.info("-----褰撳墠鍚堝悓={}涓嬩粨搴�={}锛氬搴旂殑瀹為檯鍌ㄩ噺={}锛屽搴旂伯椋熷崟浠�={}-----", pledgeContract.getName(), depot.getName(), depot.getStorageReal(), foodPrice.getPrice());
}
@@ -127,7 +141,7 @@
continue;
}
- BaseResp resp = workService.startByBackMoney(pledgeContract, conf);
+ BaseResp resp = workService.startByBackMoney(pledgeContract, conf,remindersList);
log.info("---------褰撳墠鍚堝悓={}鍚姩杩樻鎻愰啋宸ュ崟娴佺▼------{}", pledgeContract.getName(), resp);
}
}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/work/service/BizWorkService.java b/fzzy-igdss-core/src/main/java/com/fzzy/work/service/BizWorkService.java
index cc357fe..77650d1 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/work/service/BizWorkService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/work/service/BizWorkService.java
@@ -2,6 +2,7 @@
import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.data.BaseResp;
+import com.fzzy.igds.data.PledgeReminders;
import com.fzzy.igds.domain.InoutNoticeIn;
import com.fzzy.igds.domain.InoutNoticeOut;
import com.fzzy.igds.domain.PledgeContract;
@@ -18,7 +19,9 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.text.DecimalFormat;
import java.util.Date;
+import java.util.List;
/**
* @Desc: 宸ュ崟涓氬姟鎺ュ彛
@@ -28,6 +31,7 @@
@Slf4j
@Service
public class BizWorkService {
+
@Resource
private WorkOrderConfService confService;
@Resource
@@ -38,8 +42,9 @@
/**
* 鑾峰彇娴佺▼閰嶇疆淇℃伅
+ *
* @param deptId 搴撳尯ID
- * @param type 涓氬姟绫诲瀷
+ * @param type 涓氬姟绫诲瀷
* @return 閰嶇疆淇℃伅
*/
public WorkOrderConf getConfByDeptId(String deptId, WorkBizType type) {
@@ -49,6 +54,7 @@
/**
*
* 鏍规嵁鍑哄叆搴撻�氱煡鍗曞惎鍔ㄥ鎵瑰伐鍗�
+ *
* @param data 鍑哄叆搴撳伐鍗曟暟鎹�
* @return 鍝嶅簲缁撴灉
*/
@@ -69,7 +75,7 @@
work.setDeptId(data.getDeptId());
work.setCompanyId(data.getCompanyId());
work.setUpdateTime(new Date());
- work.setTitle(data.getName()+"-瀹℃壒");
+ work.setTitle(data.getName() + "-瀹℃壒");
work.setConfId(conf.getId());
work.setStatus(WorkStatus.STATUS_30.getCode());
work.setReceiveTime(new Date());
@@ -95,6 +101,7 @@
/**
*
* 鏍规嵁鍑哄嚭搴撻�氱煡鍗曞惎鍔ㄥ鎵瑰伐鍗�
+ *
* @param data 鍑哄叆搴撳伐鍗曟暟鎹�
* @return 鍝嶅簲缁撴灉
*/
@@ -114,7 +121,7 @@
work.setDeptId(data.getDeptId());
work.setCompanyId(data.getCompanyId());
work.setUpdateTime(new Date());
- work.setTitle(data.getName()+"-瀹℃壒");
+ work.setTitle(data.getName() + "-瀹℃壒");
work.setConfId(conf.getId());
work.setStatus(WorkStatus.STATUS_30.getCode());
work.setReceiveTime(new Date());
@@ -139,6 +146,7 @@
/**
* 鏍规嵁褰撳墠鑺傜偣鑾峰彇涓嬩竴涓妭鐐�
+ *
* @param curNode
* @param conf
* @return
@@ -168,16 +176,30 @@
/**
*
* 鏍规嵁鍑哄叆搴撻�氱煡鍗曞惎鍔ㄥ鎵瑰伐鍗�
+ *
* @param data 鍑哄叆搴撳伐鍗曟暟鎹�
* @return 鍝嶅簲缁撴灉
*/
- public BaseResp startByBackMoney(PledgeContract data, WorkOrderConf conf) {
+ public BaseResp startByBackMoney(PledgeContract data, WorkOrderConf conf, List<PledgeReminders> remindersList) {
if (null == conf) conf = confService.getByDeptId(data.getPledgeDept(), WorkBizType.TYPE_10);
if (Constant.YN_N.equals(conf.getValTag())) return BaseResp.error("娴佺▼鏈惎鐢�");
//鍒涘缓宸ュ崟
+ StringBuilder description = new StringBuilder("褰撳墠鍚堝悓<" + data.getName() + ">涓�");
+ if (!remindersList.isEmpty()) {
+ Double sumMoneyNum = 0.0;
+ DecimalFormat df = new DecimalFormat("0.00");
+
+ for (PledgeReminders reminders : remindersList) {
+ description.append("锛屼粨搴�<").append(reminders.getDepotName()).append(">锛岃川鎶肩墿<").append(reminders.getFoodVarietyName()).append(">搴撳瓨閲忎负").append(df.format(reminders.getStorageReal())).append("kg锛屽崟浠�").append(reminders.getFoodPrice()).append("鍏冿紝");
+ sumMoneyNum += reminders.getStorageReal() * reminders.getFoodPrice();
+ }
+ description.append("搴撳瓨閲忔�婚噾棰濅负").append(df.format(sumMoneyNum)).append("鍏冿紝杈惧埌鍚堝悓寰呰繕娆鹃噾棰濈殑110%,璇锋彁閱掍紒涓氳繘娆捐繕娆�");
+ } else {
+ description.append("璐ㄦ娂浠撳簱<").append(data.getDepotNames()).append(">搴撳瓨閲忛噾棰濋珮浜庡緟杩樻閲戦锛岄渶瑕佽繘琛岃繕娆�");
+ }
WorkOrder work = new WorkOrder();
work.setId(ContextUtil.generateOrderId("WARN"));
work.setBizType(WorkBizType.TYPE_50.getCode());
@@ -192,9 +214,7 @@
work.setConfId(conf.getId());
work.setStatus(WorkStatus.STATUS_30.getCode());
work.setReceiveTime(new Date());
-
- work.setDescription("褰撳墠鍚堝悓<" + data.getName() + ">涓嬭川鎶间粨搴�<" + data.getDepotNames() + ">搴撳瓨閲忛噾棰濋珮浜庡緟杩樻閲戦锛岄渶瑕佽繘琛岃繕娆撅紒");
-
+ work.setDescription(description.toString());
work.setCreateBy("绯荤粺鐢熸垚");
work.setCreateById("sys");
work.setUpdateBy("绯荤粺鐢熸垚");
@@ -219,6 +239,7 @@
/**
* 鑾峰彇寰呭鐞嗗伐鍗�
+ *
* @return 澶勭悊缁撴灉
*/
public BaseResp todoByProcess(WorkOrderProcess process) {
@@ -238,7 +259,6 @@
return BaseResp.error("褰撳墠宸ュ崟宸插鐞嗭紝璇峰埛鏂伴〉闈㈤噸璇曪紒锛�");
}
-
//鍒ゆ柇鏄笉鏄寚瀹氬鐞嗕汉
SysUser user = ContextUtil.getLoginUser();
if (StringUtils.isNotEmpty(work.getAssigneeId())) {
@@ -256,7 +276,6 @@
//鑾峰彇閰嶇疆淇℃伅
WorkOrderConf conf = confService.selectById(work.getConfId());
if (null == conf) return BaseResp.error("褰撳墠宸ュ崟鏈厤缃祦绋�");
-
//娣诲姞璁板綍
process.setId(ContextUtil.UUID());
@@ -280,7 +299,7 @@
work.setAssigneeId(process.getAssigneeId());
work.setNode(nextNode.getCode());
orderService.complete(work);
- }else{
+ } else {
work.setNode(nextNode.getCode());
work.setStatus(WorkStatus.STATUS_30.getCode());
orderService.updateData(work);
@@ -299,7 +318,7 @@
work.setStatus(WorkStatus.STATUS_60.getCode());
orderService.complete(work);
-
+
//澧炲姞瀹℃壒璁板綍
orderProcessService.addData(process, true);
@@ -314,7 +333,6 @@
// work.setAssigneeName(process.getAssigneeName());
// work.setAssigneeId(process.getAssigneeId());
-
orderService.complete(work);
--
Gitblit v1.9.3