From f86b12bcb64bf4fcb9aafafa4c086ad1af726ac5 Mon Sep 17 00:00:00 2001 From: huangqizhen Date: Sat, 14 Dec 2024 15:42:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=95=B4=E5=90=88=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/demo/controller/AuditController.java | 41 ++++++++++++++++++---- .../example/demo/controller/RefundController.java | 13 ++++++- .../java/com/example/demo/domain/entity/Audit.java | 4 ++- .../com/example/demo/domain/entity/Detail.java | 3 ++ .../com/example/demo/domain/entity/Product.java | 1 + .../java/com/example/demo/domain/entity/Rate.java | 2 ++ .../com/example/demo/domain/entity/Recharge.java | 1 + .../java/com/example/demo/domain/entity/User.java | 2 ++ .../com/example/demo/domain/vo/ConsumeDetail.java | 1 + .../java/com/example/demo/domain/vo/DetailVo.java | 2 ++ src/main/java/com/example/demo/domain/vo/Page.java | 1 + .../com/example/demo/domain/vo/RechargeVo.java | 2 ++ .../com/example/demo/domain/vo/Statistics.java | 2 ++ .../com/example/demo/domain/vo/Statisticss.java | 2 ++ .../java/com/example/demo/domain/vo/SumCoin.java | 2 ++ .../java/com/example/demo/domain/vo/UserVo.java | 2 +- .../com/example/demo/mapper/ConsumeMapper.java | 4 +-- .../java/com/example/demo/mapper/DetailMapper.java | 4 +-- .../java/com/example/demo/mapper/RefundMapper.java | 9 ++++- .../java/com/example/demo/mapper/UserMapper.java | 5 ++- .../demo/serviceImpl/RefundServiceImpl.java | 8 +++++ .../com/example/demo/sevice/RefundService.java | 1 + 22 files changed, 97 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/example/demo/controller/AuditController.java b/src/main/java/com/example/demo/controller/AuditController.java index d5db15b..3998e25 100644 --- a/src/main/java/com/example/demo/controller/AuditController.java +++ b/src/main/java/com/example/demo/controller/AuditController.java @@ -2,23 +2,31 @@ package com.example.demo.controller; import com.example.demo.domain.entity.Audit; +import com.example.demo.domain.entity.Detail; +import com.example.demo.domain.entity.User; import com.example.demo.domain.vo.Page; import com.example.demo.domain.vo.Result; +import com.example.demo.mapper.DetailMapper; +import com.example.demo.mapper.UserMapper; import com.example.demo.sevice.AuditService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.ObjectUtils; import org.springframework.web.bind.annotation.*; +import java.math.BigDecimal; import java.util.Arrays; @RestController @RequestMapping("/audit/audit") @RequiredArgsConstructor @Slf4j +@Transactional @CrossOrigin public class AuditController { - + private UserMapper userMapper; + private DetailMapper detailMapper; private final AuditService auditService; @PostMapping("/add") public Result add(@RequestBody Audit audit){ @@ -32,13 +40,34 @@ public class AuditController { } @PostMapping("/edit") public Result edit(@RequestBody Audit audit){ - try { + + //先执行auditService.edit(audit); + //然后创建一个类，去接收这个audit，如果status=1 + //根据退款ID找到detail表中的记录获取到他的三种金币 + //把金币加到user表中对应的金币中 + auditService.edit(audit); - return Result.success(); - }catch (Exception e){ - log.warn(Arrays.toString(e.getStackTrace())); - return Result.error(e.getMessage()); + if(audit.getStatus() == 1 && audit.getRefundId()!=null){ + Detail detail = detailMapper.selectByRefundId(audit.getRefundId()); + BigDecimal rechargeCoin = detail.getRechargeCoin(); + BigDecimal taskCoin = detail.getTaskCoin(); + BigDecimal freeCoin = detail.getFreeCoin(); + + User user = userMapper.selectByJwcode(detail.getJwcode()); + user.setBuyJb(user.getBuyJb().add(rechargeCoin)); + user.setCoreJb(user.getCoreJb().add(taskCoin)); + user.setFree6(user.getFree6().add(freeCoin)); + userMapper.update(user); } + return Result.success(); + // +// try { +// auditService.edit(audit); +// return Result.success(); +// }catch (Exception e){ +// log.warn(Arrays.toString(e.getStackTrace())); +// return Result.error(e.getMessage()); +// } } @PostMapping public Result search(@RequestBody Page page){ diff --git a/src/main/java/com/example/demo/controller/RefundController.java b/src/main/java/com/example/demo/controller/RefundController.java index 1fee7bb..0ca5baf 100644 --- a/src/main/java/com/example/demo/controller/RefundController.java +++ b/src/main/java/com/example/demo/controller/RefundController.java @@ -64,13 +64,24 @@ public class RefundController { } @PostMapping("/searchByJWCODE") - public Result searchByOrderCode(@RequestParam String jwcode) { + public Result searchByJWCODE(@RequestParam String jwcode) { Detail detail = refundService.selectByJWCODE(jwcode); // 检查返回的结果是否为空或无效 if (detail == null || ObjectUtils.isEmpty(detail.getOrderCode())) { return Result.error("该订单不存在："); } + // 成功时返回包含订单详情的数据 + return Result.success(detail); + + } + @PostMapping("/searchByOrderCode") + public Result searchByOrderCode(@RequestParam String orderCode) { + Detail detail = refundService.selectByOrderCode(orderCode); + // 检查返回的结果是否为空或无效 + if (detail == null || ObjectUtils.isEmpty(detail.getOrderCode())) { + return Result.error("该订单不存在："); + } // 成功时返回包含订单详情的数据 return Result.success(detail); diff --git a/src/main/java/com/example/demo/domain/entity/Audit.java b/src/main/java/com/example/demo/domain/entity/Audit.java index df59c7b..3301803 100644 --- a/src/main/java/com/example/demo/domain/entity/Audit.java +++ b/src/main/java/com/example/demo/domain/entity/Audit.java @@ -15,7 +15,7 @@ public class Audit { private Integer rechargeId; private Integer refundId; private Integer adminId; - private String status; + private Integer status; private Integer AuditFlag; @DateTimeFormat(pattern = "yyyy-MM-dd") @@ -24,4 +24,6 @@ public class Audit { private Date endDate; private String reson; private Integer detailId; + private String token; + } diff --git a/src/main/java/com/example/demo/domain/entity/Detail.java b/src/main/java/com/example/demo/domain/entity/Detail.java index 6c13239..6f490aa 100644 --- a/src/main/java/com/example/demo/domain/entity/Detail.java +++ b/src/main/java/com/example/demo/domain/entity/Detail.java @@ -58,4 +58,7 @@ public class Detail implements Serializable { private String productName; private Integer refundId; + private BigDecimal allCoin; + private String token; + } diff --git a/src/main/java/com/example/demo/domain/entity/Product.java b/src/main/java/com/example/demo/domain/entity/Product.java index ffc9937..f67e128 100644 --- a/src/main/java/com/example/demo/domain/entity/Product.java +++ b/src/main/java/com/example/demo/domain/entity/Product.java @@ -22,5 +22,6 @@ public class Product { private String productFlag; @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; + private String token; } diff --git a/src/main/java/com/example/demo/domain/entity/Rate.java b/src/main/java/com/example/demo/domain/entity/Rate.java index fa64747..54e013a 100644 --- a/src/main/java/com/example/demo/domain/entity/Rate.java +++ b/src/main/java/com/example/demo/domain/entity/Rate.java @@ -22,4 +22,6 @@ public class Rate { private Integer adminId; private String adminName; private String updateId; + private String token; + } diff --git a/src/main/java/com/example/demo/domain/entity/Recharge.java b/src/main/java/com/example/demo/domain/entity/Recharge.java index 5b0a49d..b4f65a4 100644 --- a/src/main/java/com/example/demo/domain/entity/Recharge.java +++ b/src/main/java/com/example/demo/domain/entity/Recharge.java @@ -32,5 +32,6 @@ public class Recharge { private Date startDate; private Date endDate; private String orderCode; + private String token; } diff --git a/src/main/java/com/example/demo/domain/entity/User.java b/src/main/java/com/example/demo/domain/entity/User.java index af2d4e1..2c6083a 100644 --- a/src/main/java/com/example/demo/domain/entity/User.java +++ b/src/main/java/com/example/demo/domain/entity/User.java @@ -31,4 +31,6 @@ public class User { private BigDecimal free6; private BigDecimal free12; private Date lastTime; + private String token; + } diff --git a/src/main/java/com/example/demo/domain/vo/ConsumeDetail.java b/src/main/java/com/example/demo/domain/vo/ConsumeDetail.java index e87e05c..d4757aa 100644 --- a/src/main/java/com/example/demo/domain/vo/ConsumeDetail.java +++ b/src/main/java/com/example/demo/domain/vo/ConsumeDetail.java @@ -39,5 +39,6 @@ public class ConsumeDetail { private Date startDate; private Date endDate; private Integer auditId; + private String token; } diff --git a/src/main/java/com/example/demo/domain/vo/DetailVo.java b/src/main/java/com/example/demo/domain/vo/DetailVo.java index 527dde8..cdec47a 100644 --- a/src/main/java/com/example/demo/domain/vo/DetailVo.java +++ b/src/main/java/com/example/demo/domain/vo/DetailVo.java @@ -53,4 +53,6 @@ public class DetailVo { private String userName; private Date startDate; private Date endDate; + private String token; + } diff --git a/src/main/java/com/example/demo/domain/vo/Page.java b/src/main/java/com/example/demo/domain/vo/Page.java index decb9a9..6691ae6 100644 --- a/src/main/java/com/example/demo/domain/vo/Page.java +++ b/src/main/java/com/example/demo/domain/vo/Page.java @@ -25,6 +25,7 @@ public class Page implements Serializable { private DetailVo detailVo; private Admin admin; + public Integer getPageNum() { return pageNum; } diff --git a/src/main/java/com/example/demo/domain/vo/RechargeVo.java b/src/main/java/com/example/demo/domain/vo/RechargeVo.java index b8c46b9..48e6b32 100644 --- a/src/main/java/com/example/demo/domain/vo/RechargeVo.java +++ b/src/main/java/com/example/demo/domain/vo/RechargeVo.java @@ -38,4 +38,6 @@ public class RechargeVo { private String reson; private String name; private Integer auditId; + private String token; + } \ No newline at end of file diff --git a/src/main/java/com/example/demo/domain/vo/Statistics.java b/src/main/java/com/example/demo/domain/vo/Statistics.java index 2860e65..025149d 100644 --- a/src/main/java/com/example/demo/domain/vo/Statistics.java +++ b/src/main/java/com/example/demo/domain/vo/Statistics.java @@ -42,5 +42,7 @@ public class Statistics { private String subject; private String consumePlatform; private Integer firstRechargeCountYesterday; + private String token; + } diff --git a/src/main/java/com/example/demo/domain/vo/Statisticss.java b/src/main/java/com/example/demo/domain/vo/Statisticss.java index 32928de..7e1fffc 100644 --- a/src/main/java/com/example/demo/domain/vo/Statisticss.java +++ b/src/main/java/com/example/demo/domain/vo/Statisticss.java @@ -15,4 +15,6 @@ public class Statisticss { private List HomilyChartSum; private List HomilyLinkSum; + private String token; + } diff --git a/src/main/java/com/example/demo/domain/vo/SumCoin.java b/src/main/java/com/example/demo/domain/vo/SumCoin.java index c9c7bb5..ae07286 100644 --- a/src/main/java/com/example/demo/domain/vo/SumCoin.java +++ b/src/main/java/com/example/demo/domain/vo/SumCoin.java @@ -72,4 +72,6 @@ public class SumCoin { private BigDecimal totalRecharge; private BigDecimal totalFree; private BigDecimal totalTask; + private String token; + } diff --git a/src/main/java/com/example/demo/domain/vo/UserVo.java b/src/main/java/com/example/demo/domain/vo/UserVo.java index c4b2301..aafcfe3 100644 --- a/src/main/java/com/example/demo/domain/vo/UserVo.java +++ b/src/main/java/com/example/demo/domain/vo/UserVo.java @@ -26,6 +26,6 @@ public class UserVo { private BigDecimal free12; private BigDecimal coreJb; private BigDecimal buyJb ; - + private String token; } diff --git a/src/main/java/com/example/demo/mapper/ConsumeMapper.java b/src/main/java/com/example/demo/mapper/ConsumeMapper.java index e14e881..2128d11 100644 --- a/src/main/java/com/example/demo/mapper/ConsumeMapper.java +++ b/src/main/java/com/example/demo/mapper/ConsumeMapper.java @@ -27,9 +27,9 @@ public interface ConsumeMapper { //新增消费记录 @Insert({ "insert into detail", - "(jwcode,activity_id,recharge_way,product_id,consume_platform,consume_type,refund_type,refund_goods,contact_id,remark,recharge_coin,free_coin,task_coin,admin_id,update_type,detail_flag,create_time,refund_flag)", + "(jwcode,activity_id,recharge_way,product_id,consume_platform,consume_type,refund_type,refund_goods,contact_id,remark,recharge_coin,fre z e_coin,task_coin,admin_id,update_type,detail_flag,create_time,refund_flag,order_code)", "values", - "(#{jwcode},#{activityId},#{rechargeWay},#{productId},'金币系统','购买商品',#{refundType},#{refundGoods},#{contactId},#{remark},#{rechargeCoin},#{freeCoin},#{taskCoin},#{adminId},#{updateType},1,now(),1)" + "(#{jwcode},#{activityId},#{rechargeWay},#{productId},'金币系统','购买商品',#{refundType},#{refundGoods},#{contactId},#{remark},#{rechargeCoin},#{freeCoin},#{taskCoin},#{adminId},#{updateType},1,now(),1，orderCode)" }) // 获取自增主键 @Options(useGeneratedKeys = true,keyColumn = "detail_id",keyProperty = "detailId") diff --git a/src/main/java/com/example/demo/mapper/DetailMapper.java b/src/main/java/com/example/demo/mapper/DetailMapper.java index fc73fc8..f3bfe86 100644 --- a/src/main/java/com/example/demo/mapper/DetailMapper.java +++ b/src/main/java/com/example/demo/mapper/DetailMapper.java @@ -24,9 +24,9 @@ public interface DetailMapper { @Options(useGeneratedKeys = true,keyColumn = "detail_id",keyProperty = "detailId") int add(Detail detail); @Select({ - "SELECT * from detail where detail =#{detail}" + "SELECT * from detail where detail_id =#{detailId}" }) - Detail selectById(Integer id); + Detail selectByRefundId(Integer detail_id); @Select({ "