Explorar o código

项目提成结算定时任务

wucl %!s(int64=2) %!d(string=hai) anos
pai
achega
526eea5b91

+ 2 - 0
domain/src/main/java/com/dayou/common/Constants.java

@@ -76,4 +76,6 @@ public interface Constants {
     String MATH_REGULAR = "^[0-9]+(.[0-9]+)?$";
 
     BigDecimal HUNDRED = BigDecimal.TEN.multiply(BigDecimal.TEN);
+
+    String YEARMONTH = "year-month";
 }

+ 2 - 1
service/src/main/java/com/dayou/brokerage/config/BrokerageSettleSchedule.java

@@ -14,6 +14,7 @@ import org.springframework.stereotype.Component;
 import java.util.Date;
 
 import static com.dayou.brokerage.constants.BrokerageMsg.BROKERAGE_SEQUENCE_EMBODY;
+import static com.dayou.common.Constants.YEARMONTH;
 
 /**
  * 类说明:
@@ -37,7 +38,7 @@ public class BrokerageSettleSchedule {
                 Date now = new Date();
                 int year = DateUtils.getYear(now);
                 int month = DateUtils.getMonth(now);
-                String embody = BROKERAGE_SEQUENCE_EMBODY.replace("year-month", year + "-" + (month + 1));
+                String embody = BROKERAGE_SEQUENCE_EMBODY.replace(YEARMONTH, year + "-" + (month + 1));
                 int count = itemBrokerageSequenceService.count(new LambdaQueryWrapper<ItemBrokerageSequence>().eq(ItemBrokerageSequence::getEmbody, embody).eq(BaseEntity::getDeleted, Boolean.FALSE));
                 if (count!=0){
                     log.info(embody+"提成已被结算,无需重复结算.");

+ 3 - 2
service/src/main/java/com/dayou/service/impl/ItemBrokerageSequenceServiceImpl.java

@@ -33,6 +33,7 @@ import java.util.stream.Collectors;
 import org.springframework.transaction.annotation.Transactional;
 
 import static com.dayou.brokerage.constants.BrokerageMsg.*;
+import static com.dayou.common.Constants.YEARMONTH;
 
 /**
  * <p>
@@ -106,7 +107,7 @@ public class ItemBrokerageSequenceServiceImpl extends ServiceImpl<ItemBrokerageS
                     .brokerageAmount(nonMarketerAheadAmount.getValue())
                     .userId(nonMarketerAheadAmount.getKey())
                     .cate(BrokerageBusiness.DEFAULT_AHEAD.getCode())
-                    .embody(BROKERAGE_SEQUENCE_EMBODY.replace("year-month",year+"-"+(month+1))).remark(NON_MARKETER_BASE_SEQUENCE_REMARK).build();
+                    .embody(BROKERAGE_SEQUENCE_EMBODY.replace(YEARMONTH,year+"-"+(month+1))).remark(NON_MARKETER_BASE_SEQUENCE_REMARK).build();
             sequences.add(sequence);
         }
         return this.saveBatch(sequences);
@@ -171,7 +172,7 @@ public class ItemBrokerageSequenceServiceImpl extends ServiceImpl<ItemBrokerageS
                     ItemBrokerageSequence sequence = ItemBrokerageSequence.builder().brokerageAmount(userTotalAmount).userId(userSequence.getKey())
                             .cate(BrokerageBusiness.ITEM_SETTLE.getCode())
                             .remark(BROKERAGE_SEQUENCE_REMARK.replace("sum",itemSize.size()+"").replace("month",(month+1)+""))
-                            .embody(BROKERAGE_SEQUENCE_EMBODY.replace("year-month",year+"-"+(month+1))).build();
+                            .embody(BROKERAGE_SEQUENCE_EMBODY.replace(YEARMONTH,year+"-"+(month+1))).build();
                     this.save(sequence);
                     values.stream().forEach(x->{x.setSequenceId(sequence.getId());});
                     brokerageSequenceDetailService.saveBatch(values);