diff --git a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java index 312983364..80ae49d5b 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java @@ -689,7 +689,7 @@ public class MemberService { // 将支付金额修改数据库 OrderBasicInfo basicInfo = new OrderBasicInfo(); - basicInfo.setId(Long.parseLong(orderVO.getId())); + basicInfo.setId(Integer.parseInt(orderVO.getId())); basicInfo.setPayAmount(payAmount); orderBasicInfoService.updateOrderBasicInfo(basicInfo); diff --git a/jsowell-admin/src/main/java/com/jsowell/service/TempService.java b/jsowell-admin/src/main/java/com/jsowell/service/TempService.java index 8828fbe19..cfbf09b26 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/TempService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/TempService.java @@ -203,7 +203,7 @@ public class TempService { } OrderBasicInfo build = OrderBasicInfo.builder() - .id(Long.parseLong(orderListVO.getId())) + .id(Integer.parseInt(orderListVO.getId())) .orderCode(orderListVO.getOrderCode()) .orderAmount(orderAmount) .virtualAmount(virtualAmount) diff --git a/jsowell-admin/src/test/java/SpringBootTestController.java b/jsowell-admin/src/test/java/SpringBootTestController.java index fcba4b536..c9bc06511 100644 --- a/jsowell-admin/src/test/java/SpringBootTestController.java +++ b/jsowell-admin/src/test/java/SpringBootTestController.java @@ -2833,7 +2833,7 @@ public class SpringBootTestController { 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(); orderBasicInfoService.updateOrderBasicInfo(info); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderBasicInfo.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderBasicInfo.java index f119f699b..304842948 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderBasicInfo.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderBasicInfo.java @@ -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-支付宝支付) */ diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryOrderDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryOrderDTO.java index 13eb04c60..36e9eafe6 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryOrderDTO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryOrderDTO.java @@ -83,4 +83,7 @@ public class QueryOrderDTO extends BaseEntity { * 结算结束时间 */ private String endSettleTime; + + // 会员组编号 + private String groupCode; } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index c3d2f9d88..3fd7d766e 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -220,10 +220,6 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { return orderListVOS; } - // 批量查手续费 - // List orderCodeList = orderListVOS.stream().map(OrderListVO::getOrderCode).collect(Collectors.toList()); - // Map 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); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java index 187909384..e3d0d8b2c 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java @@ -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); diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml index bfe12ff53..25d4f7375 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml @@ -1553,7 +1553,7 @@ t1.connector_code as connectorCode, t1.logic_card as logicCard, t1.vin_code as vinCode, - t1.plate_number as plateNumber, + t1.plate_number as plateNumber, t1.start_mode as startMode, t1.pay_mode as payMode, t1.pay_status as payStatus, @@ -1621,6 +1621,9 @@ and t1.merchant_id = #{merchantId,jdbcType=VARCHAR} + + and t1.group_code = #{groupCode,jdbcType=VARCHAR} + @@ -2021,6 +2024,9 @@ virtual_amount = #{virtualAmount}, + + group_code = #{groupCode}, + discount_amount = #{discountAmount},