修改拼团最高奖励返回值

src/main/java/com/jeeplus/modules/api/hpposition/entity/HpGroupPositionAPI.java

@@ -525,11 +525,19 @@ public class HpGroupPositionAPI extends DataEntity<HpGroupPositionAPI> {
     }
 
     public String getReward() {
+        //拼团最高奖励返回
         if (getMaleReward() != null && getFemaleReward() != null) {
             if (getMaleReward().equals(getFemaleReward())) {
-                return String.valueOf(getMaleReward());
+                if (getFiveGroupCashback() != null) {
+                    Integer male = getMaleReward() + getFiveGroupCashback();
+                    return String.valueOf(male);
+                }
             } else {
-                return "男返" + getMaleReward() + ",女返" + getFemaleReward();
+                if (getFiveGroupCashback() != null) {
+                    Integer male = getMaleReward() + getFiveGroupCashback();
+                    Integer female = getFemaleReward() + getFiveGroupCashback();
+                    return "男返" + male + ",女返" + female;
+                }
             }
         }
         return reward;

src/main/java/com/jeeplus/modules/hpposition/entity/HpGroupPosition.java

@@ -486,9 +486,16 @@ public class HpGroupPosition extends DataEntity<HpGroupPosition> {
     public String getReward() {
         if (getMaleReward() != null && getFemaleReward() != null) {
             if (getMaleReward().equals(getFemaleReward())) {
-                return String.valueOf(getMaleReward());
+                if (getFiveGroupCashback() != null) {
+                    Integer male = getMaleReward() + getFiveGroupCashback();
+                    return String.valueOf(male);
+                }
             } else {
-                return "男返" + getMaleReward() + ",女返" + getFemaleReward();
+                if (getFiveGroupCashback() != null) {
+                    Integer male = getMaleReward() + getFiveGroupCashback();
+                    Integer female = getFemaleReward() + getFiveGroupCashback();
+                    return "男返" + male + ",女返" + female;
+                }
             }
         }
         return reward;

src/main/java/com/jeeplus/modules/hpposition/entity/HpPositionCommon.java

@@ -18,6 +18,8 @@ public class HpPositionCommon extends DataEntity<HpPositionCommon> {
     private String totalSalary;        // 综合薪资（0：1000~2000 1：2001~3000 2：3001~4000 3：4001~5000 4：5001~6000 5：6001~7000 6：7001~8000 7：8001~9000 8：9001~10000 9：10000以上）
     private Integer maleReward;        // 奖励金额（男）
     private Integer femaleReward;        // 奖励金额（女）
+    private Integer threeGroupCashback;        // 3人团返现
+    private Integer fiveGroupCashback;        // 5人团返现
     private Integer platformAllowance;        // 平台补贴
     private String reward;    //入职奖励金额(实际返费)
     private String workDinner;        // 工作餐（0：不提供工作餐 1：提供工作餐 2：提供午餐，晚餐）
@@ -113,6 +115,22 @@ public class HpPositionCommon extends DataEntity<HpPositionCommon> {
         this.femaleReward = femaleReward;
     }
 
+    public Integer getThreeGroupCashback() {
+        return threeGroupCashback;
+    }
+
+    public void setThreeGroupCashback(Integer threeGroupCashback) {
+        this.threeGroupCashback = threeGroupCashback;
+    }
+
+    public Integer getFiveGroupCashback() {
+        return fiveGroupCashback;
+    }
+
+    public void setFiveGroupCashback(Integer fiveGroupCashback) {
+        this.fiveGroupCashback = fiveGroupCashback;
+    }
+
     public Integer getPlatformAllowance() {
         return platformAllowance;
     }
@@ -124,9 +142,16 @@ public class HpPositionCommon extends DataEntity<HpPositionCommon> {
     public String getReward() {
         if (getMaleReward() != null && getFemaleReward() != null) {
             if (getMaleReward().equals(getFemaleReward())) {
-                return String.valueOf(getMaleReward());
+                if (getFiveGroupCashback() != null) {
+                    Integer male = getMaleReward() + getFiveGroupCashback();
+                    return String.valueOf(male);
+                }
             } else {
-                return "男返" + getMaleReward() + ",女返" + getFemaleReward();
+                if (getFiveGroupCashback() != null) {
+                    Integer male = getMaleReward() + getFiveGroupCashback();
+                    Integer female = getFemaleReward() + getFiveGroupCashback();
+                    return "男返" + male + ",女返" + female;
+                }
             }
         }
         return reward;

src/main/java/com/jeeplus/modules/hpposition/mapper/xml/HpFulltimePositionMapper.xml

@@ -749,6 +749,8 @@
 		ifnull(a.total_salary,a.basic_salary) AS "totalSalary",
 		null as "maleReward",
 		null as "femaleReward",
+		null AS "threeGroupCashback",
+		null AS "fiveGroupCashback",
 		null as "platformAllowance",
 		null AS "startGroupNumber",
 		a.work_dinner AS "workDinner",
@@ -802,6 +804,8 @@
 		ifnull(b.total_salary,b.basic_salary) AS "totalSalary",
 		b.male_reward as "maleReward",
 		b.female_reward as "femaleReward",
+		null AS "threeGroupCashback",
+		null AS "fiveGroupCashback",
 		b.platform_allowance as "platformAllowance",
 		null AS "startGroupNumber",
 		b.work_dinner AS "workDinner",
@@ -855,6 +859,8 @@
 		ifnull(c.total_salary,c.basic_salary) AS "totalSalary",
 		c.male_reward as "maleReward",
 		c.female_reward as "femaleReward",
+		c.three_group_cashback AS "threeGroupCashback",
+		c.five_group_cashback AS "fiveGroupCashback",
 		null as "platformAllowance",
 		c.start_group_number AS "startGroupNumber",
 		c.work_dinner AS "workDinner",
@@ -907,6 +913,8 @@
 		null AS "totalSalary",
 		null as "maleReward",
 		null as "femaleReward",
+		null AS "threeGroupCashback",
+		null AS "fiveGroupCashback",
 		null as "platformAllowance",
 		null AS "startGroupNumber",
 		null AS "workDinner",
@@ -960,6 +968,8 @@
 		ifnull(e.total_salary,e.basic_salary) AS "totalSalary",
 		e.male_reward as "maleReward",
 		e.female_reward as "femaleReward",
+		null AS "threeGroupCashback",
+		null AS "fiveGroupCashback",
 		null as "platformAllowance",
 		null AS "startGroupNumber",
 		e.work_dinner AS "workDinner",
@@ -1013,6 +1023,8 @@
 		null AS "totalSalary",
 		null as "maleReward",
 		null as "femaleReward",
+		null AS "threeGroupCashback",
+		null AS "fiveGroupCashback",
 		null as "platformAllowance",
 		null AS "startGroupNumber",
 		null AS "workDinner",
@@ -1059,6 +1071,8 @@
 		null AS "totalSalary",
 		null as "maleReward",
 		null as "femaleReward",
+		null AS "threeGroupCashback",
+		null AS "fiveGroupCashback",
 		null as "platformAllowance",
 		null AS "startGroupNumber",
 		null AS "workDinner",

src/main/java/com/jeeplus/modules/hpposition/mapper/xml/HpGroupPositionMapper.xml

@@ -387,6 +387,8 @@
 			ifnull(a.total_salary,a.basic_salary) AS "totalSalary",
 			a.male_reward AS "maleReward",
 			a.female_reward AS "femaleReward",
+			a.three_group_cashback AS "threeGroupCashback",
+			a.five_group_cashback AS "fiveGroupCashback",
 			a.work_dinner AS "workDinner",
 			a.accommodation AS "accommodation",
 			a.social_security AS "socialSecurity",