fanli-server.git

parent: 4995469a | 补丁 | 提交 | show whitespace

admin

2024-10-16 62a447d89331aee1feae7724c7616aa1bb2cfe79

将CMQ替换为rabbitmq

16个文件已修改

	fanli/src/main/java/com/yeshi/fanli/controller/admin/UploadController.java	44 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/job/order/jd/UpdateJDOrderJob.java	32 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/job/order/pdd/UpdatePDDOrderJob.java	22 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/job/order/suning/UpdateSuningOrderJob.java	22 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/job/order/taobao/UpdateOrderJob.java	29 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/util/mq/rabbit/RabbitDelayConsumeFailConsumer.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/util/mq/rabbit/RabbitDelayConsumer.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/util/mq/rabbit/consumer/ExtractResultListener.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/util/mq/rabbit/consumer/FanliOrderListener.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/util/mq/rabbit/consumer/FanliOrderNewListener.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/util/mq/rabbit/consumer/FanliShareOrderListener.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/util/mq/rabbit/consumer/OrderJDListener.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/util/mq/rabbit/consumer/OrderPDDListener.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/util/mq/rabbit/consumer/OrderVIPShopListener.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/util/mq/rabbit/consumer/PushIosListener.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/util/mq/rabbit/consumer/WeiquanOrderListener.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 fanli/src/main/java/com/yeshi/fanli/controller/admin/UploadController.java

@@ -1,17 +1,16 @@
package com.yeshi.fanli.controller.admin;

import java.io.IOException;
import java.io.InputStream;
import java.io.PrintWriter;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.UUID;

import javax.annotation.Resource;

import com.yeshi.fanli.entity.accept.AdminAcceptData;
import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.AdminUserService;
import com.yeshi.fanli.service.inter.order.OrderProcessService;
import com.yeshi.fanli.service.inter.order.OrderService;
import com.yeshi.fanli.service.inter.order.tb.TaoBaoOrderService;
import com.yeshi.fanli.util.*;
import com.yeshi.fanli.util.mq.rabbit.RabbitmqManager;
import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;
import net.sf.json.JSONObject;
import org.springframework.core.task.TaskExecutor;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -19,24 +18,17 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.multipart.commons.CommonsMultipartFile;
import org.yeshi.utils.JsonUtil;
import org.yeshi.utils.TimeUtil;
import org.yeshi.utils.tencentcloud.COSManager;

import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.AdminUserService;
import com.yeshi.fanli.service.inter.order.OrderProcessService;
import com.yeshi.fanli.service.inter.order.OrderService;
import com.yeshi.fanli.service.inter.order.tb.TaoBaoOrderService;
import com.yeshi.fanli.util.CMQManager;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.FilePathEnum;
import com.yeshi.fanli.util.RedisKeyEnum;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
import org.yeshi.utils.TimeUtil;
import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;

import net.sf.json.JSONObject;
import javax.annotation.Resource;
import java.io.IOException;
import java.io.InputStream;
import java.io.PrintWriter;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.UUID;

@Controller
@RequestMapping("admin/new/api/v1/upload")

 fanli/src/main/java/com/yeshi/fanli/job/order/jd/UpdateJDOrderJob.java

@@ -1,34 +1,30 @@
package com.yeshi.fanli.job.order.jd;

import java.util.*;

import javax.annotation.Resource;

import com.yeshi.fanli.dao.jd.JDOrderBackUpDao;
import com.yeshi.fanli.dto.jd.JDOrderForBackUpResult;
import com.yeshi.fanli.dto.mq.order.body.CommonOrderMQMsg;
import com.yeshi.fanli.entity.jd.JDBackUpOrder;
import com.yeshi.fanli.entity.order.CommonOrder;
import com.yeshi.fanli.service.inter.order.CommonOrderService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.annotation.JobMonitor;
import com.yeshi.fanli.util.mq.cmq.order.OrdersCMQManager;
import com.yeshi.fanli.util.mq.rabbit.RabbitmqManager;
import org.springframework.stereotype.Component;

import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.handler.annotation.XxlJob;
import com.yeshi.fanli.dao.jd.JDOrderBackUpDao;
import com.yeshi.fanli.dto.jd.JDOrderForBackUpResult;
import com.yeshi.fanli.dto.jd.JDOrderResult;
import com.yeshi.fanli.dto.mq.order.body.CommonOrderMQMsg;
import com.yeshi.fanli.entity.jd.JDBackUpOrder;
import com.yeshi.fanli.entity.jd.JDOrder;
import com.yeshi.fanli.entity.order.CommonOrder;
import com.yeshi.fanli.exception.jd.JDOrderException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.order.CommonOrderService;
import com.yeshi.fanli.service.inter.order.jd.JDOrderService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.RedisKeyEnum;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
import org.yeshi.utils.TimeUtil;
import com.yeshi.fanli.util.annotation.JobMonitor;
import com.yeshi.fanli.util.jd.JDApiUtil;
import com.yeshi.fanli.util.mq.cmq.order.JDOrderCMQManager;
import com.yeshi.fanli.util.mq.cmq.order.OrdersCMQManager;
import org.springframework.stereotype.Component;
import org.yeshi.utils.TimeUtil;

import javax.annotation.Resource;
import java.util.*;

//从淘宝爬去订单更新
@Component

 fanli/src/main/java/com/yeshi/fanli/job/order/pdd/UpdatePDDOrderJob.java

@@ -1,27 +1,23 @@
package com.yeshi.fanli.job.order.pdd;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;

import javax.annotation.Resource;

import com.yeshi.fanli.dto.mq.order.body.CommonOrderMQMsg;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.mq.cmq.order.OrdersCMQManager;
import com.yeshi.fanli.util.mq.rabbit.RabbitmqManager;
import org.springframework.stereotype.Component;

import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.handler.annotation.XxlJob;
import com.yeshi.fanli.dto.mq.order.body.CommonOrderMQMsg;
import com.yeshi.fanli.dto.pdd.PDDOrderResult;
import com.yeshi.fanli.entity.pdd.PDDOrder;
import com.yeshi.fanli.exception.pdd.PDDOrderException;
import com.yeshi.fanli.service.inter.order.pdd.PDDOrderService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.RedisKeyEnum;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.mq.cmq.order.PDDOrderCMQManager;
import com.yeshi.fanli.util.mq.cmq.order.OrdersCMQManager;
import com.yeshi.fanli.util.pinduoduo.PinDuoDuoApiUtil;
import org.springframework.stereotype.Component;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;

//从淘宝爬去订单更新
@Component

 fanli/src/main/java/com/yeshi/fanli/job/order/suning/UpdateSuningOrderJob.java

@@ -1,28 +1,24 @@
package com.yeshi.fanli.job.order.suning;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;

import javax.annotation.Resource;

import com.yeshi.fanli.dto.mq.order.body.CommonOrderMQMsg;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.mq.cmq.order.OrdersCMQManager;
import com.yeshi.fanli.util.mq.rabbit.RabbitmqManager;
import org.springframework.stereotype.Component;

import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.handler.annotation.XxlJob;
import com.yeshi.fanli.dto.mq.order.body.CommonOrderMQMsg;
import com.yeshi.fanli.dto.suning.SuningOrderQueryResultDTO;
import com.yeshi.fanli.entity.suning.SuningOrderInfo;
import com.yeshi.fanli.exception.suning.SuningOrderException;
import com.yeshi.fanli.service.inter.order.suning.SuningOrderService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.RedisKeyEnum;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.mq.cmq.order.SuningOrderCMQManager;
import com.yeshi.fanli.util.mq.cmq.order.OrdersCMQManager;
import com.yeshi.fanli.util.suning.SuningApiUtil;
import org.springframework.stereotype.Component;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;

//从淘宝爬去订单更新
@Component

 fanli/src/main/java/com/yeshi/fanli/job/order/taobao/UpdateOrderJob.java

@@ -1,21 +1,5 @@
package com.yeshi.fanli.job.order.taobao;

import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;

import javax.annotation.Resource;

import com.yeshi.fanli.util.mq.rabbit.RabbitmqManager;
import org.springframework.stereotype.Component;

import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.handler.annotation.XxlJob;
import com.yeshi.fanli.dto.taobao.WeiQuanOrderResult;
@@ -25,24 +9,25 @@
import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.common.DataMonitorService;
import com.yeshi.fanli.service.inter.order.CommonOrderService;
import com.yeshi.fanli.service.inter.order.LostOrderService;
import com.yeshi.fanli.service.inter.order.OrderMoneySettleService;
import com.yeshi.fanli.service.inter.order.OrderProcessService;
import com.yeshi.fanli.service.inter.order.OrderService;
import com.yeshi.fanli.service.inter.order.tb.TaoBaoOrderService;
import com.yeshi.fanli.service.inter.order.tb.TaoBaoWeiQuanOrderService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
import com.yeshi.fanli.util.CMQManager;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.RedisKeyEnum;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
import org.yeshi.utils.TimeUtil;
import com.yeshi.fanli.util.mq.rabbit.RabbitmqManager;
import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import com.yeshi.fanli.util.taobao.TaoKeOrderApiUtil;
import org.springframework.stereotype.Component;
import org.yeshi.utils.TimeUtil;

import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.*;

//从淘宝爬去订单更新
@Component

 fanli/src/main/java/com/yeshi/fanli/util/mq/rabbit/RabbitDelayConsumeFailConsumer.java

@@ -20,7 +20,7 @@
/**
 * @author hxh
 * @title: RabbitDelayConsumer
 * @description: TODO
 * @description: 消费重试队列处理
 * @date 2024/10/12 11:21
 */
@Component

 fanli/src/main/java/com/yeshi/fanli/util/mq/rabbit/RabbitDelayConsumer.java

@@ -16,7 +16,7 @@
/**
 * @author hxh
 * @title: RabbitDelayConsumer
 * @description:
 * @description: 延时队列消费处理
 * @date 2024/10/12 11:21
 */
@Component

 fanli/src/main/java/com/yeshi/fanli/util/mq/rabbit/consumer/ExtractResultListener.java

@@ -5,21 +5,15 @@
import com.yeshi.fanli.entity.bus.user.AlipayTransferResultInfo;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.money.extract.ExtractService;
import com.yeshi.fanli.util.CMQManager;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.mq.rabbit.RabbitmqMsgConsumeUtil;
import org.springframework.amqp.core.Message;
import org.springframework.amqp.core.MessageListener;
import org.springframework.amqp.rabbit.annotation.RabbitListener;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.stereotype.Component;
import org.yeshi.utils.TimeUtil;

import javax.annotation.Resource;
import java.io.UnsupportedEncodingException;
import java.nio.charset.StandardCharsets;
import java.util.Iterator;
import java.util.Map;

/**
 * @author hxh

 fanli/src/main/java/com/yeshi/fanli/util/mq/rabbit/consumer/FanliOrderListener.java

@@ -5,17 +5,14 @@
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.order.OrderProcessService;
import com.yeshi.fanli.service.inter.order.tb.TaoBaoOrderService;
import com.yeshi.fanli.util.CMQManager;
import com.yeshi.fanli.util.mq.rabbit.RabbitmqMsgConsumeUtil;
import org.springframework.amqp.core.Message;
import org.springframework.amqp.core.MessageListener;
import org.springframework.amqp.rabbit.annotation.RabbitListener;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.stereotype.Component;
import org.yeshi.utils.NumberUtil;

import javax.annotation.Resource;
import java.io.UnsupportedEncodingException;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.List;

 fanli/src/main/java/com/yeshi/fanli/util/mq/rabbit/consumer/FanliOrderNewListener.java

@@ -6,22 +6,17 @@
import com.yeshi.fanli.exception.order.TaoBaoWeiQuanException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.order.OrderProcessService;
import com.yeshi.fanli.util.CMQManager;
import com.yeshi.fanli.util.RedisKeyEnum;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.mq.rabbit.RabbitmqMsgConsumeUtil;
import org.springframework.amqp.core.Message;
import org.springframework.amqp.core.MessageListener;
import org.springframework.amqp.rabbit.annotation.RabbitListener;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.stereotype.Component;

import javax.annotation.Resource;
import java.io.UnsupportedEncodingException;
import java.nio.charset.StandardCharsets;
import java.util.Iterator;
import java.util.Map;

/**
 * @author hxh

 fanli/src/main/java/com/yeshi/fanli/util/mq/rabbit/consumer/FanliShareOrderListener.java

@@ -5,16 +5,13 @@
import com.yeshi.fanli.dto.mq.UidDateDTO;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.order.OrderProcessService;
import com.yeshi.fanli.util.CMQManager;
import com.yeshi.fanli.util.mq.rabbit.RabbitmqMsgConsumeUtil;
import org.springframework.amqp.core.Message;
import org.springframework.amqp.core.MessageListener;
import org.springframework.amqp.rabbit.annotation.RabbitListener;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.stereotype.Component;

import javax.annotation.Resource;
import java.io.UnsupportedEncodingException;
import java.nio.charset.StandardCharsets;

/**

 fanli/src/main/java/com/yeshi/fanli/util/mq/rabbit/consumer/OrderJDListener.java

@@ -6,16 +6,13 @@
import com.yeshi.fanli.service.inter.order.OrderProcessService;
import com.yeshi.fanli.service.inter.order.jd.JDOrderService;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.mq.cmq.order.JDOrderCMQManager;
import com.yeshi.fanli.util.mq.rabbit.RabbitmqMsgConsumeUtil;
import org.springframework.amqp.core.Message;
import org.springframework.amqp.core.MessageListener;
import org.springframework.amqp.rabbit.annotation.RabbitListener;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.stereotype.Component;

import javax.annotation.Resource;
import java.io.UnsupportedEncodingException;
import java.nio.charset.StandardCharsets;

/**

 fanli/src/main/java/com/yeshi/fanli/util/mq/rabbit/consumer/OrderPDDListener.java

@@ -6,16 +6,13 @@
import com.yeshi.fanli.service.inter.order.OrderProcessService;
import com.yeshi.fanli.service.inter.order.pdd.PDDOrderService;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.mq.cmq.order.PDDOrderCMQManager;
import com.yeshi.fanli.util.mq.rabbit.RabbitmqMsgConsumeUtil;
import org.springframework.amqp.core.Message;
import org.springframework.amqp.core.MessageListener;
import org.springframework.amqp.rabbit.annotation.RabbitListener;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.stereotype.Component;

import javax.annotation.Resource;
import java.io.UnsupportedEncodingException;
import java.nio.charset.StandardCharsets;
import java.util.List;


 fanli/src/main/java/com/yeshi/fanli/util/mq/rabbit/consumer/OrderVIPShopListener.java

@@ -6,16 +6,13 @@
import com.yeshi.fanli.service.inter.order.OrderProcessService;
import com.yeshi.fanli.service.inter.order.vipshop.VipShopOrderService;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.mq.cmq.order.VipShopOrderCMQManager;
import com.yeshi.fanli.util.mq.rabbit.RabbitmqMsgConsumeUtil;
import org.springframework.amqp.core.Message;
import org.springframework.amqp.core.MessageListener;
import org.springframework.amqp.rabbit.annotation.RabbitListener;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.stereotype.Component;

import javax.annotation.Resource;
import java.io.UnsupportedEncodingException;
import java.nio.charset.StandardCharsets;
import java.util.List;


 fanli/src/main/java/com/yeshi/fanli/util/mq/rabbit/consumer/PushIosListener.java

@@ -5,20 +5,15 @@
import com.yeshi.fanli.entity.push.PushQueueRecord;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.push.IOSPushService;
import com.yeshi.fanli.util.CMQManager;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.mq.rabbit.RabbitmqMsgConsumeUtil;
import org.springframework.amqp.core.Message;
import org.springframework.amqp.core.MessageListener;
import org.springframework.amqp.rabbit.annotation.RabbitListener;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.stereotype.Component;

import javax.annotation.Resource;
import java.io.UnsupportedEncodingException;
import java.nio.charset.StandardCharsets;
import java.util.Iterator;
import java.util.Map;

/**
 * @author hxh

 fanli/src/main/java/com/yeshi/fanli/util/mq/rabbit/consumer/WeiquanOrderListener.java

@@ -5,20 +5,15 @@
import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.order.OrderProcessService;
import com.yeshi.fanli.util.CMQManager;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.mq.rabbit.RabbitmqMsgConsumeUtil;
import org.springframework.amqp.core.Message;
import org.springframework.amqp.core.MessageListener;
import org.springframework.amqp.rabbit.annotation.RabbitListener;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.stereotype.Component;

import javax.annotation.Resource;
import java.io.UnsupportedEncodingException;
import java.nio.charset.StandardCharsets;
import java.util.Iterator;
import java.util.Map;

/**
 * @author hxh

			@@ -1,17 +1,16 @@
			package com.yeshi.fanli.controller.admin;

			import java.io.IOException;
			import java.io.InputStream;
			import java.io.PrintWriter;
			import java.util.Iterator;
			import java.util.List;
			import java.util.Map;
			import java.util.UUID;

			import javax.annotation.Resource;

			import com.yeshi.fanli.entity.accept.AdminAcceptData;
			import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
			import com.yeshi.fanli.log.LogHelper;
			import com.yeshi.fanli.service.AdminUserService;
			import com.yeshi.fanli.service.inter.order.OrderProcessService;
			import com.yeshi.fanli.service.inter.order.OrderService;
			import com.yeshi.fanli.service.inter.order.tb.TaoBaoOrderService;
			import com.yeshi.fanli.util.*;
			import com.yeshi.fanli.util.mq.rabbit.RabbitmqManager;
			import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;
			import net.sf.json.JSONObject;
			import org.springframework.core.task.TaskExecutor;
			import org.springframework.stereotype.Controller;
			import org.springframework.web.bind.annotation.RequestMapping;
			@@ -19,24 +18,17 @@
			import org.springframework.web.bind.annotation.RequestParam;
			import org.springframework.web.multipart.commons.CommonsMultipartFile;
			import org.yeshi.utils.JsonUtil;
			import org.yeshi.utils.TimeUtil;
			import org.yeshi.utils.tencentcloud.COSManager;

			import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
			import com.yeshi.fanli.log.LogHelper;
			import com.yeshi.fanli.service.AdminUserService;
			import com.yeshi.fanli.service.inter.order.OrderProcessService;
			import com.yeshi.fanli.service.inter.order.OrderService;
			import com.yeshi.fanli.service.inter.order.tb.TaoBaoOrderService;
			import com.yeshi.fanli.util.CMQManager;
			import com.yeshi.fanli.util.Constant;
			import com.yeshi.fanli.util.FilePathEnum;
			import com.yeshi.fanli.util.RedisKeyEnum;
			import com.yeshi.fanli.util.RedisManager;
			import com.yeshi.fanli.util.StringUtil;
			import org.yeshi.utils.TimeUtil;
			import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;

			import net.sf.json.JSONObject;
			import javax.annotation.Resource;
			import java.io.IOException;
			import java.io.InputStream;
			import java.io.PrintWriter;
			import java.util.Iterator;
			import java.util.List;
			import java.util.Map;
			import java.util.UUID;

			@Controller
			@RequestMapping("admin/new/api/v1/upload")

			@@ -1,34 +1,30 @@
			package com.yeshi.fanli.job.order.jd;

			import java.util.*;

			import javax.annotation.Resource;

			import com.yeshi.fanli.dao.jd.JDOrderBackUpDao;
			import com.yeshi.fanli.dto.jd.JDOrderForBackUpResult;
			import com.yeshi.fanli.dto.mq.order.body.CommonOrderMQMsg;
			import com.yeshi.fanli.entity.jd.JDBackUpOrder;
			import com.yeshi.fanli.entity.order.CommonOrder;
			import com.yeshi.fanli.service.inter.order.CommonOrderService;
			import com.yeshi.fanli.util.Constant;
			import com.yeshi.fanli.util.annotation.JobMonitor;
			import com.yeshi.fanli.util.mq.cmq.order.OrdersCMQManager;
			import com.yeshi.fanli.util.mq.rabbit.RabbitmqManager;
			import org.springframework.stereotype.Component;

			import com.xxl.job.core.biz.model.ReturnT;
			import com.xxl.job.core.handler.annotation.XxlJob;
			import com.yeshi.fanli.dao.jd.JDOrderBackUpDao;
			import com.yeshi.fanli.dto.jd.JDOrderForBackUpResult;
			import com.yeshi.fanli.dto.jd.JDOrderResult;
			import com.yeshi.fanli.dto.mq.order.body.CommonOrderMQMsg;
			import com.yeshi.fanli.entity.jd.JDBackUpOrder;
			import com.yeshi.fanli.entity.jd.JDOrder;
			import com.yeshi.fanli.entity.order.CommonOrder;
			import com.yeshi.fanli.exception.jd.JDOrderException;
			import com.yeshi.fanli.log.LogHelper;
			import com.yeshi.fanli.service.inter.order.CommonOrderService;
			import com.yeshi.fanli.service.inter.order.jd.JDOrderService;
			import com.yeshi.fanli.util.Constant;
			import com.yeshi.fanli.util.RedisKeyEnum;
			import com.yeshi.fanli.util.RedisManager;
			import com.yeshi.fanli.util.StringUtil;
			import org.yeshi.utils.TimeUtil;
			import com.yeshi.fanli.util.annotation.JobMonitor;
			import com.yeshi.fanli.util.jd.JDApiUtil;
			import com.yeshi.fanli.util.mq.cmq.order.JDOrderCMQManager;
			import com.yeshi.fanli.util.mq.cmq.order.OrdersCMQManager;
			import org.springframework.stereotype.Component;
			import org.yeshi.utils.TimeUtil;

			import javax.annotation.Resource;
			import java.util.*;

			//从淘宝爬去订单更新
			@Component

			@@ -1,27 +1,23 @@
			package com.yeshi.fanli.job.order.pdd;

			import java.util.ArrayList;
			import java.util.Date;
			import java.util.List;

			import javax.annotation.Resource;

			import com.yeshi.fanli.dto.mq.order.body.CommonOrderMQMsg;
			import com.yeshi.fanli.util.Constant;
			import com.yeshi.fanli.util.mq.cmq.order.OrdersCMQManager;
			import com.yeshi.fanli.util.mq.rabbit.RabbitmqManager;
			import org.springframework.stereotype.Component;

			import com.xxl.job.core.biz.model.ReturnT;
			import com.xxl.job.core.handler.annotation.XxlJob;
			import com.yeshi.fanli.dto.mq.order.body.CommonOrderMQMsg;
			import com.yeshi.fanli.dto.pdd.PDDOrderResult;
			import com.yeshi.fanli.entity.pdd.PDDOrder;
			import com.yeshi.fanli.exception.pdd.PDDOrderException;
			import com.yeshi.fanli.service.inter.order.pdd.PDDOrderService;
			import com.yeshi.fanli.util.Constant;
			import com.yeshi.fanli.util.RedisKeyEnum;
			import com.yeshi.fanli.util.RedisManager;
			import com.yeshi.fanli.util.mq.cmq.order.PDDOrderCMQManager;
			import com.yeshi.fanli.util.mq.cmq.order.OrdersCMQManager;
			import com.yeshi.fanli.util.pinduoduo.PinDuoDuoApiUtil;
			import org.springframework.stereotype.Component;

			import javax.annotation.Resource;
			import java.util.ArrayList;
			import java.util.Date;
			import java.util.List;

			//从淘宝爬去订单更新
			@Component

			@@ -1,28 +1,24 @@
			package com.yeshi.fanli.job.order.suning;

			import java.util.ArrayList;
			import java.util.Date;
			import java.util.List;

			import javax.annotation.Resource;

			import com.yeshi.fanli.dto.mq.order.body.CommonOrderMQMsg;
			import com.yeshi.fanli.util.Constant;
			import com.yeshi.fanli.util.mq.cmq.order.OrdersCMQManager;
			import com.yeshi.fanli.util.mq.rabbit.RabbitmqManager;
			import org.springframework.stereotype.Component;

			import com.xxl.job.core.biz.model.ReturnT;
			import com.xxl.job.core.handler.annotation.XxlJob;
			import com.yeshi.fanli.dto.mq.order.body.CommonOrderMQMsg;
			import com.yeshi.fanli.dto.suning.SuningOrderQueryResultDTO;
			import com.yeshi.fanli.entity.suning.SuningOrderInfo;
			import com.yeshi.fanli.exception.suning.SuningOrderException;
			import com.yeshi.fanli.service.inter.order.suning.SuningOrderService;
			import com.yeshi.fanli.util.Constant;
			import com.yeshi.fanli.util.RedisKeyEnum;
			import com.yeshi.fanli.util.RedisManager;
			import com.yeshi.fanli.util.StringUtil;
			import com.yeshi.fanli.util.mq.cmq.order.SuningOrderCMQManager;
			import com.yeshi.fanli.util.mq.cmq.order.OrdersCMQManager;
			import com.yeshi.fanli.util.suning.SuningApiUtil;
			import org.springframework.stereotype.Component;

			import javax.annotation.Resource;
			import java.util.ArrayList;
			import java.util.Date;
			import java.util.List;

			//从淘宝爬去订单更新
			@Component

			@@ -1,21 +1,5 @@
			package com.yeshi.fanli.job.order.taobao;

			import java.math.BigDecimal;
			import java.util.ArrayList;
			import java.util.Calendar;
			import java.util.Date;
			import java.util.HashMap;
			import java.util.HashSet;
			import java.util.Iterator;
			import java.util.List;
			import java.util.Map;
			import java.util.Set;

			import javax.annotation.Resource;

			import com.yeshi.fanli.util.mq.rabbit.RabbitmqManager;
			import org.springframework.stereotype.Component;

			import com.xxl.job.core.biz.model.ReturnT;
			import com.xxl.job.core.handler.annotation.XxlJob;
			import com.yeshi.fanli.dto.taobao.WeiQuanOrderResult;
			@@ -25,24 +9,25 @@
			import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
			import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;
			import com.yeshi.fanli.log.LogHelper;
			import com.yeshi.fanli.service.inter.common.DataMonitorService;
			import com.yeshi.fanli.service.inter.order.CommonOrderService;
			import com.yeshi.fanli.service.inter.order.LostOrderService;
			import com.yeshi.fanli.service.inter.order.OrderMoneySettleService;
			import com.yeshi.fanli.service.inter.order.OrderProcessService;
			import com.yeshi.fanli.service.inter.order.OrderService;
			import com.yeshi.fanli.service.inter.order.tb.TaoBaoOrderService;
			import com.yeshi.fanli.service.inter.order.tb.TaoBaoWeiQuanOrderService;
			import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
			import com.yeshi.fanli.util.CMQManager;
			import com.yeshi.fanli.util.Constant;
			import com.yeshi.fanli.util.RedisKeyEnum;
			import com.yeshi.fanli.util.RedisManager;
			import com.yeshi.fanli.util.StringUtil;
			import org.yeshi.utils.TimeUtil;
			import com.yeshi.fanli.util.mq.rabbit.RabbitmqManager;
			import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;
			import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
			import com.yeshi.fanli.util.taobao.TaoKeOrderApiUtil;
			import org.springframework.stereotype.Component;
			import org.yeshi.utils.TimeUtil;

			import javax.annotation.Resource;
			import java.math.BigDecimal;
			import java.util.*;

			//从淘宝爬去订单更新
			@Component

			@@ -20,7 +20,7 @@
			/**
			* @author hxh
			* @title: RabbitDelayConsumer
			* @description: TODO
			* @description: 消费重试队列处理
			* @date 2024/10/12 11:21
			*/
			@Component

			@@ -16,7 +16,7 @@
			/**
			* @author hxh
			* @title: RabbitDelayConsumer
			* @description:
			* @description: 延时队列消费处理
			* @date 2024/10/12 11:21
			*/
			@Component

			@@ -5,21 +5,15 @@
			import com.yeshi.fanli.entity.bus.user.AlipayTransferResultInfo;
			import com.yeshi.fanli.log.LogHelper;
			import com.yeshi.fanli.service.inter.money.extract.ExtractService;
			import com.yeshi.fanli.util.CMQManager;
			import com.yeshi.fanli.util.StringUtil;
			import com.yeshi.fanli.util.mq.rabbit.RabbitmqMsgConsumeUtil;
			import org.springframework.amqp.core.Message;
			import org.springframework.amqp.core.MessageListener;
			import org.springframework.amqp.rabbit.annotation.RabbitListener;
			import org.springframework.amqp.rabbit.core.RabbitTemplate;
			import org.springframework.stereotype.Component;
			import org.yeshi.utils.TimeUtil;

			import javax.annotation.Resource;
			import java.io.UnsupportedEncodingException;
			import java.nio.charset.StandardCharsets;
			import java.util.Iterator;
			import java.util.Map;

			/**
			* @author hxh

			@@ -5,17 +5,14 @@
			import com.yeshi.fanli.log.LogHelper;
			import com.yeshi.fanli.service.inter.order.OrderProcessService;
			import com.yeshi.fanli.service.inter.order.tb.TaoBaoOrderService;
			import com.yeshi.fanli.util.CMQManager;
			import com.yeshi.fanli.util.mq.rabbit.RabbitmqMsgConsumeUtil;
			import org.springframework.amqp.core.Message;
			import org.springframework.amqp.core.MessageListener;
			import org.springframework.amqp.rabbit.annotation.RabbitListener;
			import org.springframework.amqp.rabbit.core.RabbitTemplate;
			import org.springframework.stereotype.Component;
			import org.yeshi.utils.NumberUtil;

			import javax.annotation.Resource;
			import java.io.UnsupportedEncodingException;
			import java.nio.charset.StandardCharsets;
			import java.util.HashMap;
			import java.util.List;

			@@ -6,22 +6,17 @@
			import com.yeshi.fanli.exception.order.TaoBaoWeiQuanException;
			import com.yeshi.fanli.log.LogHelper;
			import com.yeshi.fanli.service.inter.order.OrderProcessService;
			import com.yeshi.fanli.util.CMQManager;
			import com.yeshi.fanli.util.RedisKeyEnum;
			import com.yeshi.fanli.util.RedisManager;
			import com.yeshi.fanli.util.StringUtil;
			import com.yeshi.fanli.util.mq.rabbit.RabbitmqMsgConsumeUtil;
			import org.springframework.amqp.core.Message;
			import org.springframework.amqp.core.MessageListener;
			import org.springframework.amqp.rabbit.annotation.RabbitListener;
			import org.springframework.amqp.rabbit.core.RabbitTemplate;
			import org.springframework.stereotype.Component;

			import javax.annotation.Resource;
			import java.io.UnsupportedEncodingException;
			import java.nio.charset.StandardCharsets;
			import java.util.Iterator;
			import java.util.Map;

			/**
			* @author hxh

			@@ -5,16 +5,13 @@
			import com.yeshi.fanli.dto.mq.UidDateDTO;
			import com.yeshi.fanli.log.LogHelper;
			import com.yeshi.fanli.service.inter.order.OrderProcessService;
			import com.yeshi.fanli.util.CMQManager;
			import com.yeshi.fanli.util.mq.rabbit.RabbitmqMsgConsumeUtil;
			import org.springframework.amqp.core.Message;
			import org.springframework.amqp.core.MessageListener;
			import org.springframework.amqp.rabbit.annotation.RabbitListener;
			import org.springframework.amqp.rabbit.core.RabbitTemplate;
			import org.springframework.stereotype.Component;

			import javax.annotation.Resource;
			import java.io.UnsupportedEncodingException;
			import java.nio.charset.StandardCharsets;

			/**

			@@ -6,16 +6,13 @@
			import com.yeshi.fanli.service.inter.order.OrderProcessService;
			import com.yeshi.fanli.service.inter.order.jd.JDOrderService;
			import com.yeshi.fanli.util.StringUtil;
			import com.yeshi.fanli.util.mq.cmq.order.JDOrderCMQManager;
			import com.yeshi.fanli.util.mq.rabbit.RabbitmqMsgConsumeUtil;
			import org.springframework.amqp.core.Message;
			import org.springframework.amqp.core.MessageListener;
			import org.springframework.amqp.rabbit.annotation.RabbitListener;
			import org.springframework.amqp.rabbit.core.RabbitTemplate;
			import org.springframework.stereotype.Component;

			import javax.annotation.Resource;
			import java.io.UnsupportedEncodingException;
			import java.nio.charset.StandardCharsets;

			/**

			@@ -5,20 +5,15 @@
			import com.yeshi.fanli.entity.push.PushQueueRecord;
			import com.yeshi.fanli.log.LogHelper;
			import com.yeshi.fanli.service.inter.push.IOSPushService;
			import com.yeshi.fanli.util.CMQManager;
			import com.yeshi.fanli.util.StringUtil;
			import com.yeshi.fanli.util.mq.rabbit.RabbitmqMsgConsumeUtil;
			import org.springframework.amqp.core.Message;
			import org.springframework.amqp.core.MessageListener;
			import org.springframework.amqp.rabbit.annotation.RabbitListener;
			import org.springframework.amqp.rabbit.core.RabbitTemplate;
			import org.springframework.stereotype.Component;

			import javax.annotation.Resource;
			import java.io.UnsupportedEncodingException;
			import java.nio.charset.StandardCharsets;
			import java.util.Iterator;
			import java.util.Map;

			/**
			* @author hxh