|
|
@@ -1,6 +1,9 @@
|
|
|
package com.kmall.admin.service.impl;
|
|
|
|
|
|
+import cn.hutool.core.lang.Snowflake;
|
|
|
import cn.hutool.core.lang.UUID;
|
|
|
+import cn.hutool.core.lang.generator.SnowflakeGenerator;
|
|
|
+import cn.hutool.core.util.IdUtil;
|
|
|
import cn.hutool.core.util.XmlUtil;
|
|
|
import cn.hutool.json.JSONUtil;
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
@@ -12,6 +15,8 @@ import com.google.gson.Gson;
|
|
|
import com.google.gson.internal.LinkedTreeMap;
|
|
|
import com.kmall.admin.cuspay.biz.ali.AliCusDeclareBiz;
|
|
|
import com.kmall.admin.cuspay.biz.wx.WxCusDeclareBiz;
|
|
|
+import com.kmall.admin.cuspay.manager.snow.SnowflakeIdWorker;
|
|
|
+import com.kmall.admin.cuspay.manager.snow.SnowflakeUtil;
|
|
|
import com.kmall.admin.dao.*;
|
|
|
import com.kmall.admin.dao.alarm.Mall2LowPriceWarningDao;
|
|
|
import com.kmall.admin.dao.mk.Mk2GoodsTopicPriceDao;
|
|
|
@@ -2306,7 +2311,9 @@ public class OrderServiceImpl implements OrderService {
|
|
|
|
|
|
//生成商户订单号
|
|
|
SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");
|
|
|
- String orderSn = "ZMHK" + format.format(new Date()) + CommonUtil.generateOrderNumber();
|
|
|
+// String orderSn = "ZMHK" + format.format(new Date()) + CommonUtil.generateOrderNumber();
|
|
|
+ Snowflake snowflake = IdUtil.createSnowflake(14, 14);
|
|
|
+ String orderSn = "8" + snowflake.nextIdStr().substring(6);
|
|
|
// 检查库存和更新库存
|
|
|
for (QueryGoodsVO goodsDto : queryGoodsVOList) {
|
|
|
// 要购买的数量
|
