From 65aaf1c05bd06cefa82ebc40cc3e01cf4ac233c0 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 27 七月 2024 13:52:08 +0800
Subject: [PATCH] 代理新功能完善
---
src/main/java/com/taoke/autopay/factory/OrderFactory.java | 76 ++++++++++++++++++++++++++++++++++++--
1 files changed, 72 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/taoke/autopay/factory/OrderFactory.java b/src/main/java/com/taoke/autopay/factory/OrderFactory.java
index 00c0c71..ebd1b36 100644
--- a/src/main/java/com/taoke/autopay/factory/OrderFactory.java
+++ b/src/main/java/com/taoke/autopay/factory/OrderFactory.java
@@ -1,10 +1,13 @@
package com.taoke.autopay.factory;
+import com.taoke.autopay.entity.ClientInfo;
import com.taoke.autopay.entity.KeyOrder;
+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.admin.AdminOrderVO;
import com.taoke.autopay.vo.KeyOrderVO;
-import com.taoke.autopay.vo.OrderFilter;
/**
* @author hxh
@@ -19,12 +22,12 @@
return StringUtil.Md5(day + key);
}
- public static KeyOrderVO create(KeyOrder order){
- KeyOrderVO vo=new KeyOrderVO();
+ public static KeyOrderVO create(KeyOrder order) {
+ KeyOrderVO vo = new KeyOrderVO();
vo.setCreateTime(order.getCreateTime());
vo.setId(order.getId());
vo.setKey(order.getKey());
- switch (order.getState()){
+ switch (order.getState()) {
case KeyOrder.STATE_NOT_PROCESS:
vo.setState(KeyOrderVO.STATE_NOT_PROCESS);
break;
@@ -41,4 +44,69 @@
return vo;
}
+ private static String getOrderStateDesc(Integer orderState, Integer orderType) {
+
+ if (orderState == null || orderType == null) {
+ return "鏈煡";
+ }
+ if (orderType == Constant.ORDER_TYPE_DY) {
+// 1 寰呯‘璁�/寰呮敮浠�-璁㈠崟鍒涘缓瀹屾瘯:105-宸叉敮浠�;2-澶囪揣涓�;101-閮ㄥ垎鍙戣揣;3-宸插彂璐�(鍏ㄩ儴鍙戣揣):4-宸插彇娑�:5 宸插畬鎴�(宸叉敹璐�);
+
+ switch (orderState) {
+ case 1:
+ return "寰呯‘璁�/寰呮敮浠�";
+ case 105:
+ return "宸叉敮浠�";
+ case 2:
+ return "澶囪揣涓�";
+ case 101:
+ return "宸插彂璐�(鍏ㄩ儴鍙戣揣)";
+ case 4:
+ return "宸插彇娑�";
+ case 5:
+ return " 宸插畬鎴�(宸叉敹璐�);";
+ default:
+ return "鐘舵�佺爜锛�" + orderState;
+ }
+ }
+ return "鏈煡";
+
+ }
+
+ public static AdminOrderVO createAdminVO(KeyOrder order, ClientInfo info) {
+ AdminOrderVO vo = new AdminOrderVO();
+ vo.setCreateTime(order.getCreateTime());
+ vo.setId(order.getId());
+ vo.setKey(order.getKey());
+ switch (order.getState()) {
+ case KeyOrder.STATE_NOT_PROCESS:
+ vo.setState(KeyOrderVO.STATE_NOT_PROCESS);
+ break;
+ case KeyOrder.STATE_NOT_PAY:
+ vo.setState(KeyOrderVO.STATE_PROCESS_ERROR);
+ break;
+ case KeyOrder.STATE_PAY:
+ vo.setState(KeyOrderVO.STATE_PROCESSED);
+ break;
+ case KeyOrder.STATE_REJECT_PAY:
+ vo.setState(KeyOrderVO.STATE_PROCESSED);
+ break;
+ }
+ vo.setStateDesc(order.getStateDesc());
+ vo.setOrderStateDesc(getOrderStateDesc(order.getOrderState(), order.getOrderType()));
+ vo.setExcutePayTime(order.getExcutePayTime());
+ vo.setPayTime(order.getPayTime());
+ vo.setOrderNo(order.getOrderNo());
+ vo.setOrderType(order.getOrderType());
+ vo.setDistributedTime(order.getDistributeTime());
+ vo.setDistributedClientInfo(info);
+ vo.setUid(order.getUid());
+ return vo;
+ }
+
+ public static String createId(WxUserOrderCount orderCountInfo) {
+ return String.format("%s-%s-%s", orderCountInfo.getDay(), orderCountInfo.getUid(), orderCountInfo.getOrderType());
+ }
+
+
}
--
Gitblit v1.8.0