diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivityController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivityController.java index 5f038950b..c3dcd2b45 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivityController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivityController.java @@ -64,14 +64,14 @@ public class WxOfflineActivityController extends BaseController { public ResultData saveOrUpdate(@RequestBody WxOfflineActivity wxOfflineActivity) { TenantEntity tenantEntity = getTenantInfo(); wxOfflineActivity.updateTenantInfo(tenantEntity); - if(wxOfflineActivity.getActivityItemList() == null || wxOfflineActivity.getActivityItemList().size() == 0){ + if(wxOfflineActivity.getActivityItemList() == null || wxOfflineActivity.getActivityItemList().isEmpty()){ return new ResultData(Result.ERROR,"活动项不能为空"); } if(wxOfflineActivity.getAllMerchant() == null){ return new ResultData(Result.ERROR,"活动商户不能为空"); } for (WxOfflineActivityItem activityItem:wxOfflineActivity.getActivityItemList()){ - if(activityItem.getActivityAwardsItemList() == null || activityItem.getActivityAwardsItemList().size() == 0){ + if(activityItem.getActivityAwardsItemList() == null || activityItem.getActivityAwardsItemList().isEmpty()){ return new ResultData(Result.ERROR,"活动["+activityItem.getName()+"]奖项不能为空"); } for (WxOfflineActivityAwardsItem activityAwardsItem :activityItem.getActivityAwardsItemList()){ @@ -88,16 +88,34 @@ public class WxOfflineActivityController extends BaseController { return new ResultData(Result.ERROR,"分担规则下,商户和商管的比例总和需要为100%"); } } + } + if(activityItem.getActivityAwardsItemSecondList() != null && !activityItem.getActivityAwardsItemSecondList().isEmpty()){ + for (WxOfflineActivityAwardsItem activityAwardsItem : activityItem.getActivityAwardsItemSecondList()) { + if(EnumOfflineActivityAwardsMoneyRule.MALL_ONLY.getCode().equals(activityAwardsItem.getMoneyRule())){ + activityAwardsItem.setMallShareRate(new BigDecimal(100)); + activityAwardsItem.setMerchantShareRate(new BigDecimal(0)); + } + else if (EnumOfflineActivityAwardsMoneyRule.MERCHANT_ONLY.getCode().equals(activityAwardsItem.getMoneyRule())){ + activityAwardsItem.setMallShareRate(new BigDecimal(0)); + activityAwardsItem.setMerchantShareRate(new BigDecimal(100)); + } + else if (EnumOfflineActivityAwardsMoneyRule.SHARE.getCode().equals(activityAwardsItem.getMoneyRule())) { + if (activityAwardsItem.getMallShareRate().add(activityAwardsItem.getMerchantShareRate()).intValue() != 100) { + return new ResultData(Result.ERROR,"分担规则下,商户和商管的比例总和需要为100%"); + } + } + } + } } if(EnumOfflineActivityMerchantType.ADD.getCode().equals(wxOfflineActivity.getAllMerchant())){ - if(wxOfflineActivity.getActivityMerchantList() == null || wxOfflineActivity.getActivityMerchantList().size() == 0){ + if(wxOfflineActivity.getActivityMerchantList() == null || wxOfflineActivity.getActivityMerchantList().isEmpty()){ return new ResultData(Result.ERROR,"活动参加商户不能为空"); } } else if (EnumOfflineActivityMerchantType.UN_ADD.getCode().equals(wxOfflineActivity.getAllMerchant())) { - if(wxOfflineActivity.getActivityMerchantList() == null || wxOfflineActivity.getActivityMerchantList().size() == 0){ + if(wxOfflineActivity.getActivityMerchantList() == null || wxOfflineActivity.getActivityMerchantList().isEmpty()){ return new ResultData(Result.ERROR,"活动不参加商户不能为空"); } }