From 17caebabf7a6a529b7039c71e21e5a324e31ea20 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 27 九月 2024 16:23:42 +0800
Subject: [PATCH] 代理新功能完善

---
 src/main/java/com/taoke/autopay/factory/OrderFactory.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/taoke/autopay/factory/OrderFactory.java b/src/main/java/com/taoke/autopay/factory/OrderFactory.java
index 751efc8..21b4df4 100644
--- a/src/main/java/com/taoke/autopay/factory/OrderFactory.java
+++ b/src/main/java/com/taoke/autopay/factory/OrderFactory.java
@@ -48,6 +48,7 @@
                 vo.setState(KeyOrderVO.STATE_PROCESSED);
                 break;
         }
+        vo.setPayType(order.getPayType());
         return vo;
     }
 
@@ -110,6 +111,7 @@
         vo.setUid(order.getUid());
         OrderChannelEnum orderChannel=OrderChannelUtil.getChannelByKey(order.getOrderChannel());
         vo.setOrderChannel(orderChannel==null?"鏈煡":orderChannel.getName());
+        vo.setPayMerchant(order.getPayMerchant());
         if(agent!=null){
             vo.setAgent(agent.getName());
         }else{
@@ -120,7 +122,7 @@
     }
 
     public static String createId(WxUserOrderCount orderCountInfo) {
-        return String.format("%s-%s-%s", orderCountInfo.getDay(), orderCountInfo.getUid(), orderCountInfo.getOrderType());
+        return String.format("%s-%s-%s-%s", orderCountInfo.getDay(), orderCountInfo.getUid(), orderCountInfo.getOrderType(),orderCountInfo.getOrderChannel()==null?"": orderCountInfo.getOrderChannel().name());
     }
 
 

--
Gitblit v1.8.0