|
@@ -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);
|