diff --git a/src/main/java/com/example/demo/controller/coin/ConsumeController.java b/src/main/java/com/example/demo/controller/coin/ConsumeController.java index 4cdbc35..8e2cb76 100644 --- a/src/main/java/com/example/demo/controller/coin/ConsumeController.java +++ b/src/main/java/com/example/demo/controller/coin/ConsumeController.java @@ -174,7 +174,7 @@ public class ConsumeController { // 如果操作成功,对返回消息进行多语言转换 if (result.getCode() == 200) { String translatedMsg = languageTranslationUtil.translate("添加成功", lang); - return Result.success(translatedMsg); + return Result.success(translatedMsg, result.getData()); } else { // 对错误消息进行多语言转换 String translatedErrorMsg = languageTranslationUtil.translate(result.getMsg(), lang); diff --git a/src/main/java/com/example/demo/controller/coin/RechargeController.java b/src/main/java/com/example/demo/controller/coin/RechargeController.java index a3344f7..7996a2f 100644 --- a/src/main/java/com/example/demo/controller/coin/RechargeController.java +++ b/src/main/java/com/example/demo/controller/coin/RechargeController.java @@ -85,6 +85,16 @@ public class RechargeController { } } + //根据订单单号获取订单信息(重复充值/消费提示) + @PostMapping("/selectByOrderCode") + public Result selectByOrderCode(@RequestBody String OrderCode) { + try{ + return Result.success(rechargeService.selectByOrderCode(OrderCode)); + } + catch (Exception e){ + return Result.error(e.getMessage()); + } + } //充值明细筛选 @Log("充值明细筛选") @PostMapping("/selectBy") diff --git a/src/main/java/com/example/demo/domain/vo/coin/GoldRepeat.java b/src/main/java/com/example/demo/domain/vo/coin/GoldRepeat.java new file mode 100644 index 0000000..eb900eb --- /dev/null +++ b/src/main/java/com/example/demo/domain/vo/coin/GoldRepeat.java @@ -0,0 +1,50 @@ +package com.example.demo.domain.vo.coin; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * @program: gold-java + * @ClassName GoldRepeat + * @description: + * @author: Ethan + * @create: 2026−01-28 10:54 + * @Version 1.0 + **/ +@Data +@NoArgsConstructor +@JsonIgnoreProperties(ignoreUnknown = true) +public class GoldRepeat implements Serializable { + private static final long serialVersionUID = 1L; + + + private String orderCode; // 订单号 + private Integer jwcode; // 精网号 + + + private BigDecimal permanentGold; // 永久金币 + private BigDecimal freeJune; // 六月免费金币 + private BigDecimal freeDecember; // 十二月免费金币 + private BigDecimal taskGold; // 任务金币 + private String goodsName; // 商品名称 + private Byte type; // 类型(0充值/1消耗/2退款) + private Byte isRefund; // 是否已退款(消费限定)1退款0未退款 + + private String adminName; // 用户(提交人)姓名 + private Integer auditId; // 审核人id + private Integer auditStatus; // 审核状态(0待审核、1通过、2驳回、3外部传入【默认通过】) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") + private Date createTime; // 创建时间 + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") + private Date updateTime; // 更新时间 + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") + private Date auditTime; // 审核时间 +} \ No newline at end of file diff --git a/src/main/java/com/example/demo/mapper/coin/RechargeMapper.java b/src/main/java/com/example/demo/mapper/coin/RechargeMapper.java index 080bd29..cd1e544 100644 --- a/src/main/java/com/example/demo/mapper/coin/RechargeMapper.java +++ b/src/main/java/com/example/demo/mapper/coin/RechargeMapper.java @@ -2,10 +2,7 @@ package com.example.demo.mapper.coin; import com.example.demo.domain.entity.UserGoldRecord; -import com.example.demo.domain.vo.coin.ConsumeUser; -import com.example.demo.domain.vo.coin.Gold; -import com.example.demo.domain.vo.coin.RechargeUser; -import com.example.demo.domain.vo.coin.RefundUser; +import com.example.demo.domain.vo.coin.*; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -31,4 +28,6 @@ public interface RechargeMapper { Gold sumGold(RechargeUser rechargeUser); List selectOrderCodeByJwcode(RefundUser refundUser); + //根据订单单号获取订单信息(重复充值/消费提示) + GoldRepeat selectByOrderCode(String orderCode); } diff --git a/src/main/java/com/example/demo/service/coin/RechargeService.java b/src/main/java/com/example/demo/service/coin/RechargeService.java index 3cf8a1c..f7a3f45 100644 --- a/src/main/java/com/example/demo/service/coin/RechargeService.java +++ b/src/main/java/com/example/demo/service/coin/RechargeService.java @@ -1,9 +1,7 @@ package com.example.demo.service.coin; -import com.example.demo.domain.vo.coin.ConsumeUser; -import com.example.demo.domain.vo.coin.Gold; -import com.example.demo.domain.vo.coin.RechargeUser; -import com.example.demo.domain.vo.coin.Result; +import com.example.demo.domain.entity.UserGoldRecord; +import com.example.demo.domain.vo.coin.*; import com.github.pagehelper.PageInfo; /** @@ -27,4 +25,6 @@ public interface RechargeService { //添加充值记录 Result add(RechargeUser rechargeUser); + ////根据订单单号获取订单信息(重复充值/消费提示) + GoldRepeat selectByOrderCode(String orderCode); } diff --git a/src/main/java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java index ed8ba88..e751410 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java @@ -254,7 +254,7 @@ public class ConsumeServiceImpl implements ConsumeService { redService.sendConsumeJwcode(consumeUser.getJwcode(),consumeUser.getRedIds(),userGoldRecord.getLinkId()); // } - return Result.success(); + return Result.success("XF_" + orderNumber); } // // @Transactional diff --git a/src/main/java/com/example/demo/serviceImpl/coin/RechargeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/RechargeServiceImpl.java index 74b5742..8b88792 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/RechargeServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/RechargeServiceImpl.java @@ -148,6 +148,13 @@ public class RechargeServiceImpl implements RechargeService { userGoldRecord.setLinkId(SimpleIdGenerator.generateId()); userGoldRecord.setPrice(rechargeUser.getPermanentGold()); rechargeMapper.add(userGoldRecord); - return Result.success(); + return Result.success("CZ_" + orderNumber); + } + //根据订单单号获取订单信息(重复充值/消费提示) + @Override + public GoldRepeat selectByOrderCode(String orderCode) { + return rechargeMapper.selectByOrderCode(orderCode); } } + + diff --git a/src/main/resources/mapper/RechargeMapper.xml b/src/main/resources/mapper/RechargeMapper.xml index cdc8941..4e7cb3a 100644 --- a/src/main/resources/mapper/RechargeMapper.xml +++ b/src/main/resources/mapper/RechargeMapper.xml @@ -266,4 +266,16 @@ AND ugr.jwcode = #{jwcode} AND ugr.flag = 1 + + \ No newline at end of file