Browse Source

//OfflineActivity

release_toaliyun_real
xiaohu 1 year ago
parent
commit
7748cfdfe9
6 changed files with 18 additions and 7 deletions
  1. +6
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityAwardsItem.java
  2. +2
    -1
      mallinkService/src/main/java/com/iformall/enums/EnumOfflineActivityAwardsRule.java
  3. +3
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityAwardsItemServiceImpl.java
  4. +3
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityItemServiceImpl.java
  5. +3
    -2
      mallinkService/src/main/resources/mapper/WxOfflineActivityAwardsItemMapper.xml
  6. +1
    -1
      mallinkService/src/main/resources/mapper/WxOfflineActivityItemMapper.xml

+ 6
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityAwardsItem.java View File

@@ -56,6 +56,12 @@ public class WxOfflineActivityAwardsItem extends TenantEntity {
@TableField(value = "max_amount") @TableField(value = "max_amount")
private Integer maxAmount; private Integer maxAmount;


/**
* 返现比例(与奖项价值2选1)
*/
@TableField(value = "max_amount")
private BigDecimal cashBackRatio;

/** /**
* 奖项价值 * 奖项价值
*/ */


+ 2
- 1
mallinkService/src/main/java/com/iformall/enums/EnumOfflineActivityAwardsRule.java View File

@@ -6,8 +6,9 @@ package com.iformall.enums;
*/ */
public enum EnumOfflineActivityAwardsRule { public enum EnumOfflineActivityAwardsRule {


DEF(0, "四舍五入(分)"),
YUAN(1, "四舍五入(元)"), YUAN(1, "四舍五入(元)"),
FEN(2, "四舍五入(分)"),
TEN(2, "四舍五入(十)"),
; ;


public static EnumOfflineActivityAwardsRule getEnum(Integer code) { public static EnumOfflineActivityAwardsRule getEnum(Integer code) {


+ 3
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityAwardsItemServiceImpl.java View File

@@ -9,6 +9,7 @@ import com.iformall.mapper.WxOfflineActivityAwardsItemMapper;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;


import java.math.BigDecimal;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;


@@ -39,12 +40,13 @@ public class WxOfflineActivityAwardsItemServiceImpl implements WxOfflineActivity
awaItem.setActivityItemId(activityItem.getId()); awaItem.setActivityItemId(activityItem.getId());


if(EnumOfflineActivityType.LOTTERY_DRAW.getCode().equals(activityItem.getType())){ if(EnumOfflineActivityType.LOTTERY_DRAW.getCode().equals(activityItem.getType())){
awaItem.setCashBackRatio(BigDecimal.ZERO);
awaItem.setGrade(-1); awaItem.setGrade(-1);
awaItem.setMinAmount(0); awaItem.setMinAmount(0);
awaItem.setMaxAmount(-1); awaItem.setMaxAmount(-1);
} }
else if (EnumOfflineActivityType.GIFT.getCode().equals(activityItem.getType())) { else if (EnumOfflineActivityType.GIFT.getCode().equals(activityItem.getType())) {
awaItem.setCashBackRatio(BigDecimal.ZERO);
} }
else if (EnumOfflineActivityType.CASHBACK.getCode().equals(activityItem.getType())) { else if (EnumOfflineActivityType.CASHBACK.getCode().equals(activityItem.getType())) {
awaItem.setGrade(-1); awaItem.setGrade(-1);


+ 3
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityItemServiceImpl.java View File

@@ -4,6 +4,7 @@ import com.iformall.common.IdWorker;
import com.iformall.domain.po.WxOfflineActivity; import com.iformall.domain.po.WxOfflineActivity;
import com.iformall.domain.po.WxOfflineActivityAwardsItem; import com.iformall.domain.po.WxOfflineActivityAwardsItem;
import com.iformall.domain.po.WxOfflineActivityItem; import com.iformall.domain.po.WxOfflineActivityItem;
import com.iformall.enums.EnumOfflineActivityAwardsRule;
import com.iformall.enums.EnumOfflineActivityType; import com.iformall.enums.EnumOfflineActivityType;
import com.iformall.service.WxOfflineActivityAwardsItemService; import com.iformall.service.WxOfflineActivityAwardsItemService;
import com.iformall.service.WxOfflineActivityItemService; import com.iformall.service.WxOfflineActivityItemService;
@@ -44,12 +45,12 @@ public class WxOfflineActivityItemServiceImpl implements WxOfflineActivityItemSe
activityItem.updateTenantInfo(wxOfflineActivity); activityItem.updateTenantInfo(wxOfflineActivity);
activityItem.setActivityId(wxOfflineActivity.getId()); activityItem.setActivityId(wxOfflineActivity.getId());
if(EnumOfflineActivityType.LOTTERY_DRAW.getCode().equals(activityItem.getType())){ if(EnumOfflineActivityType.LOTTERY_DRAW.getCode().equals(activityItem.getType())){
activityItem.setAwardsItemRule(0);
activityItem.setAwardsItemRule(EnumOfflineActivityAwardsRule.DEF.getCode());
} }
else if (EnumOfflineActivityType.GIFT.getCode().equals(activityItem.getType())) { else if (EnumOfflineActivityType.GIFT.getCode().equals(activityItem.getType())) {
activityItem.setLimitMoney(0); activityItem.setLimitMoney(0);
activityItem.setAwardsItemPrice(0); activityItem.setAwardsItemPrice(0);
activityItem.setAwardsItemRule(0);
activityItem.setAwardsItemRule(EnumOfflineActivityAwardsRule.DEF.getCode());
} }
else if (EnumOfflineActivityType.CASHBACK.getCode().equals(activityItem.getType())) { else if (EnumOfflineActivityType.CASHBACK.getCode().equals(activityItem.getType())) {
activityItem.setAwardsItemPrice(0); activityItem.setAwardsItemPrice(0);


+ 3
- 2
mallinkService/src/main/resources/mapper/WxOfflineActivityAwardsItemMapper.xml View File

@@ -13,8 +13,9 @@
<result property="grade" column="grade" jdbcType="INTEGER"/> <result property="grade" column="grade" jdbcType="INTEGER"/>
<result property="minAmount" column="min_amount" jdbcType="INTEGER"/> <result property="minAmount" column="min_amount" jdbcType="INTEGER"/>
<result property="maxAmount" column="max_amount" jdbcType="INTEGER"/> <result property="maxAmount" column="max_amount" jdbcType="INTEGER"/>
<result property="cashBackRatio" column="cash_back_ratio" jdbcType="DECIMAL"/>
<result property="price" column="price" jdbcType="INTEGER"/> <result property="price" column="price" jdbcType="INTEGER"/>
<result property="moneyRule" column="money_rule" jdbcType="INTEGER"/>
<result property="moneyRule" column="money_rule" jdbcType="SMALLINT"/>
<result property="mallShareRate" column="mall_share_rate" jdbcType="DECIMAL"/> <result property="mallShareRate" column="mall_share_rate" jdbcType="DECIMAL"/>
<result property="merchantShareRate" column="merchant_share_rate" jdbcType="DECIMAL"/> <result property="merchantShareRate" column="merchant_share_rate" jdbcType="DECIMAL"/>
<result property="createDate" column="create_date" jdbcType="TIMESTAMP"/> <result property="createDate" column="create_date" jdbcType="TIMESTAMP"/>
@@ -24,7 +25,7 @@
<sql id="allColumns"> <sql id="allColumns">
id,tenant_id,parent_tenant_id, id,tenant_id,parent_tenant_id,
activity_item_id,`name`,grade, 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, money_rule,mall_share_rate,merchant_share_rate,
create_date,update_date create_date,update_date
</sql> </sql>


+ 1
- 1
mallinkService/src/main/resources/mapper/WxOfflineActivityItemMapper.xml View File

@@ -15,7 +15,7 @@
<result property="awardsItemPrice" column="awards_item_price" jdbcType="INTEGER"/> <result property="awardsItemPrice" column="awards_item_price" jdbcType="INTEGER"/>
<result property="awardsItemLimit" column="awards_item_limit" jdbcType="INTEGER"/> <result property="awardsItemLimit" column="awards_item_limit" jdbcType="INTEGER"/>
<result property="awardsItemCount" column="awards_item_count" jdbcType="INTEGER"/> <result property="awardsItemCount" column="awards_item_count" jdbcType="INTEGER"/>
<result property="awardsItemRule" column="awards_item_rule" jdbcType="INTEGER"/>
<result property="awardsItemRule" column="awards_item_rule" jdbcType="SMALLINT"/>
<result property="createDate" column="create_date" jdbcType="TIMESTAMP"/> <result property="createDate" column="create_date" jdbcType="TIMESTAMP"/>
<result property="updateDate" column="update_date" jdbcType="TIMESTAMP"/> <result property="updateDate" column="update_date" jdbcType="TIMESTAMP"/>
</resultMap> </resultMap>


Loading…
Cancel
Save