From fe879975a3e8a0a1aa280fb839e02d159bfbcff8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 27 八月 2019 18:04:38 +0800
Subject: [PATCH] 金币任务多次获取bug修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/HomeNavbarServiceImpl.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/HomeNavbarServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/HomeNavbarServiceImpl.java
index 6b38da1..e9d1021 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/HomeNavbarServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/HomeNavbarServiceImpl.java
@@ -115,6 +115,16 @@
picture = uploadPicture(file);
}
+ Boolean isDefault = record.getIsDefault();
+ if (isDefault == null) {
+ record.setIsDefault(false);
+ }
+
+ Boolean isFixed = record.getIsFixed();
+ if (isFixed == null) {
+ record.setIsFixed(false);
+ }
+
Long id = record.getId();
if (id == null) {
record.setPicture(picture);
@@ -245,26 +255,29 @@
HomeNavbar changeObj = null;
if (GoodsClass.SEX_ALL == sex || GoodsClass.SEX_DEFAULT == sex) {
- changeObj = homeNavbarMapper.getDefaultChangeOrder(moveType, resultObj.getOrderby());
+ Integer orderby = resultObj.getOrderby();
+ changeObj = homeNavbarMapper.getDefaultChangeOrder(moveType, orderby);
if (changeObj == null ) {
throw new HomeNavbarException(1, "宸茬粡鍦ㄦ渶杈圭紭锛屾棤鍙氦鎹㈢殑浣嶇疆");
}
resultObj.setOrderby(changeObj.getOrderby());
- changeObj.setOrderby(resultObj.getOrderby());
+ changeObj.setOrderby(orderby);
} else if (GoodsClass.SEX_MAN == sex) {
- changeObj = homeNavbarMapper.getManChangeOrder(moveType, resultObj.getOrderMan());
+ Integer orderMan = resultObj.getOrderMan();
+ changeObj = homeNavbarMapper.getManChangeOrder(moveType, orderMan);
if (changeObj == null ) {
throw new HomeNavbarException(1, "宸茬粡鍦ㄦ渶杈圭紭锛屾棤鍙氦鎹㈢殑浣嶇疆");
}
resultObj.setOrderMan(changeObj.getOrderMan());
- changeObj.setOrderMan( resultObj.getOrderMan());
+ changeObj.setOrderMan(orderMan);
} else if (GoodsClass.SEX_WOMAN == sex) {
- changeObj = homeNavbarMapper.getWomanChangeOrder(moveType, resultObj.getOrderWoman());
+ Integer orderWoman = resultObj.getOrderWoman();
+ changeObj = homeNavbarMapper.getWomanChangeOrder(moveType, orderWoman);
if (changeObj == null ) {
throw new HomeNavbarException(1, "宸茬粡鍦ㄦ渶杈圭紭锛屾棤鍙氦鎹㈢殑浣嶇疆");
}
resultObj.setOrderWoman(changeObj.getOrderWoman());
- changeObj.setOrderWoman( resultObj.getOrderWoman());
+ changeObj.setOrderWoman(orderWoman);
}
if (changeObj == null ) {
--
Gitblit v1.8.0