From d454ff05f4708d361bdf6e9bf2e61bdae845471a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 25 七月 2019 15:27:58 +0800
Subject: [PATCH] 修复分享订单的到账统计
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserOrderController.java | 63 ++++++++++++++++++++++++++++++-
1 files changed, 60 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserOrderController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserOrderController.java
index 855c9c6..91110aa 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserOrderController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserOrderController.java
@@ -8,26 +8,32 @@
import java.util.Map;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.yeshi.utils.DateUtil;
+import org.yeshi.utils.IPUtil;
import org.yeshi.utils.JsonUtil;
import org.yeshi.utils.encrypt.DESUtil;
import com.yeshi.fanli.entity.AppVersionInfo;
import com.yeshi.fanli.entity.accept.AcceptData;
+import com.yeshi.fanli.entity.bus.user.LostOrder;
import com.yeshi.fanli.entity.bus.user.Order;
import com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.order.CommonOrder;
import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
import com.yeshi.fanli.exception.order.CommonOrderException;
+import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.config.AppVersionService;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;
import com.yeshi.fanli.service.inter.order.CommonOrderService;
+import com.yeshi.fanli.service.inter.order.LostOrderService;
import com.yeshi.fanli.service.inter.order.OrderService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoOrderService;
import com.yeshi.fanli.service.inter.user.UserExtraTaoBaoInfoService;
@@ -73,6 +79,9 @@
@Resource
private OrderService orderService;
+ @Resource
+ private LostOrderService lostOrderService;
+
/**
* 璁㈠崟鍒楄〃
*
@@ -102,6 +111,9 @@
public void getOrder(AcceptData acceptData, Integer page, Long uid, Integer state, Integer type, Integer orderState,
String orderNo, String startTime, String endTime, Integer slotTime, boolean needCount, Integer dateType,
PrintWriter out) {
+
+ if (Constant.IS_TEST)
+ uid = 389677L;
if (uid == null) {
out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
@@ -430,7 +442,8 @@
* @param out
*/
@RequestMapping(value = "uploadParsedOrder", method = RequestMethod.POST)
- public void uploadParsedOrder(AcceptData acceptData, Long uid, String orderData, String source, PrintWriter out) {
+ public void uploadParsedOrder(AcceptData acceptData, Long uid, String orderData, String source,
+ HttpServletRequest request, PrintWriter out) {
if (uid == null || StringUtil.isNullOrEmpty(orderData)) {
out.print(JsonUtil.loadFalseResult(1, "鏁版嵁閿欒"));
return;
@@ -446,14 +459,32 @@
}
if ("findOrder".equalsIgnoreCase(source)) {
+
+ boolean success = false;
// 鍖归厤璁㈠崟
for (String order : orders) {
if (!StringUtil.isNullOrEmpty(order)) {
List<TaoBaoOrder> orderList = taoBaoOrderService.getTaoBaoOrderByOrderId(order);
+ // 璁＄畻璁㈠崟鐘舵��
+
if (orderList != null && orderList.size() > 0) {
+ int inValid = 0;
+ for (TaoBaoOrder taoBaoOrder : orderList) {
+ if (taoBaoOrder.getOrderState().equalsIgnoreCase("璁㈠崟澶辨晥")) {
+ inValid++;
+ }
+ }
+ // 璁㈠崟鍏ㄦ槸澶辨晥
+ if (inValid == orderList.size())
+ continue;
+
List<CommonOrder> commonOrderList = commonOrderService
.listBySourceTypeAndOrderId(Constant.SOURCE_TYPE_TAOBAO, order);
if (commonOrderList == null || commonOrderList.size() == 0) {
+ Order o = orderService.findOrderByOrderIdAndType(order, Order.ORDER_TYPE_TAOBAO);
+ if (o != null)// 鍘熸潵宸茬粡瀛樺湪锛屽垯涓嶉渶瑕佹壘鍥�
+ continue;
+
Order or = new Order();
or.setBeizhu("浜哄伐鑷姩鎵惧洖琛ュ崟");
or.setCreatetime(System.currentTimeMillis());
@@ -467,15 +498,41 @@
try {
isS = orderService.addOrder(or);
if (isS) {
- CMQManager.getInstance().addTaoBaoOrderMsg(order, orderList);
+ CMQManager.getInstance().addTaoBaoOrderMsg(order);
+ // 鍔犲叆鍒癓ostOrder
+ LostOrder lo = new LostOrder();
+ lo.setCreateTime(System.currentTimeMillis());
+ lo.setHandleTime(System.currentTimeMillis());
+ lo.setIpInfo(IPUtil.getRemotIP(request) + ":" + request.getRemotePort());
+ lo.setOrder(or);
+ lo.setOrderId(order);
+ lo.setState(LostOrder.STATE_PASS);
+ lo.setResultCode(LostOrder.RESULT_CODE_VERFING);
+ lo.setType(LostOrder.TYPE_TAOBAO);
+ lo.setUserInfo(new UserInfo(uid));
+ lostOrderService.saveLostOrder(lo);
+ if (success == false)
+ success = true;
}
} catch (Exception e) {
- e.printStackTrace();
+ try {
+ LogHelper.errorDetailInfo(e, order, "");
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
}
}
}
}
}
+ if (success) {
+ out.print(JsonUtil.loadTrue(0, null, "璁㈠崟鎵惧洖鎴愬姛锛岃鍒扳�滄垜鐨�-璁㈠崟鈥濅腑鏌ョ湅"));
+ return;
+ } else {
+ out.print(JsonUtil.loadFalseResult("娌℃湁鍙壘鍥炵殑璁㈠崟锛岃灏濊瘯鎵嬪姩鎵惧洖"));
+ return;
+ }
+
} else {
String orderId = null;
if (orders != null && orders.length > 0)
--
Gitblit v1.8.0