ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserIntegralChange.java
@@ -32,6 +32,8 @@ @ApiModelProperty(value = "主键") @TableId("id") private Long id; @TableField(exist = false) private String uid; @ApiModelProperty(value = "流水号") @TableField("code") ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/OrderFallbackFactory.java
@@ -57,7 +57,7 @@ @Override public R callBack(String code, String outTradeNo) { return R.fail("支付回调" + cause.getMessage()); return R.fail("支付回调:" + cause.getMessage()); }
@@ -15,7 +15,6 @@ </description> <dependencies> <dependency> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-api-order</artifactId> ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java
@@ -424,6 +424,7 @@ for (TAppUserIntegralChange record : page.getRecords()) { record.setDateTime(record.getCreateTime()); record.setUid(record.getId().toString()); if (record.getChangeType()==2){ R<TChargingOrder> tChargingOrderR = chargingOrderClient.orderDetail(Long.valueOf(record.getExtension())); if (tChargingOrderR.getData()!=null) { @@ -440,6 +441,13 @@ return R.ok(page); } @ApiOperation(value = "积分详情", tags = {"小程序-个人中心"}) @GetMapping(value = "/user/points/detail") public R<TAppUserIntegralChange> pointsDetail(String id) { TAppUserIntegralChange byId = integralChangeService.getById(id); return R.ok(byId); } @ApiOperation(value = "冻结解冻用户", tags = {"后台-用户管理-用户列表"}) @@ -809,6 +817,12 @@ return R.ok(); } @ApiOperation(value = "添加编辑车辆", tags = {"小程序-个人中心-车辆"}) @DeleteMapping(value = "/user/car/delete") public R carDelete(String id) { boolean b = appUserCarService.removeById(id); return R.ok(); } @ApiOperation(value = "车辆详情", tags = {"小程序-个人中心-车辆"}) @GetMapping(value = "/user/car/detail") public R<TAppUserCar> carDetail(String id) { ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/THtmlController.java
@@ -1,6 +1,7 @@ package com.ruoyi.other.controller; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.other.api.domain.THtml; import com.ruoyi.other.api.domain.TNotice; @@ -29,7 +30,13 @@ @ApiOperation(tags = {"后台-内容设置-协议服务"},value = "新增修改") @PostMapping(value = "/saveOrUpdate") public AjaxResult saveOrUpdate(@RequestBody THtml tHtml) { htmlService.saveOrUpdate(tHtml); THtml one = htmlService.lambdaQuery().eq(THtml::getType, tHtml.getType()).one(); if(one!=null){ one.setContent(tHtml.getContent()); htmlService.updateById(one); }else { htmlService.save(tHtml); } return AjaxResult.success(); }
