Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

jsowell-pile/src/main/java/com/jsowell/pile/dto/PushOrderSettlementDTO.java

@@ -0,0 +1,51 @@
+package com.jsowell.pile.dto;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 推送订单结算信息DTO
+ *
+ * @author JS-ZZA
+ * @date 2023/5/22 11:02
+ */
+@Data
+public class PushOrderSettlementDTO {
+    /**
+     * 充电订单号
+     */
+    @JSONField(name = "StartChargeSeq")
+    private String startChargeSeq;
+
+    /**
+     * 充电设备接口编码
+     */
+    @JSONField(name = "ConnectorID")
+    private String connectorID;
+
+    /**
+     * 累计充电量
+     */
+    @JSONField(name = "TotalPower")
+    private BigDecimal totalPower;
+
+    /**
+     * 累计总金额
+     */
+    @JSONField(name = "TotalMoney")
+    private BigDecimal totalMoney;
+
+    /**
+     * 是否出租车订单
+     */
+    @JSONField(name = "TaxiOrder")
+    private BigDecimal taxiOrder;
+
+    /**
+     * 结算金额
+     */
+    @JSONField(name = "SettlementMoney")
+    private BigDecimal settlementMoney;
+}

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

@@ -102,7 +102,7 @@ public interface OrderBasicInfoMapper {
 	 * 修改订单详情
 	 * @param orderDetail 订单详情
 	 */
-	void updateOrderDetail(OrderDetail orderDetail);
+	int updateOrderDetail(OrderDetail orderDetail);
 
 	/**
 	 * 通过订单号查询订单基本信息

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

@@ -63,6 +63,13 @@ public interface IOrderBasicInfoService {
 	 */
 	int updateOrderBasicInfo(OrderBasicInfo orderBasicInfo);
 
+	/**
+	 * 修改订单详情
+	 * @param orderDetail
+	 * @return
+	 */
+	int updateOrderDetail(OrderDetail orderDetail);
+
 	// 清订单缓存
 	void cleanCacheByOrderCode(String orderCode, String transactionCode);
 

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

@@ -406,7 +406,17 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
 		return i;
 	}
 
-	@Override
+	/**
+	 * 修改订单详情
+	 * @param orderDetail
+	 * @return
+	 */
+    @Override
+    public int updateOrderDetail(OrderDetail orderDetail) {
+        return orderBasicInfoMapper.updateOrderDetail(orderDetail);
+    }
+
+    @Override
 	public void cleanCacheByOrderCode(String orderCode, String transactionCode) {
 		logger.debug("清除订单缓存 orderCode:{}, transactionCode:{}", orderCode, transactionCode);
 		List<String> keys = Lists.newArrayList();