|
@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
import com.github.pagehelper.PageHelper;
|
|
|
+import com.yonge.cooleshow.common.service.IdGeneratorService;
|
|
|
import com.yonge.cooleshow.mall.common.api.CommonPage;
|
|
|
import com.yonge.cooleshow.mall.common.enums.OrderCacheEnum;
|
|
|
import com.yonge.cooleshow.mall.common.exception.Asserts;
|
|
@@ -78,6 +79,10 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
|
|
|
private String REDIS_DATABASE = "redis.database";
|
|
|
@Autowired
|
|
|
private PortalOrderDao portalOrderDao;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private IdGeneratorService idGeneratorService;
|
|
|
+
|
|
|
@Autowired
|
|
|
private OmsOrderSettingMapper orderSettingMapper;
|
|
|
@Autowired
|
|
@@ -927,20 +932,7 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
|
|
|
* 生成18位订单编号:8位日期+2位平台号码+2位支付方式+6位以上自增id
|
|
|
*/
|
|
|
private String generateOrderSn(OmsOrder order) {
|
|
|
- StringBuilder sb = new StringBuilder();
|
|
|
- String date = new SimpleDateFormat("yyyyMMdd").format(new Date());
|
|
|
- String key = REDIS_DATABASE + ":" + REDIS_KEY_ORDER_ID + date;
|
|
|
- Long increment = redisService.incr(key, 1);
|
|
|
- sb.append(date);
|
|
|
- sb.append(String.format("%02d", order.getSourceType()));
|
|
|
- // sb.append(String.format("%02d", order.getPayType()));
|
|
|
- String incrementStr = increment.toString();
|
|
|
- if (incrementStr.length() <= 6) {
|
|
|
- sb.append(String.format("%06d", increment));
|
|
|
- } else {
|
|
|
- sb.append(incrementStr);
|
|
|
- }
|
|
|
- return sb.toString();
|
|
|
+ return String.valueOf(idGeneratorService.generatorId("mall"));
|
|
|
}
|
|
|
|
|
|
/**
|