## 奖金明细同步列表字段；调整排序；

bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/CuMemberBonusVO.java

@@ -106,7 +106,6 @@ public class CuMemberBonusVO implements Serializable {
     /**
      * 直推收益
      */
-    @Excel(name = "直推收益($)", scale = 2)
     private BigDecimal directIncome;
 
     /**
@@ -118,7 +117,6 @@ public class CuMemberBonusVO implements Serializable {
     /**
      * 拓展收益
      */
-    @Excel(name = "拓展收益($)", scale = 2)
     private BigDecimal expandIncome;
 
     /**
@@ -151,7 +149,6 @@ public class CuMemberBonusVO implements Serializable {
     /**
      * 辅导收益
      */
-    @Excel(name = "辅导收益($)", scale = 2)
     private BigDecimal coachIncome;
 
     /**
@@ -163,7 +160,6 @@ public class CuMemberBonusVO implements Serializable {
     /**
      * 分红收益
      */
-    @Excel(name = "分红收益($)", scale = 2)
     private BigDecimal shareIncome;
 
     /**
@@ -175,19 +171,16 @@ public class CuMemberBonusVO implements Serializable {
     /**
      * 报单收益
      */
-    @Excel(name = "服务收益($)", scale = 2)
     private BigDecimal serviceIncome;
 
     /**
      * 复购级差收益
      */
-    @Excel(name = "复购推荐收益", scale = 2)
     private BigDecimal repurPushIncomeOri;
 
     /**
      * 复购级差收益
      */
-    @Excel(name = "复购推荐收益", scale = 2)
     private BigDecimal repurPushIncome;
 
     /**
@@ -199,7 +192,6 @@ public class CuMemberBonusVO implements Serializable {
     /**
      * 复购级差收益
      */
-    @Excel(name = "复购级差收益($)", scale = 2)
     private BigDecimal repurRangeIncome;
 
 
@@ -212,18 +204,16 @@ public class CuMemberBonusVO implements Serializable {
     /**
      * 复购拓展收益
      */
-    @Excel(name = "复购拓展收益($)", scale = 2)
     private BigDecimal repurExpandIncome;
 
     /**
-     * 复购拓展收益
+     * 复购辅导收益
      */
-    @Excel(name = "复购拓展收益", scale = 2)
+    @Excel(name = "复购辅导收益", scale = 2)
     private BigDecimal repurCoachIncomeOri;
     /**
-     * 复购拓展收益
+     * 复购辅导收益
      */
-    @Excel(name = "复购拓展收益($)", scale = 2)
     private BigDecimal repurCoachIncome;
 
     /**
@@ -235,7 +225,6 @@ public class CuMemberBonusVO implements Serializable {
     /**
      * 复购卷
      */
-    @Excel(name = "复购卷($)", scale = 2)
     private BigDecimal repurCoupon;
 
     /**
@@ -247,7 +236,6 @@ public class CuMemberBonusVO implements Serializable {
     /**
      * 复购券均分收益
      */
-    @Excel(name = "复购券均分($)", scale = 2)
     private BigDecimal repurCouponShare;
 
     /**
@@ -259,7 +247,6 @@ public class CuMemberBonusVO implements Serializable {
     /**
      * 商城重消
      */
-    @Excel(name = "商城重消($)", scale = 2)
     private BigDecimal backPoints;
 
     /**
@@ -271,7 +258,6 @@ public class CuMemberBonusVO implements Serializable {
     /**
      * 平台服务费
      */
-    @Excel(name = "平台服务费($)", scale = 2)
     private BigDecimal serviceSpend;
 
     /**
@@ -283,7 +269,6 @@ public class CuMemberBonusVO implements Serializable {
     /**
      * 环球积分
      */
-    @Excel(name = "直推极差($)", scale = 2)
     private BigDecimal globalPoints;
 
     /**
@@ -296,31 +281,26 @@ public class CuMemberBonusVO implements Serializable {
     /**
      * 车奖积分
      */
-    @Excel(name = "车奖积分($)", scale = 2)
     private BigDecimal carAwardPoints;
 
     /**
      * 店铺收益
      */
-    @Excel(name = "店铺收益", scale = 2)
     private BigDecimal storeIncomeOri;
 
     /**
      * 店铺收益
      */
-    @Excel(name = "店铺收益($)", scale = 2)
     private BigDecimal storeIncome;
 
     /**
      * 嗨粉推荐收益
      */
-    @Excel(name = "嗨粉推荐收益", scale = 2)
     private BigDecimal hiFunIncomeOri;
 
     /**
      * 嗨粉推荐收益
      */
-    @Excel(name = "嗨粉推荐收益($)", scale = 2)
     private BigDecimal hiFunIncome;
 
     /**
@@ -332,7 +312,6 @@ public class CuMemberBonusVO implements Serializable {
     /**
      * 首购实发小计
      */
-    @Excel(name = "首购实发小计($)", scale = 2)
     private BigDecimal purRealSubtotal;
 
     /**
@@ -344,7 +323,6 @@ public class CuMemberBonusVO implements Serializable {
     /**
      * 复购实发小计
      */
-    @Excel(name = "复购实发小计($)", scale = 2)
     private BigDecimal repurRealSubtotal;
 
     /**
@@ -356,7 +334,6 @@ public class CuMemberBonusVO implements Serializable {
     /**
      * 复购券小计
      */
-    @Excel(name = "复购券实发小计($)", scale = 2)
     private BigDecimal repurCouponSubtotal;
 
     /**
@@ -369,6 +346,5 @@ public class CuMemberBonusVO implements Serializable {
     /**
      * 实发收益总计
      */
-    @Excel(name = "实发收益总计($)", scale = 2)
     private BigDecimal realIncomeTotal;
 }

bd-business/bd-business-bonus/src/main/resources/mapper/member/bonus/CuMemberBonusMapper.xml

@@ -334,7 +334,7 @@
             where a.pk_id = cb.pk_member
             )
         </if>
-        order by cb.period desc
+        order by cb.period desc, cb.pk_member
     </select>
 
     <select id="queryMemberBonusByConditionForServerSum" resultMap="CuMemberBonus">