Procházet zdrojové kódy

//OfflineActivity

release_toaliyun_real
xiaohu před 1 rokem
rodič
revize
c01b744c47
1 změnil soubory, kde provedl 6 přidání a 6 odebrání
  1. +6
    -6
      mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java

+ 6
- 6
mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java Zobrazit soubor

@@ -237,7 +237,7 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity
grantItem.setMoneyRule(grantAwardsItem.getMoneyRule()); grantItem.setMoneyRule(grantAwardsItem.getMoneyRule());
grantItem.setMallShareRate(grantAwardsItem.getMallShareRate()); grantItem.setMallShareRate(grantAwardsItem.getMallShareRate());
grantItem.setMerchantShareRate(grantAwardsItem.getMerchantShareRate()); grantItem.setMerchantShareRate(grantAwardsItem.getMerchantShareRate());
activityItem.setActivityGrantItemList(Arrays.asList(grantItem));
activityItem.setActivityGrantItemList(Collections.singletonList(grantItem));
} }
else if (EnumOfflineActivityType.CASHBACK.getCode().equals(activityItem.getType())) { else if (EnumOfflineActivityType.CASHBACK.getCode().equals(activityItem.getType())) {
activityItem.setIsMeet(true); activityItem.setIsMeet(true);
@@ -405,13 +405,13 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity
if(awardsItem == null){ if(awardsItem == null){
throw new MallinkException(Result.ERROR, "请检查活动"+activityItem.getName()+"奖项参数"); throw new MallinkException(Result.ERROR, "请检查活动"+activityItem.getName()+"奖项参数");
} }
if(awardsItem.getMinAmount() != null && wxOfflineActivityGrantAward.getOrderMoneySum().compareTo(awardsItem.getMinAmount()) < 0){
throw new MallinkException(Result.ERROR, "请检查活动"+activityItem.getName()+"奖项参数(金额不在范围类)");
}
// if((awardsItem.getMinAmount() != null && wxOfflineActivityGrantAward.getOrderMoneySum().compareTo(awardsItem.getMinAmount()) < 0)
// || (awardsItem.getMaxAmount() != null && wxOfflineActivityGrantAward.getOrderMoneySum().compareTo(awardsItem.getMaxAmount()) > 0)){
// if(awardsItem.getMinAmount() != null && wxOfflineActivityGrantAward.getOrderMoneySum().compareTo(awardsItem.getMinAmount()) < 0){
// throw new MallinkException(Result.ERROR, "请检查活动"+activityItem.getName()+"奖项参数(金额不在范围类)"); // throw new MallinkException(Result.ERROR, "请检查活动"+activityItem.getName()+"奖项参数(金额不在范围类)");
// } // }
if((awardsItem.getMinAmount() != null && wxOfflineActivityGrantAward.getOrderMoneySum().compareTo(awardsItem.getMinAmount()) < 0)
|| (awardsItem.getMaxAmount() != null && wxOfflineActivityGrantAward.getOrderMoneySum().compareTo(awardsItem.getMaxAmount()) > 0)){
throw new MallinkException(Result.ERROR, "请检查活动"+activityItem.getName()+"奖项参数(金额不在范围类)");
}


handlerGrantItem(grantGrantItem,activity,activityItem,awardsItem); handlerGrantItem(grantGrantItem,activity,activityItem,awardsItem);




Načítá se…
Zrušit
Uložit