licailing 4 jaren geleden
bovenliggende
commit
9777caf5ae

+ 0 - 2
src/main/java/com/izouma/nineth/config/RedisKeys.java

@@ -11,8 +11,6 @@ public class RedisKeys {
 
     public static final String PAY_RECORD = "payRecord::";
 
-    public static final String CREATE_MINT_ORDER = "createMintOrder::";
-
     public static final String ORDER_LOCK = "orderLock::";
 
     public static final String MINT_ACTIVITY_STOCK = "mintActivityStock::";

+ 0 - 20
src/main/java/com/izouma/nineth/event/CreateMintOrderEvent.java

@@ -1,20 +0,0 @@
-package com.izouma.nineth.event;
-
-import com.izouma.nineth.domain.User;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-import java.util.List;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class CreateMintOrderEvent implements Serializable {
-    private Long       id;
-    private User       user;
-    private List<Long> assetId;
-    private Long       mintActivityId;
-    private Long       addressId;
-}

+ 0 - 53
src/main/java/com/izouma/nineth/listener/CreateMintOrderListener.java

@@ -1,53 +0,0 @@
-package com.izouma.nineth.listener;
-
-import com.izouma.nineth.config.RedisKeys;
-import com.izouma.nineth.domain.MintOrder;
-import com.izouma.nineth.event.CreateMintOrderEvent;
-import com.izouma.nineth.exception.BusinessException;
-import com.izouma.nineth.service.MintOrderService;
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.rocketmq.spring.annotation.ConsumeMode;
-import org.apache.rocketmq.spring.annotation.RocketMQMessageListener;
-import org.apache.rocketmq.spring.core.RocketMQListener;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.stereotype.Service;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-@Service
-@Slf4j
-@AllArgsConstructor
-@RocketMQMessageListener(
-        consumerGroup = "${general.create-order-group}",
-        topic = "${general.create-order-topic}",
-        consumeMode = ConsumeMode.CONCURRENTLY)
-@ConditionalOnProperty(value = "general.notify-server", havingValue = "false", matchIfMissing = true)
-public class CreateMintOrderListener implements RocketMQListener<CreateMintOrderEvent> {
-    private MintOrderService              mintOrderService;
-    private RedisTemplate<String, Object> redisTemplate;
-
-    @Override
-    public void onMessage(CreateMintOrderEvent event) {
-        log.info("收到铸造订单创建消息");
-        Map<String, Object> map = new HashMap<>();
-        try {
-            MintOrder order = mintOrderService.create(event.getUser(), event.getAssetId(), event.getMintActivityId(), event.getAddressId());
-            event.setId(order.getId());
-            map.put("success", true);
-            map.put("data", order);
-        } catch (Exception e) {
-            if (e instanceof BusinessException) {
-                log.error("订单创建失败 {}", e.getMessage());
-            } else {
-                log.error("订单创建失败", e);
-            }
-            map.put("success", false);
-            map.put("data", e.getMessage());
-        }
-        redisTemplate.boundValueOps(RedisKeys.CREATE_MINT_ORDER + event.getId()).set(map, 1, TimeUnit.DAYS);
-    }
-}

+ 0 - 27
src/main/java/com/izouma/nineth/service/MintOrderService.java

@@ -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);