From c987318c7cf02e51fe6c9c98e75bfcc47058841b Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 16 四月 2019 16:36:28 +0800
Subject: [PATCH] 优化部分功能，添加京东
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserOrderController.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 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 442a7d7..dfdb34b 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
@@ -67,7 +67,7 @@
* @param page
* @param uid
* @param state
- * 鐘舵�侊細1-鏈埌璐� 2-宸插埌璐� 3-宸插け鏁�
+ * 鐘舵�侊細0鍏ㄩ儴 1-鏈埌璐� 2-宸插埌璐� 3-宸插け鏁� 4宸叉敹璐�
* @param type
* 绫诲瀷锛�1-杩斿埄璁㈠崟 2-鍒嗕韩璁㈠崟 3-閭�璇疯鍗�
* @param orderState
@@ -103,6 +103,12 @@
state = null;// 鎵�鏈夌姸鎬�
}
+ // 杞崲鐘舵��
+ if (state != null && state == 4) {
+ orderState = state; // 宸叉敹璐х姸鎬�
+ state = null; // 娓呯┖
+ }
+
if (type != null && type == 0) {
type = null; // 鎵�鏈夌被鍨嬭鍗�
}
@@ -427,8 +433,11 @@
if (!StringUtil.isNullOrEmpty(orderId) && orderId.length() > 6) {
orderId = orderId.substring(orderId.length() - 6, orderId.length());
UserExtraTaoBaoInfo info = userExtraTaoBaoInfoService.getByUid(uid);
- if (info != null && !StringUtil.isNullOrEmpty(info.getTaoBaoUid())) {
- userExtraTaoBaoInfoService.bindTaoBaoOrderEnd6Num(info.getTaoBaoUid(), orderId);
+ 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