From 1046446be113534902a83054ce70ea356905f9a9 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 06 三月 2025 20:22:57 +0800
Subject: [PATCH] Merge branch 'xizang-changyun' of https://gitee.com/xiaochen991015/xizang
---
ruoyi-system/src/main/resources/mapper/system/TContractMapper.xml | 6 ++++++
ruoyi-system/src/main/java/com/ruoyi/system/query/TContractQuery.java | 3 +++
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java | 4 +++-
3 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/TContractQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/TContractQuery.java
index f5a3a67..0cb2c3a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/query/TContractQuery.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/TContractQuery.java
@@ -24,4 +24,7 @@
@NotBlank(message = "租户id不可为空")
@ApiModelProperty(value = "租户id")
private String tenantId;
+ @ApiModelProperty(value = "查询多个状态")
+ private List<Integer> statuses;
+
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java
index 362d630..1dd6cad 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java
@@ -395,7 +395,8 @@
TBill save = new TBill();
save.setId(bill.getId());
try {
- smsUtil.sendSms(bill.getPhone(), "2365726", new String[]{bill.getPartyTwoName()});
+ String name = bill.getPartyTwoName().length()>5?bill.getPartyTwoName().substring(0,5):bill.getPartyTwoName();
+ smsUtil.sendSms(bill.getPhone(), "2365726", new String[]{name});
save.setSmsStatus(1);
}catch (ServiceException e){
failNum++;
@@ -490,6 +491,7 @@
save.setPayType(3);
save.setPayer(dto.getPayer());
save.setPayTime(bankflow!=null?bankflow.getPayTime():DateUtils.dateToLocalDateTime(new Date()));
+ save.setSysSerialNumber(OrderNos.getDid());
save.setBankSerialNumber(bankflow!=null?bankflow.getBankSerialNumber():null);
save.setFlowType(dto.getPayType()==1?2:1);
save.setPaymentBillId(back.getId());
diff --git a/ruoyi-system/src/main/resources/mapper/system/TContractMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TContractMapper.xml
index fa366f5..66ccabf 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TContractMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TContractMapper.xml
@@ -62,6 +62,12 @@
<if test="query.tenantId != null">
and t1.tenant_id = #{query.tenantId}
</if>
+ <if test="query.statuses != null and query.statuses.size()>0">
+ and t1.status in
+ <foreach collection="query.statuses" item="item" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ </if>
AND t1.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
</where>
order by t1.create_time desc
--
Gitblit v1.7.1