mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-06-13 11:49:49 +08:00
比较订单分账记录
This commit is contained in:
@@ -778,6 +778,11 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService {
|
|||||||
* @return true:一致; false:不一致
|
* @return true:一致; false:不一致
|
||||||
*/
|
*/
|
||||||
public boolean compareOrderSplitRecord(List<OrderSplitRecord> generatedOrderSplitRecordList, List<OrderSplitRecord> queryOrderSplitRecordList) {
|
public boolean compareOrderSplitRecord(List<OrderSplitRecord> generatedOrderSplitRecordList, List<OrderSplitRecord> queryOrderSplitRecordList) {
|
||||||
|
// 判断入参是否为空
|
||||||
|
if (CollectionUtils.isEmpty(generatedOrderSplitRecordList) || CollectionUtils.isEmpty(queryOrderSplitRecordList)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
if (generatedOrderSplitRecordList.size() != queryOrderSplitRecordList.size()) {
|
if (generatedOrderSplitRecordList.size() != queryOrderSplitRecordList.size()) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@@ -788,6 +793,27 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService {
|
|||||||
// queryOrderSplitRecordList转为map, key为adapayMemberId, value为分账记录
|
// queryOrderSplitRecordList转为map, key为adapayMemberId, value为分账记录
|
||||||
Map<String, OrderSplitRecord> queryMap = queryOrderSplitRecordList.stream()
|
Map<String, OrderSplitRecord> queryMap = queryOrderSplitRecordList.stream()
|
||||||
.collect(Collectors.toMap(OrderSplitRecord::getAdapayMemberId, v -> v));
|
.collect(Collectors.toMap(OrderSplitRecord::getAdapayMemberId, v -> v));
|
||||||
|
|
||||||
|
for (String adapayMemberId : generatedMap.keySet()) {
|
||||||
|
OrderSplitRecord o1 = generatedMap.get(adapayMemberId);
|
||||||
|
OrderSplitRecord o2 = queryMap.get(adapayMemberId);
|
||||||
|
if (o1 == null || o2 == null) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
// 对比o1和o2的4个字段,electricitySplitRatio, electricitySplitAmount, serviceSplitRatio, serviceSplitAmount,如果不一致返回false
|
||||||
|
if (o1.getElectricitySplitRatio().compareTo(o2.getElectricitySplitRatio()) != 0) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (o1.getElectricitySplitAmount().compareTo(o2.getElectricitySplitAmount()) != 0) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (o1.getServiceSplitRatio().compareTo(o2.getServiceSplitRatio()) != 0) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (o1.getServiceSplitAmount().compareTo(o2.getServiceSplitAmount()) != 0) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user