golden 功能调整

crm-custom/src/main/java/com/crm/custom/service/impl/GoldenCustomBalanceRecordServiceImpl.java

@@ -113,15 +113,23 @@ public class GoldenCustomBalanceRecordServiceImpl implements GoldenCustomBalance
 
         if(num > 0){
             BigDecimal giveAmount = null;
-            Integer count = customInfoRepository.countByPId(pCustom.getId());
+            Integer addNum = 0;     //推荐人数
+            GoldenRewardAmountConfigTable rewardCconfig = goldenRewardAmountConfigRepository.getFirstByEmail(pCustom.getEmail());
+            if(rewardCconfig != null && rewardCconfig.getAddNum() != null && rewardCconfig.getAddNum() > 0){
+                addNum = rewardCconfig.getAddNum();
+            }else{
+                SysConfigTable sysConfigTable = sysConfigService.getByCode(ConfigConstants.CUSTOM_TRAINEE_ADVANCED_ADD_NUM);
+                addNum = (sysConfigTable == null || sysConfigTable.getValue() == null)
+                        ? 0 : Integer.valueOf(sysConfigTable.getValue());
+            }
 
-            if (count < 10){
+            Integer count = customInfoRepository.countByPId(pCustom.getId());
+            if (count < addNum){
                 SysConfigTable sysConfigTable = sysConfigService.getByCode(ConfigConstants.CUSTOM_TRAINEE_REWARD_AMOUNT);
                 giveAmount = (sysConfigTable == null || sysConfigTable.getValue() == null)
                         ? BigDecimal.ZERO : new BigDecimal(sysConfigTable.getValue());
 
             }else{
-                GoldenRewardAmountConfigTable rewardCconfig = goldenRewardAmountConfigRepository.getFirstByEmail(pCustom.getEmail());
                 if(rewardCconfig != null && rewardCconfig.getAmount() != null){
                     giveAmount = rewardCconfig.getAmount();
                 }else {

crm-custom/src/main/resources/mapper/GoldenGoods.xml

@@ -35,7 +35,7 @@
             </foreach>
         </if>
         group by goods.id
-        order by der.id desc
+        order by ANY_VALUE(der.id) desc
         <if test="page != null">
             limit #{page.offset},#{page.row}
         </if>

crm-model/src/main/java/com/crm/rely/backend/model/constant/ConfigConstants.java

@@ -61,5 +61,6 @@ public class ConfigConstants {
     public static final String CUSTOM_TRAINEE_REWARD_RECORD = "CUSTOM_TRAINEE_REWARD_RECORD";
     public static final String CUSTOM_TRAINEE_REWARD_AMOUNT = "CUSTOM_TRAINEE_REWARD_AMOUNT";
     public static final String CUSTOM_TRAINEE_ADVANCED_REWARD_AMOUNT = "CUSTOM_TRAINEE_ADVANCED_REWARD_AMOUNT";
+    public static final String CUSTOM_TRAINEE_ADVANCED_ADD_NUM = "CUSTOM_TRAINEE_ADVANCED_ADD_NUM";
 
 }

crm-model/src/main/java/com/crm/rely/backend/model/dto/golden/reward/GoldenRewardAmountConfigListDto.java

@@ -14,6 +14,8 @@ public class GoldenRewardAmountConfigListDto {
 
     private BigDecimal amount;
 
+    private Integer addNum;
+
     private Date addTime;
 
 }

crm-model/src/main/java/com/crm/rely/backend/model/entity/golden/reward/GoldenRewardAmountConfigAddEntity.java

@@ -18,4 +18,7 @@ public class GoldenRewardAmountConfigAddEntity extends BaseAddEntity {
     @NotNull(message = Constants.PARAMETER_ERROR)
     private BigDecimal amount;
 
+    @NotNull(message = Constants.PARAMETER_ERROR)
+    private Integer addNum;
+
 }

crm-model/src/main/java/com/crm/rely/backend/model/entity/golden/reward/GoldenRewardAmountConfigUpdateEntity.java

@@ -18,4 +18,7 @@ public class GoldenRewardAmountConfigUpdateEntity extends BaseUpdateEntity {
     @NotNull(message = Constants.PARAMETER_ERROR)
     private BigDecimal amount;
 
+    @NotNull(message = Constants.PARAMETER_ERROR)
+    private Integer addNum;
+
 }

crm-model/src/main/java/com/crm/rely/backend/model/pojo/table/GoldenRewardAmountConfigTable.java

@@ -16,4 +16,6 @@ public class GoldenRewardAmountConfigTable extends BaseTable {
 
     private BigDecimal amount;
 
+    private Integer addNum;
+
 }