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

update

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2024-01-14 15:55:53 +08:00
parent 12ffd5c265
commit d990412cda
8 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderBasicInfo.java
View File

@@ -1,12 +1,9 @@
package com.jsowell.pile.domain;
import lombok.*;
import java.math.BigDecimal;
import java.util.Date;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
/**
* 订单主表
@@ -83,6 +80,8 @@ public class OrderBasicInfo {
*/
private String startMode;
private String thirdPartyType;
/**
* 支付方式(1-余额支付；3-白名单支付；4-微信支付；5-支付宝支付)
*/

3
jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryOrderDTO.java
View File

@@ -83,4 +83,7 @@ public class QueryOrderDTO extends BaseEntity {
* 结算结束时间
*/
private String endSettleTime;
// 会员组编号
private String groupCode;
}

11
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -220,10 +220,6 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
return orderListVOS;
}
// 批量查手续费
// List<String> orderCodeList = orderListVOS.stream().map(OrderListVO::getOrderCode).collect(Collectors.toList());
// Map<String, ClearingBillDetail> billDetailMap = clearingBillDetailService.selectByOrderCodeList(orderCodeList);
for (OrderListVO orderListVO : orderListVOS) {
// 如果是微信支付，通过订单号查询微信支付单号
// logger.info("如果是微信支付，通过订单号查询微信支付单号 orderListVO:{}", JSON.toJSONString(orderListVO));
@@ -252,11 +248,6 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
orderListVO.setChargingTime(DateUtils.getDatePoor(DateUtils.parseDate(chargeEndTime), DateUtils.parseDate(chargeStartTime)));
}
// 交易手续费
// ClearingBillDetail clearingBillDetail = billDetailMap.get(orderListVO.getOrderCode());
// if (Objects.nonNull(clearingBillDetail)) {
// orderListVO.setFeeAmount(clearingBillDetail.getFeeAmt() + "");
// }
}
batchQueryFeeAmt(orderListVOS);
@@ -2338,7 +2329,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
if (StringUtils.equals(orderListVO.getOrderStatus(), OrderStatusEnum.IN_THE_CHARGING.getValue())) {
// 修改数据库订单状态
OrderBasicInfo info = OrderBasicInfo.builder()
.id(Long.parseLong(orderListVO.getId()))
.id(Integer.parseInt(orderListVO.getId()))
.orderStatus(OrderStatusEnum.ABNORMAL.getValue())
.build();
updateOrderBasicInfo(info);

1
jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java
View File

@@ -779,6 +779,7 @@ public abstract class AbstractProgramLogic implements InitializingBean {
discountServiceAmount = totalServiceAmount.subtract(afterServiceAmountDiscount);
discountElectricityAmount = totalElectricityAmount.subtract(afterElectricityAmountDiscount);
}
orderBasicInfo.setGroupCode(memberDiscountVO.getGroupCode());
}
// 订单折扣金额
BigDecimal discountAmount = discountServiceAmount.add(discountElectricityAmount);