generated from root/miduo_server
增加第三方充值的判断
parent
be924b640f
commit
f442f479c1
|
@ -999,14 +999,21 @@ public class BuyGoodsLogic {
|
|||
LOGGER.info("send to uid={},the goods={},openID={},orderId={},orderTime={},amount={}", uid, sdkGoodsId, openId, orderId, orderTime, amount);
|
||||
User user = UserManager.getUser(uid);
|
||||
Item item = null;
|
||||
int goodsId = Integer.parseInt(sdkGoodsId);
|
||||
SRechargeCommodityConfig sRechargeCommodityConfig = SRechargeCommodityConfig.rechargeCommodityConfigMap.get(goodsId);
|
||||
SRechargeCommodityConfig sRechargeCommodityConfig = null;
|
||||
//第三方商品id
|
||||
if(!isNumeric(sdkGoodsId)){
|
||||
sRechargeCommodityConfig = SRechargeCommodityConfig.getConfigBySdkRechargeId(sdkGoodsId);
|
||||
}else{
|
||||
int rechargeId = Integer.parseInt(sdkGoodsId);
|
||||
sRechargeCommodityConfig = SRechargeCommodityConfig.rechargeCommodityConfigMap.get(rechargeId);
|
||||
}
|
||||
if (null == sRechargeCommodityConfig) {
|
||||
LOGGER.error("the uid={},the goodId={},good config null", uid, goodsId);
|
||||
LOGGER.error("the uid={},the goodId={},good config null", uid, sdkGoodsId);
|
||||
resultRes.setResultCode(0);
|
||||
resultRes.setResultMsg("good config null");
|
||||
return resultRes;
|
||||
}
|
||||
int goodsId = sRechargeCommodityConfig.getId();
|
||||
Map<Integer,Integer> costItemMap = null;
|
||||
|
||||
|
||||
|
|
|
@ -121,7 +121,10 @@ public class SRechargeCommodityConfig implements BaseConfig {
|
|||
Set<SRechargeCommodityConfig> refreshItemInfoTmp = new HashSet<>();
|
||||
Map<Integer, List<SRechargeCommodityConfig>> mutualGroupMapTmp = new HashMap<>();
|
||||
for (SRechargeCommodityConfig sRechargeCommodityConfig : config.values()) {
|
||||
sdkRechargeCommodityConfigMap.put(sRechargeCommodityConfig.getRechargeId(), sRechargeCommodityConfig);
|
||||
String rechargeId2 = sRechargeCommodityConfig.getRechargeId2();
|
||||
if(rechargeId2 != null && !"".equals(rechargeId2)) {
|
||||
sdkRechargeCommodityConfigMap.put(sRechargeCommodityConfig.getRechargeId2(), sRechargeCommodityConfig);
|
||||
}
|
||||
sRechargeCommodityConfig.setCondition(initConditon(sRechargeCommodityConfig));
|
||||
int[] discountType = sRechargeCommodityConfig.getDiscountType();
|
||||
if (discountType != null && discountType.length > 0 && discountType[0] == 2) {
|
||||
|
@ -504,4 +507,11 @@ public class SRechargeCommodityConfig implements BaseConfig {
|
|||
public int[] getRelateRechargeID() {
|
||||
return relateRechargeID;
|
||||
}
|
||||
|
||||
public static SRechargeCommodityConfig getConfigBySdkRechargeId(String sdkRechargeId){
|
||||
if(sdkRechargeCommodityConfigMap.containsKey(sdkRechargeId)){
|
||||
return sdkRechargeCommodityConfigMap.get(sdkRechargeId);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue