diff --git a/fastbee-gateway/fastbee-mq/src/main/java/com/fastbee/mq/redischannel/consumer/DeviceOtherMsgConsumer.java b/fastbee-gateway/fastbee-mq/src/main/java/com/fastbee/mq/redischannel/consumer/DeviceOtherMsgConsumer.java index 84fe149..a07a9a0 100644 --- a/fastbee-gateway/fastbee-mq/src/main/java/com/fastbee/mq/redischannel/consumer/DeviceOtherMsgConsumer.java +++ b/fastbee-gateway/fastbee-mq/src/main/java/com/fastbee/mq/redischannel/consumer/DeviceOtherMsgConsumer.java @@ -301,12 +301,14 @@ public class DeviceOtherMsgConsumer { log.error("设备{}灌溉记录添加失败",serialNumber); } //添加一条刷卡记录 + BigDecimal userBalance=dataJson.getBigDecimal("userBalance");//用户余额 NgCardSwipeRecords ngCardSwipeRecords=new NgCardSwipeRecords(); ngCardSwipeRecords.setCardNumber(cardNumber);//卡号 ngCardSwipeRecords.setDeviceNumber(serialNumber);//设备编码 ngCardSwipeRecords.setAreaCode(areaCode);//区域号 ngCardSwipeRecords.setCardSwipeType(0);//开阀 ngCardSwipeRecords.setCardSwipeTime(DateUtils.getNowDate());//刷卡时间 + ngCardSwipeRecords.setAmountDue(userBalance);//开阀时用户余额 if(cardInfo!=null && cardInfo.getUserId()!=null){ ngCardSwipeRecords.setUserId(cardInfo.getUserId());//用户id } @@ -382,6 +384,8 @@ public class DeviceOtherMsgConsumer { ngCardSwipeRecords.setAreaCode(areaCode);//区域号 ngCardSwipeRecords.setCardSwipeType(1);//关阀 ngCardSwipeRecords.setCardSwipeTime(DateUtils.getNowDate());//刷卡时间 + ngCardSwipeRecords.setAmountDue(userBalance);//关阀时用户余额 + if(cardInfo!=null && cardInfo.getUserId()!=null){ ngCardSwipeRecords.setUserId(cardInfo.getUserId());//用户id }