From 56e258fa6c23469ea825f6b11d458df9ba577e9f Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期五, 01 三月 2019 14:38:50 +0800
Subject: [PATCH] Merge branch 'div'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserOrderController.java | 9 ++++++---
1 files changed, 6 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..f6712b6 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-宸插け鏁�
* @param type
* 绫诲瀷锛�1-杩斿埄璁㈠崟 2-鍒嗕韩璁㈠崟 3-閭�璇疯鍗�
* @param orderState
@@ -427,8 +427,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