pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeVirtualCardMapper.java
@@ -44,7 +44,7 @@ * 获取农户全部虚拟卡 * @return */ List<VoVirtualCard> getVCs(@Param("clientId") Long clientId); List<VoVirtualCard> getVCs(@Param("alarmValue") Integer alarmValue, @Param("clientId") Long clientId); /** * 根据虚拟卡ID获取虚拟卡对象 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoVirtualCard.java
@@ -3,6 +3,7 @@ import com.alibaba.fastjson2.annotation.JSONField; import com.alibaba.fastjson2.writer.ObjectWriterImplToString; import com.dy.common.po.BaseEntity; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import lombok.Data; /** @@ -13,6 +14,7 @@ */ @Data @JsonPropertyOrder({ "id", "vcNum", "money", "inUse", "isAlarmValue"}) public class VoVirtualCard implements BaseEntity { private static final long serialVersionUID = 202405240815001L; @@ -24,8 +26,8 @@ private Double money; private Byte inUse; private Boolean inUse; private String inUseName; private Boolean isAlarmValue; } pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
@@ -68,7 +68,6 @@ lazy-load-trigger-methods: "" # 阻挡不相干的操作触发，实现懒加载 cache-enabled: true #打开全局缓存开关（二级环境），默认值是true default-enum-type-handler: com.dy.common.mybatis.envm.EnumCodeTypeHandler type-handlers-package: com.dy.pipIrrGlobal.pojoBa.MySqlJsonHandler pipIrr: global: @@ -183,4 +182,9 @@ signalIntensity: weak: 10 ordinary: 20 # strong: 20 # strong: 20 #虚拟卡配置参数 vc: #虚拟卡最低余额报警值 alarmValue: 10 pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeVirtualCardMapper.xml
@@ -175,22 +175,21 @@ <!--获取农户全部虚拟卡--> <select id="getVCs" resultType="com.dy.pipIrrGlobal.voSe.VoVirtualCard"> SELECT <!-- CAST(id AS char) AS id,--> id, vc_num AS vcNum, money, in_use AS inUse, (CASE WHEN in_use = 0 THEN '未使用' WHEN in_use = 1 THEN '使用中' END) AS inUseName WHEN money <= #{alarmValue} THEN true ELSE FALSE END) AS isAlarmValue FROM se_virtual_card <where> <if test = "clientId != null"> AND client_id = #{clientId} </if> </where> ORDER BY in_use, money ORDER BY in_use, money DESC </select> <!--根据虚拟卡ID获取虚拟卡对象--> pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/virtualCard/VirtualCardSv.java
@@ -8,7 +8,6 @@ import com.dy.pipIrrGlobal.pojoSe.SeVcRefund; import com.dy.pipIrrGlobal.pojoSe.SeVcRefundItem; import com.dy.pipIrrGlobal.pojoSe.SeVirtualCard; import com.dy.pipIrrGlobal.voPr.VoController; import com.dy.pipIrrGlobal.voSe.VoOrders; import com.dy.pipIrrGlobal.voSe.VoVcRecharge; import com.dy.pipIrrGlobal.voSe.VoVirtualCard; @@ -20,6 +19,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.common.utils.PojoUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -52,6 +52,9 @@ @Autowired private SeClientMapper seClientMapper; @Value("${vc.alarmValue}") private Integer alarmValue; /** * 根据农户ID获取5级行政区划代码，注册虚拟卡使用 * @param clientId 农户ID @@ -66,7 +69,7 @@ * @return */ public List<VoVirtualCard> getVCs(Long clientId) { return seVirtualCardMapper.getVCs(clientId); return seVirtualCardMapper.getVCs(alarmValue, clientId); } /** pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/ValveCtrl.java
@@ -126,7 +126,7 @@ } // 虚拟卡状态为使用中，且不是强制开阀时提示 if (vc.getInUse() == 1 && !forceOpen) { if (vc.getInUse() && !forceOpen) { return BaseResponseUtils.buildCodeMsg(WechatResultCode.IN_USE_VC_CANNOT_OPEN_VALVE.getCode(), WechatResultCode.IN_USE_VC_CANNOT_OPEN_VALVE.getMessage()); }
@@ -16,6 +16,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.common.utils.PojoUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -51,6 +52,9 @@ @Autowired private SeVcOperateMapper seVcOperateMapper; @Value("${vc.alarmValue}") private Integer alarmValue; /** * 根据农户ID获取5级行政区划代码，注册虚拟卡使用 * @param clientId 农户ID @@ -65,7 +69,7 @@ * @return */ public List<VoVirtualCard> getVCs(Long clientId) { return seVirtualCardMapper.getVCs(clientId); return seVirtualCardMapper.getVCs(alarmValue, clientId); } /**
