Browse Source

01-28 新增充值/消费反订单号;根据订单号查询订单信息(仅重复提示字段)

huangqizheng/feature-20260129114800-验证码
lijianlin 4 weeks ago
parent
commit
a147e60847
  1. 2
      src/main/java/com/example/demo/controller/coin/ConsumeController.java
  2. 10
      src/main/java/com/example/demo/controller/coin/RechargeController.java
  3. 50
      src/main/java/com/example/demo/domain/vo/coin/GoldRepeat.java
  4. 7
      src/main/java/com/example/demo/mapper/coin/RechargeMapper.java
  5. 8
      src/main/java/com/example/demo/service/coin/RechargeService.java
  6. 2
      src/main/java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java
  7. 9
      src/main/java/com/example/demo/serviceImpl/coin/RechargeServiceImpl.java
  8. 12
      src/main/resources/mapper/RechargeMapper.xml

2
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);

10
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")

50
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: 202601-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; // 审核时间
}

7
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<RechargeUser> selectOrderCodeByJwcode(RefundUser refundUser);
//根据订单单号获取订单信息重复充值/消费提示
GoldRepeat selectByOrderCode(String orderCode);
}

8
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);
}

2
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

9
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);
}
}

12
src/main/resources/mapper/RechargeMapper.xml

@ -266,4 +266,16 @@
AND ugr.jwcode = #{jwcode}
AND ugr.flag = 1
</select>
<!--根据订单单号获取订单信息(重复充值/消费提示)-->
<select id="selectByOrderCode" resultType="com.example.demo.domain.vo.coin.GoldRepeat">
select ugr.type,ugr.order_code,ugr.jwcode,
COALESCE(ugr.permanent_gold,0)/100 as permanentGold,
COALESCE(ugr.free_june,0)/100 as freeJune,
COALESCE(ugr.free_december,0)/100 as freeDecember,
COALESCE(ugr.task_gold,0)/100 as taskGold,
ugr.audit_time,u.name AS adminName,ugr.goods_name,ugr.is_refund,ugr.create_time,ugr.audit_status
from user_gold_record ugr
left join user u on u.jwcode = ugr.admin_id
where ugr.order_code = #{orderCode}
</select>
</mapper>
Loading…
Cancel
Save