Commit ce09c3ff by guanchen

添加拼多多

parent aeff05da
...@@ -45,6 +45,7 @@ public class Constants { ...@@ -45,6 +45,7 @@ public class Constants {
public static final int ELM_OFFSET = 5000; //用于查找饿了么的平推奖励比例 public static final int ELM_OFFSET = 5000; //用于查找饿了么的平推奖励比例
public static final int KFC_OFFSET = 6000; //用于查找饿了么的平推奖励比例 public static final int KFC_OFFSET = 6000; //用于查找饿了么的平推奖励比例
public static final int HHYX_OFFSET = 7000; //用于查找自营呼呼优选的平推奖励比例 public static final int HHYX_OFFSET = 7000; //用于查找自营呼呼优选的平推奖励比例
public static final int PDD_OFFSET = 8000; //用于查找拼多多的平推奖励比例
public static Map<Integer, Map<Integer, BigDecimal>> AGENT_RATE_MAP = new HashMap<Integer, Map<Integer, BigDecimal>>(); public static Map<Integer, Map<Integer, BigDecimal>> AGENT_RATE_MAP = new HashMap<Integer, Map<Integer, BigDecimal>>();
public static Map<Integer, String> AGENT_REWARD_REMARK = new HashMap<Integer, String>(); public static Map<Integer, String> AGENT_REWARD_REMARK = new HashMap<Integer, String>();
public static final int AGENT_LEVEL_1 = 1; public static final int AGENT_LEVEL_1 = 1;
...@@ -61,6 +62,7 @@ public class Constants { ...@@ -61,6 +62,7 @@ public class Constants {
public static final String ORDER_TYPE_ELM = "elm"; public static final String ORDER_TYPE_ELM = "elm";
public static final String ORDER_TYPE_KFC = "kfc"; public static final String ORDER_TYPE_KFC = "kfc";
public static final String ORDER_TYPE_HHYX = "hhyx"; public static final String ORDER_TYPE_HHYX = "hhyx";
public static final String ORDER_TYPE_PDD = "pdd";
/** /**
* 回扣类型 * 回扣类型
*/ */
...@@ -117,6 +119,7 @@ public class Constants { ...@@ -117,6 +119,7 @@ public class Constants {
AGENT_RATE_MAP.put(AGENT_REWARD_TYPE_SELF_ORDER + ELM_OFFSET, new HashMap<Integer, BigDecimal>()); AGENT_RATE_MAP.put(AGENT_REWARD_TYPE_SELF_ORDER + ELM_OFFSET, new HashMap<Integer, BigDecimal>());
AGENT_RATE_MAP.put(AGENT_REWARD_TYPE_SELF_ORDER + KFC_OFFSET, new HashMap<Integer, BigDecimal>()); AGENT_RATE_MAP.put(AGENT_REWARD_TYPE_SELF_ORDER + KFC_OFFSET, new HashMap<Integer, BigDecimal>());
AGENT_RATE_MAP.put(AGENT_REWARD_TYPE_SELF_ORDER + HHYX_OFFSET, new HashMap<Integer, BigDecimal>()); AGENT_RATE_MAP.put(AGENT_REWARD_TYPE_SELF_ORDER + HHYX_OFFSET, new HashMap<Integer, BigDecimal>());
AGENT_RATE_MAP.put(AGENT_REWARD_TYPE_SELF_ORDER + PDD_OFFSET, new HashMap<Integer, BigDecimal>());
AGENT_RATE_MAP.put(AGENT_REWARD_TYPE_SHARE_ORDER, new HashMap<Integer, BigDecimal>()); AGENT_RATE_MAP.put(AGENT_REWARD_TYPE_SHARE_ORDER, new HashMap<Integer, BigDecimal>());
AGENT_RATE_MAP.put(AGENT_REWARD_TYPE_SHARE_ORDER + JD_OFFSET, new HashMap<Integer, BigDecimal>()); AGENT_RATE_MAP.put(AGENT_REWARD_TYPE_SHARE_ORDER + JD_OFFSET, new HashMap<Integer, BigDecimal>());
...@@ -126,6 +129,7 @@ public class Constants { ...@@ -126,6 +129,7 @@ public class Constants {
AGENT_RATE_MAP.put(AGENT_REWARD_TYPE_SHARE_ORDER + ELM_OFFSET, new HashMap<Integer, BigDecimal>()); AGENT_RATE_MAP.put(AGENT_REWARD_TYPE_SHARE_ORDER + ELM_OFFSET, new HashMap<Integer, BigDecimal>());
AGENT_RATE_MAP.put(AGENT_REWARD_TYPE_SHARE_ORDER + KFC_OFFSET, new HashMap<Integer, BigDecimal>()); AGENT_RATE_MAP.put(AGENT_REWARD_TYPE_SHARE_ORDER + KFC_OFFSET, new HashMap<Integer, BigDecimal>());
AGENT_RATE_MAP.put(AGENT_REWARD_TYPE_SHARE_ORDER + HHYX_OFFSET, new HashMap<Integer, BigDecimal>()); AGENT_RATE_MAP.put(AGENT_REWARD_TYPE_SHARE_ORDER + HHYX_OFFSET, new HashMap<Integer, BigDecimal>());
AGENT_RATE_MAP.put(AGENT_REWARD_TYPE_SHARE_ORDER + PDD_OFFSET, new HashMap<Integer, BigDecimal>());
// 表2-VIP会员+超V会员+礼包送VIP // 表2-VIP会员+超V会员+礼包送VIP
// 710 VIP会员 // 710 VIP会员
// 720 VIP会员 // 720 VIP会员
...@@ -145,22 +149,24 @@ public class Constants { ...@@ -145,22 +149,24 @@ public class Constants {
// 表1-电商购物 // 表1-电商购物
// 750 自购省 // 750 自购省
AGENT_RATE_MAP.get(AGENT_REWARD_TYPE_SELF_ORDER).put(0, new BigDecimal("0.008")); AGENT_RATE_MAP.get(AGENT_REWARD_TYPE_SELF_ORDER).put(0, new BigDecimal("0.008"));
AGENT_RATE_MAP.get(AGENT_REWARD_TYPE_SELF_ORDER + JD_OFFSET).put(0, new BigDecimal("0.0087")); AGENT_RATE_MAP.get(AGENT_REWARD_TYPE_SELF_ORDER + JD_OFFSET).put(0, new BigDecimal("0.008"));
AGENT_RATE_MAP.get(AGENT_REWARD_TYPE_SELF_ORDER + HHYX_OFFSET).put(0, new BigDecimal("0.03")); AGENT_RATE_MAP.get(AGENT_REWARD_TYPE_SELF_ORDER + HHYX_OFFSET).put(0, new BigDecimal("0.03"));
AGENT_RATE_MAP.get(AGENT_REWARD_TYPE_SELF_ORDER + MT_OFFSET).put(0, new BigDecimal("0.01")); AGENT_RATE_MAP.get(AGENT_REWARD_TYPE_SELF_ORDER + MT_OFFSET).put(0, new BigDecimal("0.01"));
AGENT_RATE_MAP.get(AGENT_REWARD_TYPE_SELF_ORDER + TN_OFFSET).put(0, new BigDecimal("0.01")); AGENT_RATE_MAP.get(AGENT_REWARD_TYPE_SELF_ORDER + TN_OFFSET).put(0, new BigDecimal("0.01"));
AGENT_RATE_MAP.get(AGENT_REWARD_TYPE_SELF_ORDER + MTJD_OFFSET).put(0, new BigDecimal("0.01")); AGENT_RATE_MAP.get(AGENT_REWARD_TYPE_SELF_ORDER + MTJD_OFFSET).put(0, new BigDecimal("0.01"));
AGENT_RATE_MAP.get(AGENT_REWARD_TYPE_SELF_ORDER + ELM_OFFSET).put(0, new BigDecimal("0.01")); AGENT_RATE_MAP.get(AGENT_REWARD_TYPE_SELF_ORDER + ELM_OFFSET).put(0, new BigDecimal("0.01"));
AGENT_RATE_MAP.get(AGENT_REWARD_TYPE_SELF_ORDER + KFC_OFFSET).put(0, new BigDecimal("0.01")); AGENT_RATE_MAP.get(AGENT_REWARD_TYPE_SELF_ORDER + KFC_OFFSET).put(0, new BigDecimal("0.01"));
AGENT_RATE_MAP.get(AGENT_REWARD_TYPE_SELF_ORDER + PDD_OFFSET).put(0, new BigDecimal("0.009"));
// 760 分享赚 // 760 分享赚
AGENT_RATE_MAP.get(AGENT_REWARD_TYPE_SHARE_ORDER).put(0, new BigDecimal("0.008")); AGENT_RATE_MAP.get(AGENT_REWARD_TYPE_SHARE_ORDER).put(0, new BigDecimal("0.008"));
AGENT_RATE_MAP.get(AGENT_REWARD_TYPE_SHARE_ORDER + JD_OFFSET).put(0, new BigDecimal("0.0087")); AGENT_RATE_MAP.get(AGENT_REWARD_TYPE_SHARE_ORDER + JD_OFFSET).put(0, new BigDecimal("0.008"));
AGENT_RATE_MAP.get(AGENT_REWARD_TYPE_SHARE_ORDER + HHYX_OFFSET).put(0, new BigDecimal("0.03")); AGENT_RATE_MAP.get(AGENT_REWARD_TYPE_SHARE_ORDER + HHYX_OFFSET).put(0, new BigDecimal("0.03"));
AGENT_RATE_MAP.get(AGENT_REWARD_TYPE_SHARE_ORDER + MT_OFFSET).put(0, new BigDecimal("0.01")); AGENT_RATE_MAP.get(AGENT_REWARD_TYPE_SHARE_ORDER + MT_OFFSET).put(0, new BigDecimal("0.01"));
AGENT_RATE_MAP.get(AGENT_REWARD_TYPE_SHARE_ORDER + TN_OFFSET).put(0, new BigDecimal("0.01")); AGENT_RATE_MAP.get(AGENT_REWARD_TYPE_SHARE_ORDER + TN_OFFSET).put(0, new BigDecimal("0.01"));
AGENT_RATE_MAP.get(AGENT_REWARD_TYPE_SHARE_ORDER + MTJD_OFFSET).put(0, new BigDecimal("0.01")); AGENT_RATE_MAP.get(AGENT_REWARD_TYPE_SHARE_ORDER + MTJD_OFFSET).put(0, new BigDecimal("0.01"));
AGENT_RATE_MAP.get(AGENT_REWARD_TYPE_SHARE_ORDER + ELM_OFFSET).put(0, new BigDecimal("0.01")); AGENT_RATE_MAP.get(AGENT_REWARD_TYPE_SHARE_ORDER + ELM_OFFSET).put(0, new BigDecimal("0.01"));
AGENT_RATE_MAP.get(AGENT_REWARD_TYPE_SHARE_ORDER + KFC_OFFSET).put(0, new BigDecimal("0.01")); AGENT_RATE_MAP.get(AGENT_REWARD_TYPE_SHARE_ORDER + KFC_OFFSET).put(0, new BigDecimal("0.01"));
AGENT_RATE_MAP.get(AGENT_REWARD_TYPE_SHARE_ORDER + PDD_OFFSET).put(0, new BigDecimal("0.009"));
AGENT_REWARD_REMARK.put(AGENT_REWARD_TYPE_YEAR_VIP, AGENT_REWARD_TYPE_YEAR_VIP_REMARK); AGENT_REWARD_REMARK.put(AGENT_REWARD_TYPE_YEAR_VIP, AGENT_REWARD_TYPE_YEAR_VIP_REMARK);
AGENT_REWARD_REMARK.put(AGENT_REWARD_TYPE_HALF_YEAR_VIP, AGENT_REWARD_TYPE_HALF_YEAR_VIP_REMARK); AGENT_REWARD_REMARK.put(AGENT_REWARD_TYPE_HALF_YEAR_VIP, AGENT_REWARD_TYPE_HALF_YEAR_VIP_REMARK);
......
...@@ -146,7 +146,7 @@ public class PartnerAccount implements Serializable { ...@@ -146,7 +146,7 @@ public class PartnerAccount implements Serializable {
* 会员截止日期 * 会员截止日期
*/ */
@TableField(value = "vip_deadline") @TableField(value = "vip_deadline")
private Integer vipDeadline; private Long vipDeadline;
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
...@@ -107,6 +107,9 @@ public class AgentRewardQueueTask { ...@@ -107,6 +107,9 @@ public class AgentRewardQueueTask {
} else if ((rewardType == AGENT_REWARD_TYPE_SELF_ORDER || rewardType == AGENT_REWARD_TYPE_SHARE_ORDER) } else if ((rewardType == AGENT_REWARD_TYPE_SELF_ORDER || rewardType == AGENT_REWARD_TYPE_SHARE_ORDER)
&& message.getOrderType().equals(ORDER_TYPE_HHYX) ) { && message.getOrderType().equals(ORDER_TYPE_HHYX) ) {
rateMap = AGENT_RATE_MAP.get(rewardType + HHYX_OFFSET); rateMap = AGENT_RATE_MAP.get(rewardType + HHYX_OFFSET);
} else if ((rewardType == AGENT_REWARD_TYPE_SELF_ORDER || rewardType == AGENT_REWARD_TYPE_SHARE_ORDER)
&& message.getOrderType().equals(ORDER_TYPE_PDD) ) {
rateMap = AGENT_RATE_MAP.get(rewardType + PDD_OFFSET);
} else if (rewardType == AGENT_REWARD_TYPE_SELF_ORDER } else if (rewardType == AGENT_REWARD_TYPE_SELF_ORDER
&& message.getOrderType().equals(ORDER_TYPE_MT) ) { && message.getOrderType().equals(ORDER_TYPE_MT) ) {
rateMap = AGENT_RATE_MAP.get(rewardType + MT_OFFSET); rateMap = AGENT_RATE_MAP.get(rewardType + MT_OFFSET);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment