Merge branch 'develop'

kustomization/overlays/dev/kustomization.yaml

@@ -14,4 +14,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/payment
-  newTag: fd973dad9131dc9bae45573c0847dd344ec84f9a
+  newTag: bcde9c03490888bda67386eec086ce7d9ffa8edf

src/main/java/com/mmc/payment/mq/PublishMsg.java

@@ -9,4 +9,6 @@ import com.mmc.payment.model.vo.wallet.TopUpOrderVO;
  */
 public interface PublishMsg {
     void sendNewTopUpOrder(TopUpOrderVO topUpOrder, String routingKey);
+
+    void sendPayUavOrder(TopUpOrderVO topUpOrderVO, String userTopUpSuccessRoutingKey);
 }

src/main/java/com/mmc/payment/mq/constant/RabbitmqConstant.java

@@ -21,4 +21,10 @@ public class RabbitmqConstant {
     public final static String USER_TOP_UP_SUCCESS_QUEUE = "USER_TOP_UP_SUCCESS_QUEUE";
     public final static String USER_TOP_UP_SUCCESS_ROUTING_KEY = "USER_TOP_UP_SUCCESS_ROUTING_KEY";
 
+    /**
+     * 商城订单支付成功队列、routing_key
+     */
+    public final static String PAY_UAV_ORDER_SUCCESS_QUEUE = "PAY_UAV_ORDER_SUCCESS_QUEUE";
+    public final static String PAY_UAV_ORDER_SUCCESS_ROUTING_KEY = "PAY_UAV_ORDER_SUCCESS_ROUTING_KEY";
+
 }

src/main/java/com/mmc/payment/mq/impl/PublishMsgImpl.java

@@ -26,4 +26,11 @@ public class PublishMsgImpl implements PublishMsg {
         log.info("sendNewTopUpOrder:{},routingKey:{}", JSONObject.toJSONString(topUpOrder), routingKey);
         rabbitTemplate.convertAndSend(RabbitmqConstant.USER_TOP_UP_DIRECT_EXCHANGE, routingKey, JSONObject.toJSONString(topUpOrder));
     }
+
+    @Override
+    public void sendPayUavOrder(TopUpOrderVO topUpOrderVO, String routingKey) {
+        log.info("############云享飞pro-商城订单支付-RabbitMQ-Send-##########");
+        log.info("sendPayUavOrder:{},routingKey:{}", JSONObject.toJSONString(topUpOrderVO), routingKey);
+        rabbitTemplate.convertAndSend(RabbitmqConstant.USER_TOP_UP_DIRECT_EXCHANGE, routingKey, JSONObject.toJSONString(topUpOrderVO));
+    }
 }

src/main/java/com/mmc/payment/service/Impl/WechatPayServiceImpl.java

@@ -205,6 +205,10 @@ public class WechatPayServiceImpl implements WechatPayService {
                 // 发送充值成功消息
                 sendTopUpMsg(transaction, 1);
             }
+            if ("PAY_UAV_ORDER".equals(transaction.getAttach()) && "SUCCESS".equals(transaction.getTradeState().toString())) {
+                // 交易成功
+                sendTopUpMsg(transaction, 2);
+            }
         } catch (IOException e) {
             e.printStackTrace();
         }
@@ -224,6 +228,9 @@ public class WechatPayServiceImpl implements WechatPayService {
         if (flag == 1) {
             publishMsg.sendNewTopUpOrder(topUpOrderVO, RabbitmqConstant.USER_TOP_UP_SUCCESS_ROUTING_KEY);
         }
+        if (flag == 2) {
+            publishMsg.sendPayUavOrder(topUpOrderVO, RabbitmqConstant.PAY_UAV_ORDER_SUCCESS_ROUTING_KEY);
+        }
     }
 
     @Override