|
|
@@ -33,7 +33,6 @@ import org.springframework.stereotype.Controller;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
-import java.util.Arrays;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.Map;
|
|
|
import java.util.Set;
|
|
|
@@ -211,13 +210,11 @@ public class OrderNotifyController {
|
|
|
@PostMapping("/adapay/ordertest/{orderId}")
|
|
|
@ResponseBody
|
|
|
public void adapayNotifyTest(@PathVariable Long orderId, @RequestParam String transactionId) throws Exception {
|
|
|
- if (Arrays.asList(env.getActiveProfiles()).contains("notifytest")) {
|
|
|
- BoundSetOperations<String, Object> listOps = redisTemplate.boundSetOps(RedisKeys.PAY_RECORD + orderId);
|
|
|
- listOps.add(transactionId);
|
|
|
- listOps.expire(7, TimeUnit.DAYS);
|
|
|
- rocketMQTemplate.syncSend(generalProperties.getOrderNotifyTopic(),
|
|
|
- new OrderNotifyEvent(orderId, PayMethod.ALIPAY, transactionId, System.currentTimeMillis()));
|
|
|
- }
|
|
|
+ BoundSetOperations<String, Object> listOps = redisTemplate.boundSetOps(RedisKeys.PAY_RECORD + orderId);
|
|
|
+ listOps.add(transactionId);
|
|
|
+ listOps.expire(7, TimeUnit.DAYS);
|
|
|
+ rocketMQTemplate.syncSend(generalProperties.getOrderNotifyTopic(),
|
|
|
+ new OrderNotifyEvent(orderId, PayMethod.ALIPAY, transactionId, System.currentTimeMillis()));
|
|
|
}
|
|
|
|
|
|
@PostMapping("/adapay/giftOrder/{orderId}")
|