From 2c217c4f9e01bd2e764c7b62da1aaa89018d76d8 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 22 四月 2019 12:19:21 +0800
Subject: [PATCH] Merge branch 'div'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserOrderController.java | 17 ++++++++++++++---
1 files changed, 14 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..7f207cd 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
@@ -101,6 +101,12 @@
if (state != null && state == 0) {
state = null;// 鎵�鏈夌姸鎬�
+ }
+
+ // 杞崲鐘舵��
+ if (state != null && state == 4) {
+ orderState = state; // 宸叉敹璐х姸鎬�
+ state = null; // 娓呯┖
}
if (type != null && type == 0) {
@@ -420,6 +426,8 @@
try {
orderId = DESUtil.decode(orderData, StringUtil.getBase64String("YeShiFANLI889*+"),
StringUtil.getBase64String("*M#34f?,"));
+ if (orderId != null && orderId.contains(","))
+ orderId = orderId.split(",")[0];
} catch (Exception e) {
e.printStackTrace();
}
@@ -427,8 +435,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