attiya/ebike-share
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: attiya:da8e224fae8059c2df85909209aaf016ac604a1c
Branches Tags
attiya:main
..
compare: attiya:1f5fdb8ab01d98e892a222e08602307245dbf2b1
Branches Tags
attiya:main

No commits in common. "da8e224fae8059c2df85909209aaf016ac604a1c" and "1f5fdb8ab01d98e892a222e08602307245dbf2b1" have entirely different histories.
da8e224fae ... 1f5fdb8ab0

4 changed files with 5 additions and 12 deletions
Show Stats Expand all files Collapse all files

2
ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/EbikeBikeOrderService.java
View File

@ -22,5 +22,5 @@ public interface EbikeBikeOrderService extends IService<EbikeBikeOrder> {
* @param bikeId 车辆ID
* @param receiverId 处理人ID
*/
String doneChangeBattery(String bikeId,String receiverId);
void doneChangeBattery(String bikeId,String receiverId);
}

3
ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java
View File

@ -750,14 +750,13 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
}
StaffFeign staffFeign = result.getData();
//匹配工单ID、将其完成
String orderId = orderService.doneChangeBattery(ebikeBikeInfo.getBikeId(), String.valueOf(staffFeign.getStaffId()));
orderService.doneChangeBattery(ebikeBikeInfo.getBikeId(),String.valueOf(staffFeign.getStaffId()));
//生成换电记录
EbikeBikeBatterychange batteryChange = new EbikeBikeBatterychange();
batteryChange.setBikeId(ebikeBikeInfo.getBikeId());
batteryChange.setNbatteryId(newBattery.getBatteryId());
batteryChange.setObatteryId(oldBatteryId);
batteryChange.setOperateUser(String.valueOf(staffFeign.getStaffId()));
batteryChange.setOrderId(orderId);
ebikeBikeBatterychangeMapper.insert(batteryChange);
}

3
ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeOrderServiceImpl.java
View File

@ -55,7 +55,7 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
}
@Override
public String doneChangeBattery(String bikeId, String receiverId) {
public void doneChangeBattery(String bikeId, String receiverId) {
QueryWrapper queryWrapper = QueryWrapper.create()
.where(EBIKE_BIKE_ORDER.BIKE_ID.eq(bikeId))
.where(EBIKE_BIKE_ORDER.ORDER_TYPE.eq("2"))
@ -68,6 +68,5 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
bikeOrder.setHandleAt(LocalDateTime.now());
bikeOrder.setReceiverId(receiverId);
this.mapper.update(bikeOrder);
return bikeOrder.getOrderId();
}
}

7
ebike-orders/src/main/java/com/cdzy/orders/service/impl/UserOrdersServiceImpl.java
View File

@ -340,7 +340,7 @@ public class UserOrdersServiceImpl extends ServiceImpl<UserOrdersMapper, EbikeUs
* @param userOrders 订单信息
*/
void costCalculation(ResFeignEbikeSysRcostsetDto feignEbikeSysRcostsetDto, ResGPSDto resGpsDto, FeignEbikeRegionDto regionDto, EbikeUserOrders userOrders) {
BigDecimal totalAmount = BigDecimal.ZERO;
BigDecimal totalAmount = new BigDecimal(0);
List<EbikeOrderDetails> list = new ArrayList<>();
//是否在运营区内
boolean pointInOperation = bikeInOperation(resGpsDto.getLongitude(), resGpsDto.getLatitude(), regionDto.getOrgId(), regionDto.getRegionId());
@ -384,11 +384,6 @@ public class UserOrdersServiceImpl extends ServiceImpl<UserOrdersMapper, EbikeUs
default -> defaultCostCalculation(list, userOrders, feignEbikeSysRcostsetDto, userOrders.getOrderId());
};
totalAmount = totalAmount.add(decimal);
BigDecimal cappedAmount = feignEbikeSysRcostsetDto.getCappedAmount();
int result = cappedAmount.compareTo(totalAmount);
if (result == 1){
totalAmount = cappedAmount;
}
userOrders.setStatus(OrderStatus.PENDING_PAYMENT);
userOrders.setTotalAmount(totalAmount);
orderDetailsMapper.insertBatch(list);