Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
commit
348fff34e4
|
@ -325,11 +325,17 @@ public class StoreLogic implements IEventHandler {
|
||||||
}
|
}
|
||||||
Map<Integer, Integer> itemNumMap = new LinkedHashMap<>();
|
Map<Integer, Integer> itemNumMap = new LinkedHashMap<>();
|
||||||
int rewardId = getRewardId(storeType,sort,user);
|
int rewardId = getRewardId(storeType,sort,user);
|
||||||
|
if(rewardId==0){
|
||||||
|
return;
|
||||||
|
}
|
||||||
itemNumMap.put(rewardId, 0);
|
itemNumMap.put(rewardId, 0);
|
||||||
storeManager.newStoreInfo(sStoreTypeConfig.getId(),System.currentTimeMillis(),startTime,endTime,itemNumMap);
|
storeManager.newStoreInfo(sStoreTypeConfig.getId(),System.currentTimeMillis(),startTime,endTime,itemNumMap);
|
||||||
}else{
|
}else{
|
||||||
Map<Integer, Integer> itemNumMap = storeInfo.getItemNumMap();
|
Map<Integer, Integer> itemNumMap = storeInfo.getItemNumMap();
|
||||||
int rewardId = getRewardId(storeType,sort,user);
|
int rewardId = getRewardId(storeType,sort,user);
|
||||||
|
if(rewardId==0){
|
||||||
|
return;
|
||||||
|
}
|
||||||
while (itemNumMap.containsKey(rewardId)){
|
while (itemNumMap.containsKey(rewardId)){
|
||||||
rewardId += 100000;
|
rewardId += 100000;
|
||||||
}
|
}
|
||||||
|
@ -387,6 +393,9 @@ public class StoreLogic implements IEventHandler {
|
||||||
Map<Integer, Integer> itemNumMap = new ConcurrentHashMap<>();
|
Map<Integer, Integer> itemNumMap = new ConcurrentHashMap<>();
|
||||||
for (int i = 1; i <= sStoreTypeConfig.getNumber(); i ++){
|
for (int i = 1; i <= sStoreTypeConfig.getNumber(); i ++){
|
||||||
int rewardId = getRewardId(storeId,i,user);
|
int rewardId = getRewardId(storeId,i,user);
|
||||||
|
if(rewardId==0){
|
||||||
|
continue;
|
||||||
|
}
|
||||||
itemNumMap.put(rewardId, 0);
|
itemNumMap.put(rewardId, 0);
|
||||||
}
|
}
|
||||||
return itemNumMap;
|
return itemNumMap;
|
||||||
|
@ -411,6 +420,11 @@ public class StoreLogic implements IEventHandler {
|
||||||
int weight = 0;
|
int weight = 0;
|
||||||
int rewardId = 0;
|
int rewardId = 0;
|
||||||
Random random = new Random();
|
Random random = new Random();
|
||||||
|
if(totalWeight==0){
|
||||||
|
//没有符合规则的栏位奖励
|
||||||
|
LOGGER.error("Exception::没有符合规则的栏位奖励sort=>{}, sort=>{}",storeId,sort);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
int randomWeight = random.nextInt(totalWeight) + 1;
|
int randomWeight = random.nextInt(totalWeight) + 1;
|
||||||
for (SStoreConfig sStoreConfig : randomSstoreConfigList) {
|
for (SStoreConfig sStoreConfig : randomSstoreConfigList) {
|
||||||
weight += sStoreConfig.getWeight();
|
weight += sStoreConfig.getWeight();
|
||||||
|
|
Loading…
Reference in New Issue