From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialServiceImpl.java | 93 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 70 insertions(+), 23 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialServiceImpl.java
index 404f06c..3e61581 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialServiceImpl.java
@@ -69,6 +69,11 @@
throw new SpecialException(1, "涓撻鍚嶇О涓嶈兘涓虹┖");
}
+ Integer sex = record.getSex();
+ if (sex == null) {
+ throw new SpecialException(1, "鎬у埆涓嶈兘涓虹┖");
+ }
+
String params = record.getParams();
if (params == null || params.trim().length() == 0 || "null".equalsIgnoreCase(params)) {
record.setParams(null);
@@ -112,12 +117,21 @@
record.setPicture(picture);
record.setSubPicture(subPicture);
- int maxOrder = specialMapper.getMaxOrderByCard(cardId);
- record.setOrderby(maxOrder + 1);
+ // 鎺掑簭
+ record.setOrderby(specialMapper.getDefaultMaxOrder(cardId) + 1);
+ record.setOrderMan(specialMapper.getManMaxOrder(cardId) + 1);
+ record.setOrderWoman(specialMapper.getWomanMaxOrder(cardId) + 1);
record.setCreatetime(new Date());
record.setUpdatetime(new Date());
specialMapper.insert(record);
+
+ Special s = new Special();
+ s.setId(record.getId());
+ s.setOrderby(Integer.parseInt(s.getId() + ""));
+ s.setOrderMan(Integer.parseInt(s.getId() + ""));
+ s.setOrderWoman(Integer.parseInt(s.getId() + ""));
+ specialMapper.updateByPrimaryKeySelective(s);
} else {
// 淇敼
Special resultObj = specialMapper.selectByPrimaryKey(id);
@@ -170,7 +184,10 @@
}
record.setOrderby(resultObj.getOrderby());
+ record.setOrderMan(resultObj.getOrderMan());
+ record.setOrderWoman(resultObj.getOrderWoman());
record.setCreatetime(resultObj.getCreatetime());
+
record.setUpdatetime(new Date());
specialMapper.updateByPrimaryKey(record);
}
@@ -212,9 +229,9 @@
@Override
@Transactional
- public void updateOrder(Long id, Integer moveType) throws SpecialException {
+ public void updateOrder(Long id, Integer moveType, Integer sex) throws SpecialException {
- if (id == null || moveType == null || (!moveType.equals(1) && !moveType.equals(-1))) {
+ if (id == null || moveType == null || (!moveType.equals(1) && !moveType.equals(-1)) || sex == null) {
throw new SpecialException(1, "璇蜂紶閫掓纭弬鏁�");
}
@@ -223,21 +240,40 @@
throw new SpecialException(1, "姝ゅ唴瀹瑰凡涓嶅瓨鍦�");
}
- Integer order = resultObj.getOrderby();
Long cardId = resultObj.getCardId();
-
// 鑾峰彇浜ゆ崲瀵硅薄
- Special exchangeObject = specialMapper.getOrderByCardID(cardId, moveType, order);
- if (exchangeObject == null) {
- if (moveType == 1) {
- throw new SpecialException(1, "鍦ㄧ浉鍚屼娇鐢ㄥ湴鏂逛腑浼樺厛绾у凡缁忔渶浣庝簡");
- } else {
- throw new SpecialException(1, "鍦ㄧ浉鍚屼娇鐢ㄥ湴鏂逛腑浼樺厛绾у凡缁忔渶楂樹簡");
+ Special exchangeObject = null;
+ if (Special.SEX_ALL == sex || Special.SEX_DEFAULT == sex) {
+ Integer orderby = resultObj.getOrderby();
+ exchangeObject = specialMapper.getOrderByCardID(cardId, moveType, orderby, sex);
+ if (exchangeObject == null) {
+ throw new SpecialException(1, "娌℃湁鎵惧埌鍙氦鎹㈢殑浣嶇疆");
}
- }
- resultObj.setOrderby(exchangeObject.getOrderby());
- exchangeObject.setOrderby(order);
+ resultObj.setOrderby(exchangeObject.getOrderby());
+ exchangeObject.setOrderby(orderby);
+ } else if (Special.SEX_MAN == sex) {
+ Integer orderMan = resultObj.getOrderMan();
+ exchangeObject = specialMapper.getOrderByCardID(cardId, moveType, orderMan, sex);
+ if (exchangeObject == null) {
+ throw new SpecialException(1, "娌℃湁鎵惧埌鍙氦鎹㈢殑浣嶇疆");
+ }
+
+ resultObj.setOrderMan(exchangeObject.getOrderMan());
+ exchangeObject.setOrderMan(orderMan);
+ } else if (Special.SEX_WOMAN == sex) {
+ Integer orderWoman = resultObj.getOrderWoman();
+ exchangeObject = specialMapper.getOrderByCardID(cardId, moveType, orderWoman, sex);
+
+ if (exchangeObject == null) {
+ throw new SpecialException(1, "娌℃湁鎵惧埌鍙氦鎹㈢殑浣嶇疆");
+ }
+
+ resultObj.setOrderWoman(exchangeObject.getOrderWoman());
+ exchangeObject.setOrderWoman(orderWoman);
+ } else {
+ throw new SpecialException(1, "sex鍙傛暟涓嶆纭�");
+ }
specialMapper.updateByPrimaryKey(resultObj);
specialMapper.updateByPrimaryKey(exchangeObject);
@@ -280,9 +316,9 @@
}
@Override
- public List<Special> listQueryByCard(long start, int count, Long card, String key) {
+ public List<Special> listQueryByCard(long start, int count, Long card, String key, Integer sex) {
- List<Special> list = specialMapper.listQueryByCard(start, count, card, key);
+ List<Special> list = specialMapper.listQueryByCard(start, count, card, key, sex);
if (list == null || list.size() == 0) {
return list;
}
@@ -312,8 +348,8 @@
}
@Override
- public long countlistQueryByCard(Long card, String key) {
- return specialMapper.countlistQueryByCard(card, key);
+ public long countlistQueryByCard(Long card, String key, Integer sex) {
+ return specialMapper.countlistQueryByCard(card, key, sex);
}
@Override
@@ -334,7 +370,14 @@
// 棣栭〉-5鍦嗗舰2鎺掑尯鍩�
JSONObject arcMap = new JSONObject();
- List<Special> listArc = specialMapper.listByPlaceKey("index_arc", sex);
+
+ String indexArc = "index_arc";
+ if (VersionUtil.greaterThan_1_5_70(acceptData.getPlatform(), acceptData.getVersion()))
+ indexArc = "index_arc_1.5.7";
+ else if (VersionUtil.greaterThan_1_5_60(acceptData.getPlatform(), acceptData.getVersion()))
+ indexArc = "index_arc_1.5.6";
+
+ List<Special> listArc = specialMapper.listByPlaceKey(indexArc, sex);
if (listArc == null) {
listArc = new ArrayList<Special>();
} else if (listArc.size() > 0) {
@@ -346,7 +389,8 @@
}
// 澶勭悊9.9鍖呴偖
- if (listArc != null && VersionUtil.greaterThan_1_5_50(acceptData.getPlatform(), acceptData.getVersion())&&!Constant.IS_TEST)
+ if (listArc != null && VersionUtil.greaterThan_1_5_50(acceptData.getPlatform(), acceptData.getVersion())
+ && !Constant.IS_TEST)
for (Special s : listArc) {
if (s.getName().contains("9.9")) {// 9鍧�9
s.setJumpDetail(jumpDetailV2Service.getByTypeCache("common_template"));
@@ -386,8 +430,12 @@
activityMap.put("list", JsonUtil.getApiCommonGson().toJson(listActivity));
// 棣栭〉-鏂瑰舰涓撻锛堝搧鐗屽埜銆佹瘝濠�...锛�
+ String indexBlock = "index_block";
+ if (VersionUtil.greaterThan_1_5_60(acceptData.getPlatform(), acceptData.getVersion()))
+ indexBlock = "index_block_1.5.6";
+
JSONObject blockJsonMap = new JSONObject();
- List<Special> listBlock = specialMapper.listByPlaceKey("index_block", sex);
+ List<Special> listBlock = specialMapper.listByPlaceKey(indexBlock, sex);
if (listBlock == null) {
listBlock = new ArrayList<Special>();
} else if (listBlock.size() > 0) {
@@ -398,7 +446,6 @@
}
}
-
// 鍝佺墝鍒�
// >=1.5.40鍚庣殑鐗堟湰鍙互鐢�
if (("android".equalsIgnoreCase(acceptData.getPlatform()) && Integer.parseInt(acceptData.getVersion()) > 39)
--
Gitblit v1.8.0