添加订单状态已下发，已充值逻辑

fastbee-gateway/fastbee-mq/src/main/java/com/fastbee/mq/redischannel/consumer/DeviceOtherMsgConsumer.java

@@ -10,7 +10,9 @@ import com.fastbee.iot.mapper.DeviceReportInfoMapper;
 import com.fastbee.mq.redischannel.producer.IssueInstructionsProducer;
 import com.fastbee.mq.service.impl.DeviceOtherMsgHandler;
 import com.fastbee.mqttclient.PubMqttClient;
+import com.fastbee.rechargecard.domain.NgUserRechargeRecords;
 import com.fastbee.rechargecard.domain.NgWaterPumpUsageRecords;
+import com.fastbee.rechargecard.mapper.NgUserRechargeRecordsMapper;
 import com.fastbee.rechargecard.mapper.NgWaterPumpUsageRecordsMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -45,6 +47,9 @@ public class DeviceOtherMsgConsumer {
     @Autowired
     private NgWaterPumpUsageRecordsMapper ngWaterPumpUsageRecordsMapper;
 
+    @Autowired
+    private NgUserRechargeRecordsMapper ngUserRechargeRecordsMapper;
+
     @Autowired
     private StringRedisTemplate stringRedisTemplate;
 
@@ -119,7 +124,7 @@ public class DeviceOtherMsgConsumer {
                             reportMsg.put("pakSn",jsonObject.getStr("pakSn"));
                             // reportMsg.put("data","heartBeat");
                             // jsonObject.set("code",100);
-                            issueInstructionsProducer.receiveDataReportResponse(productId.toString(),serialNumber,JSONUtil.toJsonStr(jsonObject));
+                            issueInstructionsProducer.receiveDataReportResponse(productId.toString(),serialNumber,JSONUtil.toJsonStr(reportMsg));
                         }
 
                 }
@@ -140,6 +145,27 @@ public class DeviceOtherMsgConsumer {
                 //回应
 
             } else if (topic.endsWith("/cmd/reply")) {
+                //收到充值结果指令
+                JSONObject jsonObject = JSONUtil.parseObj(new String(data));
+                if(jsonObject.getStr("type").equals("devCmdAck")){
+                    JSONObject data1 = jsonObject.getJSONObject("data");
+                    Long orderNum = data1.getLong("orderNum");
+                    //修改订单状态为已充值
+                    try {
+                        new LambdaUpdateChainWrapper<>(ngUserRechargeRecordsMapper)
+                                .set(NgUserRechargeRecords::getStatus,3)
+                                .eq(NgUserRechargeRecords::getId,orderNum)
+                                .update();
+                    }catch (Exception e){
+
+                    }
+
+
+                }
+
+
+
+
                 deviceCmdAckHandler(new String(data));
                 updateDeviceOnlineStatus( productId,serialNumber);
                 // updateDeviceOnlineStatusDb(serialNumber);

fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/mapper/NgUserRechargeRecordsMapper.java

@@ -1,6 +1,8 @@
 package com.fastbee.rechargecard.mapper;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fastbee.rechargecard.domain.NgUserRechargeRecords;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
@@ -12,7 +14,7 @@ import org.apache.ibatis.annotations.Select;
  * @date 2024-12-19
  */
 @Mapper
-public interface NgUserRechargeRecordsMapper
+public interface NgUserRechargeRecordsMapper extends BaseMapper<NgUserRechargeRecords>
 {
     /**
      * 根据订单号查询充值记录

fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/impl/UserRechargeCardsServiceImpl.java

@@ -174,11 +174,13 @@ public class UserRechargeCardsServiceImpl implements IUserRechargeCardsService
         param.put("data",data);
         try{
             pubMqttClient.publish(1,true,topic, JSONUtil.toJsonStr(param));
+
         }catch (Exception e)
         {
             throw new ServiceException("消息发布失败");
         }
-
+        ngUserRechargeRecords.setStatus(2);//状态更改为已下发
+        userRechargeRecordsMapper.updateNgUserRechargeRecords(ngUserRechargeRecords);
 //        int i = userRechargeCardsMapper.updateUserRechargeCards(info);
         return 1;
     }