Merge remote-tracking branch 'origin/master_huanxiang' into master_huanxiang
commit
8a729c7c22
|
@ -88,6 +88,9 @@ public class BuyGoodsNewLogic {
|
||||||
// 没有礼包先新增礼包
|
// 没有礼包先新增礼包
|
||||||
if(!rechargeHandler.rechargeIsInBag(user,entry.getKey())){
|
if(!rechargeHandler.rechargeIsInBag(user,entry.getKey())){
|
||||||
AbstractWelfareBag bag = rechargeHandler.initUnitWF(user, config);
|
AbstractWelfareBag bag = rechargeHandler.initUnitWF(user, config);
|
||||||
|
if (bag == null){
|
||||||
|
continue;
|
||||||
|
}
|
||||||
rechargeHandler.addNew(user,bag);
|
rechargeHandler.addNew(user,bag);
|
||||||
}
|
}
|
||||||
// 刷新
|
// 刷新
|
||||||
|
@ -1009,12 +1012,12 @@ public class BuyGoodsNewLogic {
|
||||||
* @param user
|
* @param user
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public static boolean createPushBag(int bagId,User user) throws Exception {
|
public static boolean createPushBag(int bagId,User user) {
|
||||||
SRechargeCommodityNewConfig config = SRechargeCommodityNewConfig.getConfigById(bagId);
|
SRechargeCommodityNewConfig config = SRechargeCommodityNewConfig.getConfigById(bagId);
|
||||||
RechargeHandler handler = getRechargeHandler(config.getOtype());
|
RechargeHandler handler = getRechargeHandler(config.getOtype());
|
||||||
PushWelfareBag pushBag = (PushWelfareBag) handler.getBag(user, bagId);
|
PushWelfareBag pushBag = (PushWelfareBag) handler.getBag(user, bagId);
|
||||||
if (pushBag == null){
|
if (pushBag == null){
|
||||||
pushBag = (PushWelfareBag) handler.initUnitWF(user, config);
|
pushBag = new PushWelfareBag(user, config);
|
||||||
}
|
}
|
||||||
return pushBag.isBuy();
|
return pushBag.isBuy();
|
||||||
}
|
}
|
||||||
|
|
|
@ -48,7 +48,7 @@ public class PushHandler extends AbstractRechargeHandler {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public AbstractWelfareBag initUnitWF(User user, SRechargeCommodityNewConfig config) {
|
public AbstractWelfareBag initUnitWF(User user, SRechargeCommodityNewConfig config) {
|
||||||
return new PushWelfareBag(user,config);
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
Loading…
Reference in New Issue