From cc5cf127da76d03ce7086da4d70f34b20e9803e0 Mon Sep 17 00:00:00 2001
From: admin <1101184511@qq.com>
Date: 星期三, 30 七月 2025 01:57:55 +0800
Subject: [PATCH] 功能完善
---
src/main/java/com/taoke/autopay/factory/OrderFactory.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 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..6b65a0d 100644
--- a/src/main/java/com/taoke/autopay/factory/OrderFactory.java
+++ b/src/main/java/com/taoke/autopay/factory/OrderFactory.java
@@ -1,11 +1,13 @@
package com.taoke.autopay.factory;
+import com.google.gson.Gson;
import com.taoke.autopay.entity.ClientInfo;
import com.taoke.autopay.entity.KeyOrder;
import com.taoke.autopay.entity.OrderChannelEnum;
import com.taoke.autopay.entity.WxUserOrderCount;
import com.taoke.autopay.entity.agent.ChannelAgent;
import com.taoke.autopay.utils.Constant;
+import com.taoke.autopay.utils.IPUtil;
import com.taoke.autopay.utils.StringUtil;
import com.taoke.autopay.utils.TimeUtil;
import com.taoke.autopay.utils.order.OrderChannelUtil;
@@ -48,6 +50,7 @@
vo.setState(KeyOrderVO.STATE_PROCESSED);
break;
}
+ vo.setPayType(order.getPayType());
return vo;
}
@@ -64,7 +67,7 @@
.build();
}
- private static String getOrderStateDesc(Integer orderState, Integer orderType) {
+ public static String getOrderStateDesc(Integer orderState, Integer orderType) {
if (orderState == null || orderType == null) {
return "鏈煡";
@@ -110,6 +113,12 @@
vo.setUid(order.getUid());
OrderChannelEnum orderChannel=OrderChannelUtil.getChannelByKey(order.getOrderChannel());
vo.setOrderChannel(orderChannel==null?"鏈煡":orderChannel.getName());
+ vo.setPayMerchant(order.getPayMerchant());
+ vo.setIp(order.getIp());
+ vo.setIgnore(order.getIgnore());
+ if(!StringUtil.isNullOrEmpty(order.getIpInfo())){
+ vo.setIpInfo(new Gson().fromJson(order.getIpInfo(), IPUtil.IPInfo.class));
+ }
if(agent!=null){
vo.setAgent(agent.getName());
}else{
@@ -120,7 +129,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