qzz/electripper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

微调

Browse Source
This commit is contained in:
邱贞招 2024-12-10 21:47:44 +08:00
parent 9ceda280a6
commit 33b7e15b09
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
electripper-system/src/main/java/com/ruoyi/system/service/impl/AsDeviceServiceImpl.java
View File

@ -49,6 +49,7 @@ import java.util.List;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import static com.ruoyi.common.constant.HttpStatus.ERROR_CODE_DEVICE_ALREADY_EXISTS_MSG;
import static com.ruoyi.common.utils.SecurityUtils.getUsername;
/**
@ -2824,20 +2825,20 @@ public class AsDeviceServiceImpl extends ServiceImpl<AsDeviceMapper, AsDevice> i
if(StringUtils.isNotNull(device)){
throw new ServiceException("该MAC号已经存在");
}else{
// 调用onenet接口
CreateDeviceVo createDeviceVo = new CreateDeviceVo();
createDeviceVo.setDevice_name(asDevice.getMac());
createDeviceVo.setProduct_id(productId);
String result = HttpUtils.sendPostWithToken(deviceUrl+"/create",JSON.toJSONString(createDeviceVo), Token.getToken());
log.info("【sn和mac号绑定】===>IOT请求调用结果:【{}】",result);
JSONObject paramsObj = JSON.parseObject(result);
String code = paramsObj.getString("code");
//记录命令
if (!HttpStatus.IOT_SUCCESS.equals(code))
{
throw new ServiceException(code+"-----"+ paramsObj.getString("msg"));
}
try{
// 调用onenet接口
CreateDeviceVo createDeviceVo = new CreateDeviceVo();
createDeviceVo.setDevice_name(asDevice.getMac());
createDeviceVo.setProduct_id(productId);
String result = HttpUtils.sendPostWithToken(deviceUrl+"/create",JSON.toJSONString(createDeviceVo), Token.getToken());
log.info("【sn和mac号绑定】===>IOT请求调用结果:【{}】",result);
JSONObject paramsObj = JSON.parseObject(result);
String code = paramsObj.getString("code");
//记录命令
if (!HttpStatus.IOT_SUCCESS.equals(code) && !ERROR_CODE_DEVICE_ALREADY_EXISTS_MSG.equals(code))
{
throw new ServiceException(code+"-----"+ paramsObj.getString("msg"));
}
int insert = asDeviceMapper.insert(asDevice);
if(insert==0){
throw new ServiceException("该SN已经存在，请勿重复绑定！");

2
electripper-system/src/main/java/com/ruoyi/system/service/impl/WxPayService.java
View File

@ -173,7 +173,7 @@ public class WxPayService implements IWxPayService {
if(StrUtil.isNotBlank(order.getOutTradeNo())){
// 关闭订单
tmPayService.closeOrder(channelVO,order.getOutTradeNo());
TmPayService.closeOrder(channelVO,order.getOutTradeNo());
}
Payable payable = new Payable();
payable.setAmount(order.getPayFee().multiply(new BigDecimal(100)).longValue());