新增 青海平台推送充电订单接口

jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java

@@ -351,4 +351,11 @@ public interface OrderBasicInfoMapper {
      * @return
      */
     List<OrderBasicInfo> queryXDTOrderList(String merchantId, String stationId, String startDate, String endDate);
+
+    /**
+     * 根据订单编号查询订单详细信息（包括充电计费明细）
+     * @param orderCode
+     * @return
+     */
+    OrderVO getChargeOrderInfoByOrderCode(String orderCode);
 }

jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java

@@ -438,4 +438,11 @@ public interface OrderBasicInfoService{
      * @return
      */
     List<OrderBasicInfo> queryOrderListByGroupCode(String groupCode);
+
+    /**
+     * 根据订单编号查询订单详细信息（包括充电计费明细）
+     * @param orderCode
+     * @return
+     */
+    OrderVO getChargeOrderInfoByOrderCode(String orderCode);
 }

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

@@ -3654,6 +3654,16 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
         return orderBasicInfoMapper.queryOrderListByGroupCode(groupCode);
     }
 
+    /**
+     * 根据订单编号查询订单详细信息（包括充电计费明细）
+     * @param orderCode
+     * @return
+     */
+    @Override
+    public OrderVO getChargeOrderInfoByOrderCode(String orderCode) {
+        return orderBasicInfoMapper.getChargeOrderInfoByOrderCode(orderCode);
+    }
+
     /**
      * 查询新电途订单
      */

jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/OrderVO.java

@@ -14,6 +14,8 @@ import java.math.BigDecimal;
 public class OrderVO {
     private String id;
 
+    private String organizationCode;
+
     /**
      * 订单号
      */
@@ -39,6 +41,8 @@ public class OrderVO {
      */
     private String pileConnectorCode;
 
+    private String payMode;
+
     /**
      * 运营商id
      */
@@ -79,6 +83,8 @@ public class OrderVO {
      */
     private String licensePlateNumber;
 
+    private String discountAmount;
+
     /**
      * 订单状态
      */
@@ -104,6 +110,8 @@ public class OrderVO {
      */
     private BigDecimal payAmount;
 
+    private String payTime;
+
     /**
      * 充电开始时间
      */
@@ -114,11 +122,17 @@ public class OrderVO {
      */
     private String endTime;
 
+    private String startSoc;
+
+    private String endSoc;
+
     /**
      * 充电时长
      */
     private String chargingTime;
 
+    private String totalPower;
+
     private BigDecimal totalElectricityAmount;
 
     private BigDecimal totalServiceAmount;

jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml

@@ -2803,4 +2803,42 @@
     where order_status = '3'
     and member_id =#{memberId,jdbcType=VARCHAR}
   </select>
+
+    <select id="getChargeOrderInfoByOrderCode" resultType="com.jsowell.pile.vo.uniapp.OrderVO">
+        SELECT
+        t1.merchant_id as mercahntId,
+        t3.organization_code as organizationCode,
+        t1.order_code AS orderCode,
+        t1.transaction_code AS transactionCode,
+        t1.order_status AS orderStatus,
+        t1.station_id AS stationId,
+        t1.pile_sn AS pileSn,
+        t1.connector_code AS connectorCode,
+        t1.pile_connector_code AS pileConnectorCode,
+        t1.pay_mode AS payMode,
+        t1.pay_amount AS payAmount,
+        t1.pay_time AS payTime,
+        t1.order_amount AS orderAmount,
+        t1.plate_number AS plateNumber,
+        t1.discount_amount AS discountAmount,
+        t1.settle_amount AS settleAmount,
+        t1.charge_start_time AS startTime,
+        t1.charge_end_time AS endTime,
+        t1.start_soc AS startSoc,
+        t1.end_soc AS endSoc,
+        t1.reason AS stopReason,
+        t2.total_used_electricity AS totalPower,
+        t2.total_electricity_amount AS totalElectricityAmount,
+        t2.total_service_amount AS totalServiceAmount
+        FROM
+        order_basic_info t1
+        JOIN
+        order_detail t2 ON t1.order_code = t2.order_code
+        join
+        pile_merchant_info t3 on t1.merchant_id = t3.id
+        WHERE
+        t1.del_flag = '0'
+        AND
+        t1.order_code = #{orderCode,jdbcType=VARCHAR}
+    </select>
 </mapper>