diff --git a/server/like-common/src/main/java/com/mdd/common/mapper/LogMoneyMapper.java b/server/like-common/src/main/java/com/mdd/common/mapper/LogMoneyMapper.java index 6654cd8c..1e7ab080 100644 --- a/server/like-common/src/main/java/com/mdd/common/mapper/LogMoneyMapper.java +++ b/server/like-common/src/main/java/com/mdd/common/mapper/LogMoneyMapper.java @@ -55,7 +55,6 @@ public interface LogMoneyMapper extends IBaseMapper { logMoney.setExtra(extra); logMoney.setCreateTime(System.currentTimeMillis() / 1000); logMoney.setUpdateTime(System.currentTimeMillis() / 1000); - System.out.println("呵呵呵呵"); this.insert(logMoney); } } diff --git a/server/like-common/src/main/java/com/mdd/common/mapper/RechargeOrderMapper.java b/server/like-common/src/main/java/com/mdd/common/mapper/RechargeOrderMapper.java index 97814b6c..a8806562 100644 --- a/server/like-common/src/main/java/com/mdd/common/mapper/RechargeOrderMapper.java +++ b/server/like-common/src/main/java/com/mdd/common/mapper/RechargeOrderMapper.java @@ -1,10 +1,38 @@ package com.mdd.common.mapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.mdd.common.core.basics.IBaseMapper; import com.mdd.common.entity.RechargeOrder; +import com.mdd.common.util.TimeUtils; +import com.mdd.common.util.ToolUtils; /** * 充值订单Mapper */ public interface RechargeOrderMapper extends IBaseMapper { + + /** + * 生成唯一单号 + * + * @author fzr + * @param field 字段名 + * @return String + */ + default String randMakeOrderSn(String field) { + String date = TimeUtils.timestampToDate(System.currentTimeMillis()/1000, "yyyyMMddHHmmss"); + String sn; + while (true) { + sn = date + ToolUtils.randomInt(12); + RechargeOrder snModel = this.selectOne( + new QueryWrapper() + .select("id") + .eq(field, sn) + .last("limit 1")); + if (snModel == null) { + break; + } + } + return sn; + } + } diff --git a/server/like-front/src/main/java/com/mdd/front/service/impl/RechargeServiceImpl.java b/server/like-front/src/main/java/com/mdd/front/service/impl/RechargeServiceImpl.java index fc3f9896..4f87d75b 100644 --- a/server/like-front/src/main/java/com/mdd/front/service/impl/RechargeServiceImpl.java +++ b/server/like-front/src/main/java/com/mdd/front/service/impl/RechargeServiceImpl.java @@ -77,7 +77,7 @@ public class RechargeServiceImpl implements IRechargeService { RechargeOrder order = new RechargeOrder(); order.setUserId(userId); order.setOrderTerminal(terminal); - order.setOrderSn(this.randMakeOrderSn()); + order.setOrderSn(rechargeOrderMapper.randMakeOrderSn("order_sn")); order.setPayWay(rechargeValidate.getPayWay()); order.setPayStatus(0); order.setRefundStatus(0); @@ -92,27 +92,4 @@ public class RechargeServiceImpl implements IRechargeService { return response; } - /** - * 生成唯一订单号 - * - * @author fzr - * @return String - */ - private String randMakeOrderSn() { - String date = TimeUtils.timestampToDate(System.currentTimeMillis()/1000, "yyyyMMddHHmmss"); - String sn; - while (true) { - sn = date + ToolUtils.randomInt(12); - RechargeOrder snModel = rechargeOrderMapper.selectOne( - new QueryWrapper() - .select("id") - .eq("order_sn", sn) - .last("limit 1")); - if (snModel == null) { - break; - } - } - return sn; - } - }