Merge branch 'master' into master-果昔项目

device-api-service/src/main/java/com/xy/service/DeviceAnnualFeeServiceImpl.java

@@ -304,8 +304,6 @@ public class DeviceAnnualFeeServiceImpl extends ServiceImpl<DeviceAnnualFeeMappe
                                 SysDictRedis sysDictRedis = stringSysDictRedisMap.get(String.valueOf(deviceAnnualFee.getMercId()));
                                 JSONObject obj = JSONUtil.parseObj(sysDictRedis.getValue());
                                 String url = obj.getStr("device_send_url");
-                                JSONObject env = JSONUtil.parseObj(value)
-                                        .set("env", obj.getStr("env"));
                                 JSONObject jsonObject = jsonObjects.get(deviceId);
                                 JSONObject result = send(url, jsonObject, "发送设备数据到商家平台");
                                 //修改设备年费注册信息
@@ -314,6 +312,8 @@ public class DeviceAnnualFeeServiceImpl extends ServiceImpl<DeviceAnnualFeeMappe
                                             .setRegisterTime(now);
                                     updateById(deviceAnnualFee);
                                     //发送环境切换指令
+                                    JSONObject env = JSONUtil.parseObj(value)
+                                            .set("env", obj.getStr("env"));
                                     CommandMqtt commandMqtt = new CommandMqtt()
                                             .setDeviceId(deviceId)
                                             .setTemplet(env);