From 16185c9cf7e1eb1d3a705354c0c3c2d71dc280de Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 29 七月 2024 10:26:05 +0800
Subject: [PATCH] 代理新功能完善
---
src/main/java/com/taoke/autopay/factory/OrderFactory.java | 21 +++++++++++++++++++--
1 files changed, 19 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 f1d5514..bfd4d06 100644
--- a/src/main/java/com/taoke/autopay/factory/OrderFactory.java
+++ b/src/main/java/com/taoke/autopay/factory/OrderFactory.java
@@ -2,13 +2,17 @@
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.utils.Constant;
import com.taoke.autopay.utils.StringUtil;
import com.taoke.autopay.utils.TimeUtil;
-import com.taoke.autopay.vo.AdminOrderVO;
+import com.taoke.autopay.vo.AgentOrderVO;
+import com.taoke.autopay.vo.UserInfoVO;
+import com.taoke.autopay.vo.admin.AdminOrderVO;
import com.taoke.autopay.vo.KeyOrderVO;
-import com.taoke.autopay.vo.OrderFilter;
+
+import java.math.BigDecimal;
/**
* @author hxh
@@ -45,6 +49,19 @@
return vo;
}
+ public static AgentOrderVO createAgentOrder(KeyOrder order, BigDecimal money) {
+
+ String time=TimeUtil.getGernalTime(order.getCreateTime().getTime(), "yyyy.MM.dd HH:mm:ss");
+ time = time.replace(" ","<br>");
+ return AgentOrderVO.builder()
+ .payMoney(order.getOrderMoney().toString())
+ .settleMoney(money.toString())
+ .createTime(time)
+ .valid(order.getPayTime() != null && order.getState() == KeyOrder.STATE_PAY)
+ .user(order.getUser() != null ? UserInfoVO.builder().id(order.getUser().getId()).nickName(order.getUser().getNickName()).portrait(order.getUser().getPortrait()).build() : null)
+ .build();
+ }
+
private static String getOrderStateDesc(Integer orderState, Integer orderType) {
if (orderState == null || orderType == null) {
--
Gitblit v1.8.0