diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityAwardsItem.java b/mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityAwardsItem.java index 5f798ade9..77864fb56 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityAwardsItem.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityAwardsItem.java @@ -56,6 +56,12 @@ public class WxOfflineActivityAwardsItem extends TenantEntity { @TableField(value = "max_amount") private Integer maxAmount; + /** + * 返现比例(与奖项价值2选1) + */ + @TableField(value = "max_amount") + private BigDecimal cashBackRatio; + /** * 奖项价值 */ diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumOfflineActivityAwardsRule.java b/mallinkService/src/main/java/com/iformall/enums/EnumOfflineActivityAwardsRule.java index 54d12d581..c24a2d57e 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumOfflineActivityAwardsRule.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumOfflineActivityAwardsRule.java @@ -6,8 +6,9 @@ package com.iformall.enums; */ public enum EnumOfflineActivityAwardsRule { + DEF(0, "四舍五入(分)"), YUAN(1, "四舍五入(元)"), - FEN(2, "四舍五入(分)"), + TEN(2, "四舍五入(十)"), ; public static EnumOfflineActivityAwardsRule getEnum(Integer code) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityAwardsItemServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityAwardsItemServiceImpl.java index 16ba07063..195d05383 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityAwardsItemServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityAwardsItemServiceImpl.java @@ -9,6 +9,7 @@ import com.iformall.mapper.WxOfflineActivityAwardsItemMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.util.Collections; import java.util.List; @@ -39,12 +40,13 @@ public class WxOfflineActivityAwardsItemServiceImpl implements WxOfflineActivity awaItem.setActivityItemId(activityItem.getId()); if(EnumOfflineActivityType.LOTTERY_DRAW.getCode().equals(activityItem.getType())){ + awaItem.setCashBackRatio(BigDecimal.ZERO); awaItem.setGrade(-1); awaItem.setMinAmount(0); awaItem.setMaxAmount(-1); } else if (EnumOfflineActivityType.GIFT.getCode().equals(activityItem.getType())) { - + awaItem.setCashBackRatio(BigDecimal.ZERO); } else if (EnumOfflineActivityType.CASHBACK.getCode().equals(activityItem.getType())) { awaItem.setGrade(-1); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityItemServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityItemServiceImpl.java index 8581143bf..fa1fff94d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityItemServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityItemServiceImpl.java @@ -4,6 +4,7 @@ import com.iformall.common.IdWorker; import com.iformall.domain.po.WxOfflineActivity; import com.iformall.domain.po.WxOfflineActivityAwardsItem; import com.iformall.domain.po.WxOfflineActivityItem; +import com.iformall.enums.EnumOfflineActivityAwardsRule; import com.iformall.enums.EnumOfflineActivityType; import com.iformall.service.WxOfflineActivityAwardsItemService; import com.iformall.service.WxOfflineActivityItemService; @@ -44,12 +45,12 @@ public class WxOfflineActivityItemServiceImpl implements WxOfflineActivityItemSe activityItem.updateTenantInfo(wxOfflineActivity); activityItem.setActivityId(wxOfflineActivity.getId()); if(EnumOfflineActivityType.LOTTERY_DRAW.getCode().equals(activityItem.getType())){ - activityItem.setAwardsItemRule(0); + activityItem.setAwardsItemRule(EnumOfflineActivityAwardsRule.DEF.getCode()); } else if (EnumOfflineActivityType.GIFT.getCode().equals(activityItem.getType())) { activityItem.setLimitMoney(0); activityItem.setAwardsItemPrice(0); - activityItem.setAwardsItemRule(0); + activityItem.setAwardsItemRule(EnumOfflineActivityAwardsRule.DEF.getCode()); } else if (EnumOfflineActivityType.CASHBACK.getCode().equals(activityItem.getType())) { activityItem.setAwardsItemPrice(0); diff --git a/mallinkService/src/main/resources/mapper/WxOfflineActivityAwardsItemMapper.xml b/mallinkService/src/main/resources/mapper/WxOfflineActivityAwardsItemMapper.xml index d27452476..ec009646b 100644 --- a/mallinkService/src/main/resources/mapper/WxOfflineActivityAwardsItemMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOfflineActivityAwardsItemMapper.xml @@ -13,8 +13,9 @@ + - + @@ -24,7 +25,7 @@ id,tenant_id,parent_tenant_id, activity_item_id,`name`,grade, - min_amount,max_amount,price, + min_amount,max_amount,cash_back_ratio,price, money_rule,mall_share_rate,merchant_share_rate, create_date,update_date diff --git a/mallinkService/src/main/resources/mapper/WxOfflineActivityItemMapper.xml b/mallinkService/src/main/resources/mapper/WxOfflineActivityItemMapper.xml index f979a89e4..68f37591e 100644 --- a/mallinkService/src/main/resources/mapper/WxOfflineActivityItemMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOfflineActivityItemMapper.xml @@ -15,7 +15,7 @@ - +