Merge branch 'master_prb_gn' into master_test_gn
commit
c3749641b3
|
@ -430,6 +430,7 @@ public class BuyGoodsNewLogic {
|
||||||
* 刷新单个礼包状态
|
* 刷新单个礼包状态
|
||||||
*/
|
*/
|
||||||
public static boolean refreshUnitWF(AbstractWelfareBag bag,User user){
|
public static boolean refreshUnitWF(AbstractWelfareBag bag,User user){
|
||||||
|
SRechargeCommodityNewConfig configById = SRechargeCommodityNewConfig.getConfigById(bag.getModId());
|
||||||
boolean result = false;
|
boolean result = false;
|
||||||
//判断刷新时间
|
//判断刷新时间
|
||||||
if(bag.getRefreshTime() != 0 && bag.getRefreshTime() < System.currentTimeMillis()){
|
if(bag.getRefreshTime() != 0 && bag.getRefreshTime() < System.currentTimeMillis()){
|
||||||
|
@ -446,11 +447,16 @@ public class BuyGoodsNewLogic {
|
||||||
user.getPlayerInfoManager().getNewRechargeInfo().removePush((PushWelfareBag) bag);
|
user.getPlayerInfoManager().getNewRechargeInfo().removePush((PushWelfareBag) bag);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if(bag.getType() == RechargeType.timeLimit.getType()){//活动类型特殊处理
|
if(bag.getType() == RechargeType.timeLimit.getType()){
|
||||||
for(String[] I : bag.getCondition()){
|
//活动类型特殊处理
|
||||||
if(I[0].equals("3")){
|
//todo 其他的也要改 直接读表里的 不读数据库里的
|
||||||
if(ActivityLogic.checkActivityOpen(user,Integer.parseInt(I[1]))){
|
String onSaleRule = configById.getOnSaleRule();
|
||||||
long[] time = ActivityLogic.getStartAndEndTime(user,Integer.parseInt(I[1]));
|
int[] condition = null;
|
||||||
|
if(!onSaleRule.contains("|")){
|
||||||
|
condition = StringUtil.parseFiledInt(onSaleRule);
|
||||||
|
if(condition[0]==3){
|
||||||
|
if(ActivityLogic.checkActivityOpen(user,condition[1])){
|
||||||
|
long[] time = ActivityLogic.getStartAndEndTime(user,condition[1]);
|
||||||
bag.setStartTime(time[0]);
|
bag.setStartTime(time[0]);
|
||||||
bag.setEndTime(time[1]);
|
bag.setEndTime(time[1]);
|
||||||
bag.setOpen(true);
|
bag.setOpen(true);
|
||||||
|
|
Loading…
Reference in New Issue