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 dd2696d0f..f2319cebe 100644 --- a/jsowell-admin/src/test/java/SpringBootTestController.java +++ b/jsowell-admin/src/test/java/SpringBootTestController.java @@ -2846,7 +2846,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-common/src/main/java/com/jsowell/common/constant/CacheConstants.java b/jsowell-common/src/main/java/com/jsowell/common/constant/CacheConstants.java index f1ec13c25..c93f0612a 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/constant/CacheConstants.java +++ b/jsowell-common/src/main/java/com/jsowell/common/constant/CacheConstants.java @@ -74,8 +74,12 @@ public class CacheConstants { // 汇付会员账户 public static final String ADAPAY_MEMBER_ACCOUNT = "adapay_member_account:"; + // 充电桩固件版本 public static final String PILE_PROGRAM_VERSION = "pile_program_version_"; + // 查询订单支付信息 + public static final String SELECT_ORDER_PAY_INFO_LIST = "select_order_pay_info_list:"; + // 查询订单微信支付回调 public static final String QUERY_ORDER_WECHAT_CALLBACK = "query_order_wechat_callback:"; @@ -91,6 +95,7 @@ public class CacheConstants { // 微信支付参数 public static final String WECHAT_PAY_ORDER_PARAM = "wechat_pay_order_param:"; + // AccessToken public static final String ACCESS_TOKEN = "AccessToken_"; // 通过交易流水号查询订单实时数据 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 29d76191f..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,252 +1,209 @@ package com.jsowell.pile.domain; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.jsowell.common.annotation.Excel; -import com.jsowell.common.core.domain.BaseEntity; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; +import lombok.*; import java.math.BigDecimal; import java.util.Date; -import java.util.List; /** - * 订单对象 order_basic_info - * - * @author jsowell - * @date 2022-09-30 + * 订单主表 */ -@Data -@NoArgsConstructor -@AllArgsConstructor +@Getter +@Setter @Builder -public class OrderBasicInfo extends BaseEntity { - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private Long id; - - /** - * 订单编号 - */ - @Excel(name = "订单编号") - private String orderCode; - - /** - * 交易流水号 - */ - private String transactionCode; - - /** - * 订单状态(0-待支付；1-充电中；2-待结算；3-待补缴；4-异常；5-可疑；6-订单完成) - */ - @Excel(name = "订单状态") - private String orderStatus; - - /** - * 会员id - */ - @Excel(name = "会员id") - private String memberId; - - /** - * 站点id - */ - @Excel(name = "站点id") - private String stationId; - - /** - * 运营商id - */ - @Excel(name = "运营商id") - private String merchantId; - - /** - * 充电桩sn号 - */ - @Excel(name = "充电桩sn号") - private String pileSn; - - /** - * 充电桩枪口号 - */ - @Excel(name = "充电桩枪口号") - private String connectorCode; - - /** - * 充电桩枪口编号 - */ - @Excel(name = "充电桩枪口编号") - private String pileConnectorCode; - - /** - * 逻辑卡号 - */ - @Excel(name = "逻辑卡号") - private String logicCard; - - /** - * 车辆vin码 - */ - @Excel(name = "车辆vin码") - private String vinCode; - - /** - * 启动方式 - * 0-后管启动；1-用户app启动 - */ - @Excel(name = "启动方式") - private String startMode; - - /** - * 第三方平台类型 - */ - @Excel(name = "第三方平台类型") - private String thirdPartyType; - - /** - * 支付方式 - * 1-余额支付；3-白名单支付; 4-微信支付；5-支付宝支付； - */ - @Excel(name = "支付方式") - private String payMode; - - /** - * 支付状态 - * 0-待支付；1-支付完成 - */ - @Excel(name = "支付状态") - private String payStatus; - - /** - * 支付金额 - * 指用户本次需要充电的金额 - */ - @Excel(name = "支付金额") - private BigDecimal payAmount; - - /** - * 支付时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "支付时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date payTime; - - /** - * 车牌号码 - */ - private String plateNumber; - - /** - * 订单总金额 = 电费总金额 + 服务费总金额 - */ - @Excel(name = "订单总金额") - private BigDecimal orderAmount; - - /** - * 虚拟金额 - */ - @Excel(name = "虚拟金额") - private BigDecimal virtualAmount; +@AllArgsConstructor +@NoArgsConstructor +public class OrderBasicInfo { + private static final long serialVersionUID = 1L; + /** + * 主键 + */ + private Integer id; /** - * 折扣金额 + * 订单编号 + */ + private String orderCode; + + /** + * 交易流水号 + */ + private String transactionCode; + + /** + * 订单状态(0-未启动；1-充电中；2-待结算；3-待补缴；4-异常；5-可疑；6-订单完成；7-超时关闭) + */ + private String orderStatus; + + /** + * 会员id + */ + private String memberId; + + /** + * 站点id + */ + private String stationId; + + /** + * 运营商id + */ + private String merchantId; + + /** + * 充电桩sn + */ + private String pileSn; + + /** + * 充电桩枪口号 + */ + private String connectorCode; + + /** + * 充电桩枪口编号 + */ + private String pileConnectorCode; + + /** + * 卡启动时的卡号 + */ + private String logicCard; + + /** + * vin启动时的vin码 + */ + private String vinCode; + + /** + * 启动方式（0-后管启动；1-用户app启动；2-卡启动；3-离线卡启动; 4-联联平台启动; 5-车辆vin码启动） + */ + private String startMode; + + private String thirdPartyType; + + /** + * 支付方式(1-余额支付；3-白名单支付；4-微信支付；5-支付宝支付) + */ + private String payMode; + + /** + * 支付状态(0-待支付；1-支付完成) + */ + private String payStatus; + + /** + * 支付金额（指用户预存的金额） + */ + private BigDecimal payAmount; + + /** + * 支付时间 + */ + private Date payTime; + + /** + * 车牌号码 + */ + private String plateNumber; + + /** + * 订单总金额 = 电费总金额 + 服务费总金额 + */ + private BigDecimal orderAmount; + + /** + * 虚拟金额（指使用赠送余额消费部分） + */ + private BigDecimal virtualAmount; + + /** + * 会员组编号 + */ + private String groupCode; + + /** + * 折扣金额（指会员优惠金额） */ - @Excel(name = "折扣金额") private BigDecimal discountAmount; - /** - * 结算金额 - */ - @Excel(name = "结算金额") - private BigDecimal settleAmount; + /** + * 结算金额（指实际产生的消费，包括本金支付，微信支付等） + */ + private BigDecimal settleAmount; - /** - * 充电开始时间 - */ - private Date chargeStartTime; + /** + * 充电开始时间 + */ + private Date chargeStartTime; - /** - * 充电结束时间 - */ - private Date chargeEndTime; + /** + * 充电结束时间 + */ + private Date chargeEndTime; - /** - * 启动类型 - */ - private String startType; + /** + * 启动类型（now-立即启动；appointment-预约启动） + */ + private String startType; - /** - * 预约时间 - */ - private Date appointmentTime; + /** + * 预约时间 + */ + private Date appointmentTime; - /** - * 开始SOC - */ - private String startSoc; + /** + * 开始SOC + */ + private String startSoc; - /** - * 结束SOC - */ - private String endSoc; + /** + * 结束SOC + */ + private String endSoc; - /** - * 异常原因 - */ - private String reason; + /** + * 异常原因 + */ + private String reason; - /** - * 结算时间 - */ - private Date settlementTime; + /** + * 结算时间 + */ + private Date settlementTime; - /** - * 退款金额 - */ - private BigDecimal refundAmount; + /** + * 退款金额 + */ + private BigDecimal refundAmount; /** * 退款状态（0-不需要退款；1-退款中；2-退款完成） */ private String refundStatus; - /** - * 删除标识（0-正常；1-删除） - */ - private String delFlag; + /** + * 创建人 + */ + private String createBy; - private List orderDetailList; + /** + * 创建时间 + */ + private Date createTime; - @Override - public String toString() { - return new ToStringBuilder(this, ToStringStyle.JSON_STYLE) - .append("id", id) - .append("orderCode", orderCode) - .append("orderStatus", orderStatus) - .append("memberId", memberId) - .append("stationId", stationId) - .append("pileSn", pileSn) - .append("connectorCode", connectorCode) - .append("startMode", startMode) - .append("payMode", payMode) - .append("payStatus", payStatus) - .append("payAmount", payAmount) - .append("payTime", payTime) - .append("orderAmount", orderAmount) - .append("chargeStartTime", chargeStartTime) - .append("chargeEndTime", chargeEndTime) - .append("startSOC", startSoc) - .append("endSOC", endSoc) - .append("reason", reason) - .append("delFlag", delFlag) - .append("orderDetailList", orderDetailList) - .toString(); - } -} + /** + * 更新人 + */ + private String updateBy; + + /** + * 更新时间 + */ + private Date updateTime; + + /** + * 删除标识（0-正常；1-删除） + */ + private String delFlag; +} \ No newline at end of file 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/mapper/OrderBasicInfoMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java index 1a02becc0..048876f54 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java @@ -13,12 +13,10 @@ import com.jsowell.pile.vo.uniapp.PersonPileConnectorSumInfoVO; import com.jsowell.pile.vo.uniapp.SendMessageVO; import com.jsowell.pile.vo.web.*; import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; import java.time.LocalDateTime; import java.util.List; -@Repository public interface OrderBasicInfoMapper { /** * delete by primary key 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/impl/OrderPayRecordServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPayRecordServiceImpl.java index 14b56817b..f2ca8a04b 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPayRecordServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPayRecordServiceImpl.java @@ -74,7 +74,7 @@ public class OrderPayRecordServiceImpl implements OrderPayRecordService { @Override public List selectOrderPayInfoList(String orderCode) { // 缓存 - String redisKey = "select_order_pay_info_list:" + orderCode; + String redisKey = CacheConstants.SELECT_ORDER_PAY_INFO_LIST + orderCode; List resultList = redisCache.getCacheList(redisKey); if (CollectionUtils.isNotEmpty(resultList)) { return resultList; 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 bee8d0e4a..25d4f7375 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml @@ -17,7 +17,6 @@ - @@ -25,6 +24,7 @@ + @@ -46,9 +46,9 @@ id, order_code, transaction_code, order_status, member_id, station_id, merchant_id, - pile_sn, connector_code, pile_connector_code, logic_card, vin_code, start_mode, third_party_type, pay_mode, - pay_status, pay_amount, pay_time, plate_number, order_amount, virtual_amount, discount_amount, - settle_amount, charge_start_time, charge_end_time, start_type, appointment_time, + pile_sn, connector_code, pile_connector_code, logic_card, vin_code, start_mode, pay_mode, + pay_status, pay_amount, pay_time, plate_number, order_amount, virtual_amount, group_code, + discount_amount, settle_amount, charge_start_time, charge_end_time, start_type, appointment_time, start_soc, end_soc, reason, settlement_time, refund_amount, refund_status, create_by, create_time, update_by, update_time, del_flag @@ -69,29 +69,29 @@ insert into order_basic_info (order_code, transaction_code, order_status, member_id, station_id, merchant_id, pile_sn, connector_code, pile_connector_code, - logic_card, vin_code, start_mode, third_party_type, + logic_card, vin_code, start_mode, pay_mode, pay_status, pay_amount, pay_time, plate_number, order_amount, - virtual_amount, discount_amount, settle_amount, - charge_start_time, charge_end_time, start_type, - appointment_time, start_soc, end_soc, - reason, settlement_time, refund_amount, - refund_status, create_by, create_time, - update_by, update_time, del_flag - ) + virtual_amount, group_code, discount_amount, + settle_amount, charge_start_time, charge_end_time, + start_type, appointment_time, start_soc, + end_soc, reason, settlement_time, + refund_amount, refund_status, create_by, + create_time, update_by, update_time, + del_flag) values (#{orderCode,jdbcType=VARCHAR}, #{transactionCode,jdbcType=VARCHAR}, #{orderStatus,jdbcType=VARCHAR}, #{memberId,jdbcType=VARCHAR}, #{stationId,jdbcType=VARCHAR}, #{merchantId,jdbcType=VARCHAR}, #{pileSn,jdbcType=VARCHAR}, #{connectorCode,jdbcType=VARCHAR}, #{pileConnectorCode,jdbcType=VARCHAR}, - #{logicCard,jdbcType=VARCHAR}, #{vinCode,jdbcType=VARCHAR}, #{startMode,jdbcType=VARCHAR}, #{thirdPartyType,jdbcType=VARCHAR}, + #{logicCard,jdbcType=VARCHAR}, #{vinCode,jdbcType=VARCHAR}, #{startMode,jdbcType=VARCHAR}, #{payMode,jdbcType=VARCHAR}, #{payStatus,jdbcType=VARCHAR}, #{payAmount,jdbcType=DECIMAL}, #{payTime,jdbcType=TIMESTAMP}, #{plateNumber,jdbcType=VARCHAR}, #{orderAmount,jdbcType=DECIMAL}, - #{virtualAmount,jdbcType=DECIMAL}, #{discountAmount,jdbcType=DECIMAL}, #{settleAmount,jdbcType=DECIMAL}, - #{chargeStartTime,jdbcType=TIMESTAMP}, #{chargeEndTime,jdbcType=TIMESTAMP}, #{startType,jdbcType=VARCHAR}, - #{appointmentTime,jdbcType=TIMESTAMP}, #{startSoc,jdbcType=VARCHAR}, #{endSoc,jdbcType=VARCHAR}, - #{reason,jdbcType=VARCHAR}, #{settlementTime,jdbcType=TIMESTAMP}, #{refundAmount,jdbcType=DECIMAL}, - #{refundStatus,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, - #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{delFlag,jdbcType=CHAR} - ) + #{virtualAmount,jdbcType=DECIMAL}, #{groupCode,jdbcType=VARCHAR}, #{discountAmount,jdbcType=DECIMAL}, + #{settleAmount,jdbcType=DECIMAL}, #{chargeStartTime,jdbcType=TIMESTAMP}, #{chargeEndTime,jdbcType=TIMESTAMP}, + #{startType,jdbcType=VARCHAR}, #{appointmentTime,jdbcType=TIMESTAMP}, #{startSoc,jdbcType=VARCHAR}, + #{endSoc,jdbcType=VARCHAR}, #{reason,jdbcType=VARCHAR}, #{settlementTime,jdbcType=TIMESTAMP}, + #{refundAmount,jdbcType=DECIMAL}, #{refundStatus,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, + #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, + #{delFlag,jdbcType=CHAR}) @@ -133,9 +133,6 @@ start_mode, - - third_party_type, - pay_mode, @@ -157,6 +154,9 @@ virtual_amount, + + group_code, + discount_amount, @@ -246,9 +246,6 @@ #{startMode,jdbcType=VARCHAR}, - - #{thirdPartyType,jdbcType=VARCHAR}, - #{payMode,jdbcType=VARCHAR}, @@ -270,6 +267,9 @@ #{virtualAmount,jdbcType=DECIMAL}, + + #{groupCode,jdbcType=VARCHAR}, + #{discountAmount,jdbcType=DECIMAL}, @@ -363,9 +363,6 @@ start_mode = #{startMode,jdbcType=VARCHAR}, - - third_party_type = #{thirdPartyType,jdbcType=VARCHAR}, - pay_mode = #{payMode,jdbcType=VARCHAR}, @@ -387,6 +384,9 @@ virtual_amount = #{virtualAmount,jdbcType=DECIMAL}, + + group_code = #{groupCode,jdbcType=VARCHAR}, + discount_amount = #{discountAmount,jdbcType=DECIMAL}, @@ -456,7 +456,6 @@ logic_card = #{logicCard,jdbcType=VARCHAR}, vin_code = #{vinCode,jdbcType=VARCHAR}, start_mode = #{startMode,jdbcType=VARCHAR}, - third_party_type = #{thirdPartyType,jdbcType=VARCHAR}, pay_mode = #{payMode,jdbcType=VARCHAR}, pay_status = #{payStatus,jdbcType=VARCHAR}, pay_amount = #{payAmount,jdbcType=DECIMAL}, @@ -464,6 +463,7 @@ plate_number = #{plateNumber,jdbcType=VARCHAR}, order_amount = #{orderAmount,jdbcType=DECIMAL}, virtual_amount = #{virtualAmount,jdbcType=DECIMAL}, + group_code = #{groupCode,jdbcType=VARCHAR}, discount_amount = #{discountAmount,jdbcType=DECIMAL}, settle_amount = #{settleAmount,jdbcType=DECIMAL}, charge_start_time = #{chargeStartTime,jdbcType=TIMESTAMP}, @@ -547,11 +547,6 @@ when id = #{item.id,jdbcType=INTEGER} then #{item.startMode,jdbcType=VARCHAR} - - - when id = #{item.id,jdbcType=INTEGER} then #{item.thirdPartyType,jdbcType=VARCHAR} - - when id = #{item.id,jdbcType=INTEGER} then #{item.payMode,jdbcType=VARCHAR} @@ -587,6 +582,11 @@ when id = #{item.id,jdbcType=INTEGER} then #{item.virtualAmount,jdbcType=DECIMAL} + + + when id = #{item.id,jdbcType=INTEGER} then #{item.groupCode,jdbcType=VARCHAR} + + when id = #{item.id,jdbcType=INTEGER} then #{item.discountAmount,jdbcType=DECIMAL} @@ -766,13 +766,6 @@ - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.thirdPartyType,jdbcType=VARCHAR} - - - @@ -822,6 +815,13 @@ + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.groupCode,jdbcType=VARCHAR} + + + @@ -951,20 +951,20 @@ insert into order_basic_info (order_code, transaction_code, order_status, member_id, station_id, merchant_id, - pile_sn, connector_code, pile_connector_code, logic_card, vin_code, start_mode, third_party_type, + pile_sn, connector_code, pile_connector_code, logic_card, vin_code, start_mode, pay_mode, pay_status, pay_amount, pay_time, plate_number, order_amount, virtual_amount, - discount_amount, settle_amount, charge_start_time, charge_end_time, start_type, - appointment_time, start_soc, end_soc, reason, settlement_time, refund_amount, refund_status, - create_by, create_time, update_by, update_time, del_flag) + group_code, discount_amount, settle_amount, charge_start_time, charge_end_time, + start_type, appointment_time, start_soc, end_soc, reason, settlement_time, refund_amount, + refund_status, create_by, create_time, update_by, update_time, del_flag) values (#{item.orderCode,jdbcType=VARCHAR}, #{item.transactionCode,jdbcType=VARCHAR}, #{item.orderStatus,jdbcType=VARCHAR}, #{item.memberId,jdbcType=VARCHAR}, #{item.stationId,jdbcType=VARCHAR}, #{item.merchantId,jdbcType=VARCHAR}, #{item.pileSn,jdbcType=VARCHAR}, #{item.connectorCode,jdbcType=VARCHAR}, #{item.pileConnectorCode,jdbcType=VARCHAR}, - #{item.logicCard,jdbcType=VARCHAR}, #{item.vinCode,jdbcType=VARCHAR}, #{item.startMode,jdbcType=VARCHAR}, #{item.thirdPartyType,jdbcType=VARCHAR}, + #{item.logicCard,jdbcType=VARCHAR}, #{item.vinCode,jdbcType=VARCHAR}, #{item.startMode,jdbcType=VARCHAR}, #{item.payMode,jdbcType=VARCHAR}, #{item.payStatus,jdbcType=VARCHAR}, #{item.payAmount,jdbcType=DECIMAL}, #{item.payTime,jdbcType=TIMESTAMP}, #{item.plateNumber,jdbcType=VARCHAR}, #{item.orderAmount,jdbcType=DECIMAL}, - #{item.virtualAmount,jdbcType=DECIMAL}, #{item.discountAmount,jdbcType=DECIMAL}, + #{item.virtualAmount,jdbcType=DECIMAL}, #{item.groupCode,jdbcType=VARCHAR}, #{item.discountAmount,jdbcType=DECIMAL}, #{item.settleAmount,jdbcType=DECIMAL}, #{item.chargeStartTime,jdbcType=TIMESTAMP}, #{item.chargeEndTime,jdbcType=TIMESTAMP}, #{item.startType,jdbcType=VARCHAR}, #{item.appointmentTime,jdbcType=TIMESTAMP}, #{item.startSoc,jdbcType=VARCHAR}, #{item.endSoc,jdbcType=VARCHAR}, #{item.reason,jdbcType=VARCHAR}, @@ -993,7 +993,6 @@ logic_card, vin_code, start_mode, - third_party_type, pay_mode, pay_status, pay_amount, @@ -1001,6 +1000,7 @@ plate_number, order_amount, virtual_amount, + group_code, discount_amount, settle_amount, charge_start_time, @@ -1036,7 +1036,6 @@ #{logicCard,jdbcType=VARCHAR}, #{vinCode,jdbcType=VARCHAR}, #{startMode,jdbcType=VARCHAR}, - #{thirdPartyType,jdbcType=VARCHAR}, #{payMode,jdbcType=VARCHAR}, #{payStatus,jdbcType=VARCHAR}, #{payAmount,jdbcType=DECIMAL}, @@ -1044,6 +1043,7 @@ #{plateNumber,jdbcType=VARCHAR}, #{orderAmount,jdbcType=DECIMAL}, #{virtualAmount,jdbcType=DECIMAL}, + #{groupCode,jdbcType=VARCHAR}, #{discountAmount,jdbcType=DECIMAL}, #{settleAmount,jdbcType=DECIMAL}, #{chargeStartTime,jdbcType=TIMESTAMP}, @@ -1079,7 +1079,6 @@ logic_card = #{logicCard,jdbcType=VARCHAR}, vin_code = #{vinCode,jdbcType=VARCHAR}, start_mode = #{startMode,jdbcType=VARCHAR}, - third_party_type = #{thirdPartyType,jdbcType=VARCHAR}, pay_mode = #{payMode,jdbcType=VARCHAR}, pay_status = #{payStatus,jdbcType=VARCHAR}, pay_amount = #{payAmount,jdbcType=DECIMAL}, @@ -1087,6 +1086,7 @@ plate_number = #{plateNumber,jdbcType=VARCHAR}, order_amount = #{orderAmount,jdbcType=DECIMAL}, virtual_amount = #{virtualAmount,jdbcType=DECIMAL}, + group_code = #{groupCode,jdbcType=VARCHAR}, discount_amount = #{discountAmount,jdbcType=DECIMAL}, settle_amount = #{settleAmount,jdbcType=DECIMAL}, charge_start_time = #{chargeStartTime,jdbcType=TIMESTAMP}, @@ -1149,9 +1149,6 @@ start_mode, - - third_party_type, - pay_mode, @@ -1173,6 +1170,9 @@ virtual_amount, + + group_code, + discount_amount, @@ -1266,9 +1266,6 @@ #{startMode,jdbcType=VARCHAR}, - - #{thirdPartyType,jdbcType=VARCHAR}, - #{payMode,jdbcType=VARCHAR}, @@ -1290,6 +1287,9 @@ #{virtualAmount,jdbcType=DECIMAL}, + + #{groupCode,jdbcType=VARCHAR}, + #{discountAmount,jdbcType=DECIMAL}, @@ -1383,9 +1383,6 @@ start_mode = #{startMode,jdbcType=VARCHAR}, - - third_party_type = #{thirdPartyType,jdbcType=VARCHAR}, - pay_mode = #{payMode,jdbcType=VARCHAR}, @@ -1407,6 +1404,9 @@ virtual_amount = #{virtualAmount,jdbcType=DECIMAL}, + + group_code = #{groupCode,jdbcType=VARCHAR}, + discount_amount = #{discountAmount,jdbcType=DECIMAL}, @@ -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,13 +1621,16 @@ and t1.merchant_id = #{merchantId,jdbcType=VARCHAR} + + and t1.group_code = #{groupCode,jdbcType=VARCHAR} + - + - + - - + + and t3.dept_id in @@ -2021,6 +2024,9 @@ virtual_amount = #{virtualAmount}, + + group_code = #{groupCode}, + discount_amount = #{discountAmount},