|
@@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollectionUtil;
|
|
|
import cn.hutool.core.date.DateUtil;
|
|
|
import cn.hutool.core.lang.Assert;
|
|
|
import cn.hutool.core.text.StrFormatter;
|
|
|
-import cn.hutool.core.util.IdUtil;
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
import cn.hutool.core.util.RandomUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
@@ -22,7 +21,10 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
|
|
|
import com.qmrb.system.converter.PayOrderConverter;
|
|
|
import com.qmrb.system.mapper.CouponMapper;
|
|
|
import com.qmrb.system.mapper.OrderMapper;
|
|
|
-import com.qmrb.system.pojo.entity.*;
|
|
|
+import com.qmrb.system.pojo.entity.CarPark;
|
|
|
+import com.qmrb.system.pojo.entity.Coupon;
|
|
|
+import com.qmrb.system.pojo.entity.Order;
|
|
|
+import com.qmrb.system.pojo.entity.ToolWxConfig;
|
|
|
import com.qmrb.system.pojo.form.BarnRecordForm;
|
|
|
import com.qmrb.system.pojo.form.PayOrderForm;
|
|
|
import com.qmrb.system.pojo.query.PayOrderQuery;
|
|
@@ -31,6 +33,7 @@ import com.qmrb.system.pojo.vo.ReCreateOrderVO;
|
|
|
import com.qmrb.system.pojo.vo.ToCreateOrderVO;
|
|
|
import com.qmrb.system.pojo.vo.WxLoginVO;
|
|
|
import com.qmrb.system.service.*;
|
|
|
+import com.qmrb.system.utils.JSSafeSnowflake;
|
|
|
import com.qmrb.system.utils.WxPayUtil;
|
|
|
import com.qmrb.system.wxpayback.Enum.WxApiType;
|
|
|
import com.qmrb.system.wxpayback.Enum.WxPayStatusEnum;
|
|
@@ -560,7 +563,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
|
|
|
|
@Override
|
|
|
public void createOrderByRecord(ToCreateOrderVO toCreatOrderVO) {
|
|
|
- Long id = IdUtil.getSnowflake().nextId();
|
|
|
+// Long id = IdUtil.getSnowflake().nextId();
|
|
|
+ JSSafeSnowflake idGenerator = new JSSafeSnowflake(2);
|
|
|
+ Long id = idGenerator.nextId();
|
|
|
toCreatOrderVO.setOutTradeNo(id.toString());
|
|
|
//订单入库
|
|
|
this.save(new Order().setAmountsPayable(toCreatOrderVO.getTotal())
|