|
|
@@ -9,7 +9,6 @@ import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest;
|
|
|
import com.github.binarywang.wxpay.constant.WxPayConstants;
|
|
|
import com.github.binarywang.wxpay.exception.WxPayException;
|
|
|
import com.github.binarywang.wxpay.service.WxPayService;
|
|
|
-import com.google.common.base.Splitter;
|
|
|
import com.huifu.adapay.core.exception.BaseAdaPayException;
|
|
|
import com.huifu.adapay.model.AdapayCommon;
|
|
|
import com.huifu.adapay.model.Payment;
|
|
|
@@ -22,11 +21,9 @@ import com.izouma.nineth.dto.PageQuery;
|
|
|
import com.izouma.nineth.enums.AssetStatus;
|
|
|
import com.izouma.nineth.enums.MintOrderStatus;
|
|
|
import com.izouma.nineth.enums.PayMethod;
|
|
|
-import com.izouma.nineth.event.CreateMintOrderEvent;
|
|
|
import com.izouma.nineth.event.OrderNotifyEvent;
|
|
|
import com.izouma.nineth.exception.BusinessException;
|
|
|
import com.izouma.nineth.repo.*;
|
|
|
-import com.izouma.nineth.utils.AESEncryptUtil;
|
|
|
import com.izouma.nineth.utils.JpaUtils;
|
|
|
import com.izouma.nineth.utils.SecurityUtils;
|
|
|
import com.izouma.nineth.utils.SnowflakeIdWorker;
|
|
|
@@ -36,7 +33,6 @@ import org.apache.commons.codec.EncoderException;
|
|
|
import org.apache.commons.codec.net.URLCodec;
|
|
|
import org.apache.commons.collections.MapUtils;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
-import org.apache.rocketmq.client.producer.SendResult;
|
|
|
import org.apache.rocketmq.spring.core.RocketMQTemplate;
|
|
|
import org.springframework.core.env.Environment;
|
|
|
import org.springframework.data.domain.Page;
|
|
|
@@ -149,25 +145,6 @@ public class MintOrderService {
|
|
|
mintOrderRepo.save(mintOrder);
|
|
|
}
|
|
|
|
|
|
- public void mqCreate(User user, List<Long> assetId, Long mintActivityId, Long addressId, String sign) {
|
|
|
- String qs;
|
|
|
- try {
|
|
|
- qs = AESEncryptUtil.decrypt(sign);
|
|
|
- } catch (Exception e) {
|
|
|
- throw new BusinessException("签名错误");
|
|
|
- }
|
|
|
- final Map<String, String> map = Splitter.on('&').trimResults().withKeyValueSeparator('=').split(qs);
|
|
|
- if (Math.abs(MapUtils.getLong(map, "ts") - System.currentTimeMillis()) > 90000) {
|
|
|
- throw new BusinessException("签名已过期");
|
|
|
- }
|
|
|
-
|
|
|
-// Long id = snowflakeIdWorker.nextId();
|
|
|
- SendResult result = rocketMQTemplate.syncSend(generalProperties.getCreateOrderTopic(),
|
|
|
- new CreateMintOrderEvent(null, user, assetId, mintActivityId, addressId), 100000);
|
|
|
- log.info("发送订单到队列: result={}", result);
|
|
|
-
|
|
|
- }
|
|
|
-
|
|
|
/**
|
|
|
* @param user 用户
|
|
|
* @param assetId 资产
|
|
|
@@ -541,10 +518,6 @@ public class MintOrderService {
|
|
|
releaseOrderLock(order.getId());
|
|
|
}
|
|
|
|
|
|
- public Object queryCreateOrder(String id) {
|
|
|
- return redisTemplate.opsForValue().get(RedisKeys.CREATE_MINT_ORDER + id);
|
|
|
- }
|
|
|
-
|
|
|
public boolean getOrderLock(Long orderId) {
|
|
|
BoundValueOperations<String, Object> ops = redisTemplate.boundValueOps(RedisKeys.MINT_ORDER_LOCK + orderId);
|
|
|
Boolean flag = ops.setIfAbsent(1, 1, TimeUnit.DAYS);
|