autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-20 19:15:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Lemon
2023-08-22 11:12:29 +08:00
parent ee65b75e18
commit f7eed5ed50
5 changed files with 83 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderPileOccupyMapper.java
View File

@@ -76,7 +76,7 @@ public interface OrderPileOccupyMapper {
* @param memberId
* @return
*/
List<OrderPileOccupy> queryUnPayOrderByMemberId(@Param("memberId") String memberId);
List<OrderPileOccupy> queryHangUpOrderByMemberId(@Param("memberId") String memberId);
/**
* 查询占桩订单列表
@@ -106,4 +106,11 @@ public interface OrderPileOccupyMapper {
* @param occupyCode
*/
OccupyOrderDetailVO getOccupyOrderDetail(String occupyCode);
/**
* 通过memberId查询未支付状态订单
* @param memberId
* @return
*/
OrderPileOccupy queryUnPayOrderByMemberId(String memberId);
}

9
jsowell-pile/src/main/java/com/jsowell/pile/service/OrderPileOccupyService.java
View File

@@ -56,7 +56,14 @@ public interface OrderPileOccupyService{
* @param memberId
* @return
*/
List<OrderPileOccupy> queryUnPayOrderByMemberId(String memberId);
List<OrderPileOccupy> queryHangUpOrderByMemberId(String memberId);
/**
* 通过memberId查询未支付状态订单
* @param memberId
* @return
*/
OrderPileOccupy queryUnPayOrderByMemberId(String memberId);
Map<String, Object> payOccupyPileOrder(PayOrderDTO dto);

28
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java
View File

@@ -25,7 +25,6 @@ import com.jsowell.pile.vo.base.PileInfoVO;
import com.jsowell.pile.vo.uniapp.MemberVO;
import com.jsowell.pile.vo.uniapp.OccupyOrderDetailVO;
import com.jsowell.pile.vo.uniapp.OrderPileOccupyVO;
import com.jsowell.pile.vo.uniapp.OrderVO;
import com.jsowell.pile.vo.web.BillingTemplateVO;
import com.jsowell.pile.vo.web.OrderListVO;
import com.jsowell.pile.vo.web.UpdateMemberBalanceDTO;
@@ -240,7 +239,7 @@ public class OrderPileOccupyServiceImpl implements OrderPileOccupyService {
}
// 占桩时长
long occupyTime = DateUtils.intervalTime(startTime, endTime);
long occupyTime = DateUtils.intervalTime(startTime, endTime); // 22
if (freeTime > occupyTime) {
log.info("计算占桩订单金额-站点:{}的占桩订单:{}, 免费时长:{}大于占桩时长:{}, 不收取占桩费用", orderPileOccupy.getStationId(), occupyCode, freeTime, occupyTime);
return resultAmount;
@@ -269,15 +268,16 @@ public class OrderPileOccupyServiceImpl implements OrderPileOccupyService {
continue;
}
long l = DateUtils.intervalTime(chargeStartTime, chargeEndTime);
sumChargingTime = sumChargingTime + l;
sumChargingTime = sumChargingTime + l; // 17
}
/*
计算应收金额
应收金额 = （总占用时长 - （免费时长 + 充电时长）） * 占桩费率
*/
BigDecimal totalOccupyTime = new BigDecimal(occupyTime + "");
BigDecimal totalFreeTime = new BigDecimal(freeTime).add(new BigDecimal(sumChargingTime));
BigDecimal totalOccupyTime = new BigDecimal(occupyTime + ""); // 22
BigDecimal totalFreeTime = new BigDecimal(freeTime).add(new BigDecimal(sumChargingTime)); // 27
log.info("totalOccupyTime:{}, totalFreeTime:{}", totalOccupyTime, totalFreeTime);
if (totalFreeTime.compareTo(totalOccupyTime) >= 0) {
log.info("计算占桩订单金额-站点:{}的占桩订单:{}, 总免费时长:{}大于占桩时长:{}, 不收取占桩费用", orderPileOccupy.getStationId(), occupyCode, totalFreeTime, totalOccupyTime);
return resultAmount;
@@ -288,11 +288,27 @@ public class OrderPileOccupyServiceImpl implements OrderPileOccupyService {
return resultAmount;
}
public static void main(String[] args) {
long l = DateUtils.intervalTime("2023-08-21 17:19:06", "2023-08-21 17:36:56");
long l2 = DateUtils.intervalTime("2023-08-21 17:16:56", "2023-08-21 17:38:18");
System.out.println(l2);
}
/**
* 根据会员id查询挂起状态占桩订单
*/
@Override
public List<OrderPileOccupy> queryUnPayOrderByMemberId(String memberId) {
public List<OrderPileOccupy> queryHangUpOrderByMemberId(String memberId) {
return orderPileOccupyMapper.queryHangUpOrderByMemberId(memberId);
}
/**
* 通过memberId查询未支付状态订单
* @param memberId
* @return
*/
@Override
public OrderPileOccupy queryUnPayOrderByMemberId(String memberId) {
return orderPileOccupyMapper.queryUnPayOrderByMemberId(memberId);
}