From 4114e871bcb3dce771b6aed64a1027d0bbb95ca6 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 16 五月 2019 15:28:37 +0800
Subject: [PATCH] 增加动态用户
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserOrderController.java | 79 ++++++++++++++++++++++++++++++++++-----
1 files changed, 68 insertions(+), 11 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserOrderController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserOrderController.java
index f6712b6..c455ab5 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserOrderController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserOrderController.java
@@ -18,16 +18,23 @@
import com.yeshi.fanli.entity.AppVersionInfo;
import com.yeshi.fanli.entity.accept.AcceptData;
+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.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.OrderService;
+import com.yeshi.fanli.service.inter.taobao.TaoBaoOrderService;
import com.yeshi.fanli.service.inter.user.UserExtraTaoBaoInfoService;
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
+import com.yeshi.fanli.util.CMQManager;
+import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.account.UserUtil;
import com.yeshi.fanli.vo.order.CommonOrderVO;
@@ -60,6 +67,12 @@
@Resource
private UserExtraTaoBaoInfoService userExtraTaoBaoInfoService;
+ @Resource
+ private TaoBaoOrderService taoBaoOrderService;
+
+ @Resource
+ private OrderService orderService;
+
/**
* 璁㈠崟鍒楄〃
*
@@ -67,7 +80,7 @@
* @param page
* @param uid
* @param state
- * 鐘舵�侊細0鍏ㄩ儴 1-鏈埌璐� 2-宸插埌璐� 3-宸插け鏁�
+ * 鐘舵�侊細0鍏ㄩ儴 1-鏈埌璐� 2-宸插埌璐� 3-宸插け鏁� 4宸叉敹璐�
* @param type
* 绫诲瀷锛�1-杩斿埄璁㈠崟 2-鍒嗕韩璁㈠崟 3-閭�璇疯鍗�
* @param orderState
@@ -101,6 +114,12 @@
if (state != null && state == 0) {
state = null;// 鎵�鏈夌姸鎬�
+ }
+
+ // 杞崲鐘舵��
+ if (state != null && state == 4) {
+ orderState = state; // 宸叉敹璐х姸鎬�
+ state = null; // 娓呯┖
}
if (type != null && type == 0) {
@@ -416,22 +435,60 @@
out.print(JsonUtil.loadFalseResult(1, "鏁版嵁閿欒"));
return;
}
- String orderId = null;
+
+ String[] orders = null;
try {
- orderId = DESUtil.decode(orderData, StringUtil.getBase64String("YeShiFANLI889*+"),
+ String orderIds = DESUtil.decode(orderData, StringUtil.getBase64String("YeShiFANLI889*+"),
StringUtil.getBase64String("*M#34f?,"));
+ orders = orderIds.split(",");
} catch (Exception e) {
e.printStackTrace();
}
- if (!StringUtil.isNullOrEmpty(orderId) && orderId.length() > 6) {
- orderId = orderId.substring(orderId.length() - 6, orderId.length());
- UserExtraTaoBaoInfo info = userExtraTaoBaoInfoService.getByUid(uid);
- if (info != null) {
- UserExtraTaoBaoInfo update=new UserExtraTaoBaoInfo();
- update.setId(info.getId());
- update.setTaoBaoOrderEnd6Num(orderId);
- userExtraTaoBaoInfoService.updateSelective(update);
+ if ("findOrder".equalsIgnoreCase(source)) {
+ // 鍖归厤璁㈠崟
+ for (String order : orders) {
+ if (!StringUtil.isNullOrEmpty(order)) {
+ List<TaoBaoOrder> orderList = taoBaoOrderService.getTaoBaoOrderByOrderId(order);
+ if (orderList != null && orderList.size() > 0) {
+ List<CommonOrder> commonOrderList = commonOrderService
+ .listBySourceTypeAndOrderId(Constant.SOURCE_TYPE_TAOBAO, order);
+ if (commonOrderList == null || commonOrderList.size() == 0) {
+ Order or = new Order();
+ or.setBeizhu("浜哄伐鑷姩鎵惧洖琛ュ崟");
+ or.setCreatetime(System.currentTimeMillis());
+ or.setOrderId(order);
+ or.setOrderType(1);
+ or.setState(Order.STATE_YIZHIFU);
+ or.setUserInfo(new UserInfo(uid));
+ or.setVersion(2);
+ // 鍔犲叆鍒拌鍗曡〃
+ boolean isS;
+ try {
+ isS = orderService.addOrder(or);
+ if (isS) {
+ CMQManager.getInstance().addTaoBaoOrderMsg(order, orderList);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ }
+ }
+ } else {
+ String orderId = null;
+ if (orders != null && orders.length > 0)
+ orderId = orders[0];
+ if (!StringUtil.isNullOrEmpty(orderId) && orderId.length() > 6) {
+ orderId = orderId.substring(orderId.length() - 6, orderId.length());
+ UserExtraTaoBaoInfo info = userExtraTaoBaoInfoService.getByUid(uid);
+ if (info != null) {
+ UserExtraTaoBaoInfo update = new UserExtraTaoBaoInfo();
+ update.setId(info.getId());
+ update.setTaoBaoOrderEnd6Num(orderId);
+ userExtraTaoBaoInfoService.updateSelective(update);
+ }
}
}
out.print(JsonUtil.loadTrueResult(""));
--
Gitblit v1.8.0