From 486e22c57ca8a1e2dc6877b539e2f3add67250f1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 23 十一月 2019 18:28:00 +0800
Subject: [PATCH] 冲突解决
---
fanli/src/main/java/com/yeshi/fanli/entity/integral/IntegralTask.java | 77 +++++++++++++++++++++++++++-----------
1 files changed, 55 insertions(+), 22 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/integral/IntegralTask.java b/fanli/src/main/java/com/yeshi/fanli/entity/integral/IntegralTask.java
index 25e6f6b..f703830 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/integral/IntegralTask.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/integral/IntegralTask.java
@@ -18,7 +18,7 @@
*
*/
private static final long serialVersionUID = 1L;
-
+
public enum FrequencyEnum {
everyday("姣忓ぉ"), onlyOne("鍙湁涓�娆�");
private final String desc;
@@ -31,20 +31,54 @@
return desc;
}
}
-
+
public enum TaskUniqueKeyEnum {
- dailySign1("绗�1澶╃鍒�"), dailySign2("绗�2澶╃鍒�"),dailySign3("绗�3澶╃鍒�"),dailySign4("绗�4澶╃鍒�"), dailySign5("绗�5澶╃鍒�"),
- dailySign6("绗�6澶╃鍒�"), dailySign7("绗�7澶╃鍒�"), recommendSearch("瀹屾垚鎼滅储"), taoLiJinBuy("鐐瑰嚮绔嬪噺"),
- inviteLevelOne("鐩存帴閭�璇�"),inviteLevelTwo("闂存帴閭�璇�"), buyReduce("鑷喘绔嬪噺"), shareSingleGoods("鍒嗕韩鍗曚釜鍟嗗搧"),
- shareMultipleGoods("鍒嗕韩澶氫釜鍟嗗搧"), shareInvite("閭�璇风礌鏉�"), shareTLJGoods("鐖嗘鍟嗗搧") ,
- giveRebateCoupon("杩斿埄濂栧姳鍒�"), giveFreeCoupon("璧犻�佸厤鍗曞埜"),giveTaoLiJin("璧犻�佹帹骞跨孩鍖�"),inShop("娴忚搴楅摵"),
- inShopLevelOne("涓�绾ч槦鍛樻祻瑙堝簵閾�"),inShopLevelTwo("浜岀骇闃熷憳娴忚搴楅摵"),scanPush("娴忚鎺ㄨ崘璁板綍"),scanGoods("娴忚鍟嗗搧璇︽儏椤�"),
- scanSearchResult("娴忚鎼滅储缁撴灉椤�"),scanHomeBanner("娴忚妯箙涓撻"),scanSpecial("娴忚棣栭〉涓撻"),scanTBCart("娴忚璐墿杞﹂〉"),
- closeRecommendGoods("鍏抽棴鎺ㄨ崘鍟嗗搧"),couponRebate("鐐瑰嚮棰嗗埜杩斿埄"),couponRebateLevelOne("娴忚璐墿杞﹂〉"),couponRebateLevelTwo("娴忚璐墿杞﹂〉"),
- rebateOrder("瀹屾垚杩斿埄璁㈠崟"),inviteOrderLevelOne("涓�绾ч槦鍛橀個璇疯鍗�"),inviteOrderLevelTwo("浜岀骇闃熷憳閭�璇疯鍗�"),shareOrder("鍒嗕韩璁㈠崟"),
- bindWeiXin("寰俊鎺堟潈"),bindPhone("缁戝畾鎵嬫満"),bindTaoBao("娣樺疂鎺堟潈"), setWeiXinNum("娣诲姞寰俊鍙�"),setGender("棣栨璁剧疆鎬у埆"),
- setPortrait("棣栨淇敼澶村儚"), setNickName("淇敼鏄电О"),bindAlipay("缁戝畾鏀粯瀹�"),inviteActivate("婵�娲婚個璇�");
-
+ dailySign1("绗�1澶╃鍒�"),
+ dailySign2("绗�2澶╃鍒�"),
+ dailySign3("绗�3澶╃鍒�"),
+ dailySign4("绗�4澶╃鍒�"),
+ dailySign5("绗�5澶╃鍒�"),
+ dailySign6("绗�6澶╃鍒�"),
+ dailySign7("绗�7澶╃鍒�"),
+ recommendSearch("瀹屾垚鎼滅储"),
+ taoLiJinBuy("鐐瑰嚮绔嬪噺"),
+ inviteLevelOne("鐩存帴閭�璇�"),
+ inviteLevelTwo("闂存帴閭�璇�"),
+ buyReduce("鑷喘绔嬪噺"),
+ shareSingleGoods("鍒嗕韩鍗曚釜鍟嗗搧"),
+ shareMultipleGoods("鍒嗕韩澶氫釜鍟嗗搧"),
+ shareInvite("閭�璇风礌鏉�"),
+ shareTLJGoods("鐖嗘鍟嗗搧"),
+ giveRebateCoupon("杩斿埄濂栧姳鍒�"),
+ giveFreeCoupon("璧犻�佸厤鍗曞埜"),
+ giveTaoLiJin("璧犻�佹帹骞跨孩鍖�"),
+ inShop("娴忚搴楅摵"),
+ inShopLevelOne("涓�绾ч槦鍛樻祻瑙堝簵閾�"),
+ inShopLevelTwo("浜岀骇闃熷憳娴忚搴楅摵"),
+ scanPush("娴忚鎺ㄨ崘璁板綍"),
+ scanGoods("娴忚鍟嗗搧璇︽儏椤�"),
+ scanSearchResult("娴忚鎼滅储缁撴灉椤�"),
+ scanHomeBanner("娴忚妯箙涓撻"),
+ scanSpecial("娴忚棣栭〉涓撻"),
+ scanTBCart("娴忚璐墿杞﹂〉"),
+ closeRecommendGoods("鍏抽棴鎺ㄨ崘鍟嗗搧"),
+ couponRebate("鐐瑰嚮棰嗗埜杩斿埄"),
+ couponRebateLevelOne("娴忚璐墿杞﹂〉"),
+ couponRebateLevelTwo("娴忚璐墿杞﹂〉"),
+ rebateOrder("瀹屾垚杩斿埄璁㈠崟"),
+ inviteOrderLevelOne("涓�绾ч槦鍛橀個璇疯鍗�"),
+ inviteOrderLevelTwo("浜岀骇闃熷憳閭�璇疯鍗�"),
+ shareOrder("鍒嗕韩璁㈠崟"),
+ bindWeiXin("寰俊鎺堟潈"),
+ bindPhone("缁戝畾鎵嬫満"),
+ bindTaoBao("娣樺疂鎺堟潈"),
+ setWeiXinNum("娣诲姞寰俊鍙�"),
+ setGender("棣栨璁剧疆鎬у埆"),
+ setPortrait("棣栨淇敼澶村儚"),
+ setNickName("淇敼鏄电О"),
+ bindAlipay("缁戝畾鏀粯瀹�"),
+ inviteActivate("婵�娲婚個璇�");
+
private final String desc;
private TaskUniqueKeyEnum(String desc) {
@@ -55,14 +89,13 @@
return desc;
}
}
-
@Column(name = "it_id")
private Long id;
@Column(name = "it_cid")
- private IntegralTaskClass taskClass ;
-
+ private IntegralTaskClass taskClass;
+
@Column(name = "it_name")
private String name;// 鍚嶇О
@@ -74,19 +107,19 @@
@Column(name = "it_frequency")
private FrequencyEnum frequency; // 棰戠巼
-
+
@Column(name = "it_gold_coin")
private Integer goldCoin; // 鍩虹閲戝竵
@Column(name = "it_upper_limit")
- private Integer upperLimit; // 闄愬埗
-
+ private Integer upperLimit; // 闄愬埗
+
@Column(name = "it_double_num")
private Integer doubleNum; // 鍔犲�嶆暟閲�
-
+
@Column(name = "it_state")
private Integer state; // 鐘舵�侊細 1鍚敤 0鍋滅敤
-
+
@Column(name = "it_create_time")
private Date createTime;
--
Gitblit v1.8.0