1修改财务接口

xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingStationMapper.xml

@@ -290,7 +290,7 @@
         select charging_station_id                                                                             as chargingStationId,
                (select type
                 from xhpc_charging_pile
-                where charging_station_id = charging_station_id and del_flag = 0 and status = 0)               as type,
+                where charging_station_id = charging_station_id and del_flag = 0 and status = 0 limit 1)               as type,
                name                                                                                            as name,
                reminder_instructions                                                                           as reminderInstructions,
                detailed_address                                                                                as detailedAddress,

xhpc-modules/xhpc-order/pom.xml

@@ -93,6 +93,7 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>2.4.0</version>
                 <executions>
                     <execution>
                         <goals>

xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderReconciliationStatusController.java

@@ -70,4 +70,16 @@ public class XhpcHistoryOrderReconciliationStatusController extends BaseControll
         List<Map<String, Object>> list = iXhpcHistoryOrderReconciliationStatusService.page(userId, serialNumber, createTimeStart, createTimeEnd, chargingStationName, status);
         return getDataTable(list);
     }
+
+    /**
+     * 清分详情
+     *
+     * @param historyOrderId 历史订单id
+     * @return
+     */
+    @GetMapping("/info")
+    @ApiOperation(value = "清分详情")
+    public AjaxResult info(@RequestParam Long historyOrderId) {
+        return iXhpcHistoryOrderReconciliationStatusService.info(historyOrderId);
+    }
 }

xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderSortingStatusController.java

@@ -72,4 +72,16 @@ public class XhpcHistoryOrderSortingStatusController extends BaseController {
         List<Map<String, Object>> list = iXhpcHistoryOrderSortingStatusService.page(userId, serialNumber, createTimeStart, createTimeEnd, chargingStationName, status);
         return getDataTable(list);
     }
+
+    /**
+     * 对账详情
+     *
+     * @param historyOrderId 历史订单id
+     * @return
+     */
+    @GetMapping("/info")
+    @ApiOperation(value = "对账详情")
+    public AjaxResult info(@RequestParam Long historyOrderId) {
+        return iXhpcHistoryOrderSortingStatusService.info(historyOrderId);
+    }
 }

xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcHistoryOrderMapper.java

@@ -43,7 +43,7 @@ public interface XhpcHistoryOrderMapper {
      * @param xhpcHistoryOrderIds 历史订单信息
      * @return 结果
      */
-    public int updateReconciliation(String[] xhpcHistoryOrderIds);
+    public int updateReconciliation(String[] xhpcHistoryOrderIds, @Param("status") String status);
 
     /**
      * 更新清分状态 历史订单信息
@@ -51,20 +51,22 @@ public interface XhpcHistoryOrderMapper {
      * @param xhpcHistoryOrderIds 历史订单信息
      * @return 结果
      */
-    public int updateSorting(String[] xhpcHistoryOrderIds);
+    public int updateSorting(@Param("xhpcHistoryOrderIds") String[] xhpcHistoryOrderIds, @Param("status") String status);
 
     /**
      * 用户历史订单表
+     *
      * @param userId
      * @return
      */
-    List<Map<String,Object>> list(@Param("userId") Long userId);
+    List<Map<String, Object>> list(@Param("userId") Long userId);
 
     /**
      * 订单详情
+     *
      * @param userId
      * @param historyOrderId
      * @return
      */
-    Map<String,Object> gethistotyOrderMessage(@Param("userId")Long userId,@Param("historyOrderId")Long historyOrderId);
+    Map<String, Object> gethistotyOrderMessage(@Param("userId") Long userId, @Param("historyOrderId") Long historyOrderId);
 }

xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcHistoryOrderReconciliationStatusMapper.java

@@ -45,4 +45,13 @@ public interface XhpcHistoryOrderReconciliationStatusMapper {
      */
     public List<Map<String, Object>> page(@Param("userId") Long userId, @Param("serialNumber") String serialNumber, @Param("createTimeStart") String createTimeStart, @Param("createTimeEnd") String createTimeEnd, @Param("chargingStationName") String chargingStationName, @Param("status") String status, @Param("operatorId") String operatorId, @Param("chargingStation") String chargingStation);
 
+
+    /**
+     * 清分详情
+     *
+     * @param historyOrderId 历史订单id
+     * @return
+     */
+    public Map<String, Object> info(@Param("historyOrderId") Long historyOrderId);
+
 }

xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcHistoryOrderSortingStatusMapper.java

@@ -54,4 +54,12 @@ public interface XhpcHistoryOrderSortingStatusMapper {
      * @return 结果
      */
     public List<Map<String, Object>> page(@Param("userId") Long userId, @Param("serialNumber") String serialNumber, @Param("createTimeStart") String createTimeStart, @Param("createTimeEnd") String createTimeEnd, @Param("chargingStationName") String chargingStationName, @Param("status") String status, @Param("operatorId") String operatorId, @Param("chargingStation") String chargingStation);
+
+    /**
+     * 对账详情
+     *
+     * @param historyOrderId 历史订单id
+     * @return
+     */
+    public Map<String, Object> info(@Param("historyOrderId") Long historyOrderId);
 }

xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcHistoryOrderReconciliationStatusService.java

@@ -22,9 +22,10 @@ public interface IXhpcHistoryOrderReconciliationStatusService {
 
     /**
      * 修改对账状态 历史订单对账状态
+     *
      * @param historyOrderIds 历史订单id集合
-     * @param status 状态
+     * @param status          状态
-     * @param remark 备注
+     * @param remark          备注
      * @return
      */
     public AjaxResult status(String historyOrderIds, Integer status, String remark);
@@ -49,4 +50,12 @@ public interface IXhpcHistoryOrderReconciliationStatusService {
      * @return
      */
     public List<Map<String, Object>> page(Long userId, String serialNumber, String createTimeStart, String createTimeEnd, String chargingStationName, String status);
+
+    /**
+     * 清分详情
+     *
+     * @param historyOrderId 历史订单id
+     * @return
+     */
+    public AjaxResult info(Long historyOrderId);
 }

xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcHistoryOrderSortingStatusService.java

@@ -50,4 +50,12 @@ public interface IXhpcHistoryOrderSortingStatusService {
      * @return 结果
      */
     public List<Map<String, Object>> page(Long userId, String serialNumber, String createTimeStart, String createTimeEnd, String chargingStationName, String status);
+
+    /**
+     * 对账详情
+     *
+     * @param historyOrderId 历史订单id
+     * @return
+     */
+    public AjaxResult info(Long historyOrderId);
 }

xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderReconciliationStatusServiceImpl.java

@@ -81,7 +81,7 @@ public class XhpcHistoryOrderReconciliationStatusServiceImpl implements IXhpcHis
             xhpcHistoryOrderReconciliationStatus.setRemark(remark);
             xhpcHistoryOrderReconciliationStatusMapper.insert(xhpcHistoryOrderReconciliationStatus);
         }
-        xhpcHistoryOrderMapper.updateReconciliation(historyOrderIds.split(","));
+        xhpcHistoryOrderMapper.updateReconciliation(historyOrderIds.split(","), StringUtils.valueOf(status));
         return AjaxResult.success();
     }
 
@@ -136,4 +136,16 @@ public class XhpcHistoryOrderReconciliationStatusServiceImpl implements IXhpcHis
         }
         return xhpcHistoryOrderReconciliationStatusMapper.page(userId, serialNumber, createTimeStart, createTimeEnd, chargingStationName, status, null, null);
     }
+
+    /**
+     * 清分详情
+     *
+     * @param historyOrderId 历史订单id
+     * @return
+     */
+    @Override
+    public AjaxResult info(Long historyOrderId) {
+        return AjaxResult.success(xhpcHistoryOrderReconciliationStatusMapper.info(historyOrderId));
+    }
+
 }

xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderSortingStatusServiceImpl.java

@@ -81,7 +81,7 @@ public class XhpcHistoryOrderSortingStatusServiceImpl implements IXhpcHistoryOrd
             xhpcHistoryOrderSortingStatus.setRemark(remark);
             xhpcHistoryOrderSortingStatusMapper.insert(xhpcHistoryOrderSortingStatus);
         }
-        xhpcHistoryOrderMapper.updateSorting(historyOrderIds.split(","));
+        xhpcHistoryOrderMapper.updateSorting(historyOrderIds.split(","), StringUtils.valueOf(status));
         return AjaxResult.success();
     }
 
@@ -137,4 +137,15 @@ public class XhpcHistoryOrderSortingStatusServiceImpl implements IXhpcHistoryOrd
         }
         return xhpcHistoryOrderSortingStatusMapper.page(userId, serialNumber, createTimeStart, createTimeEnd, chargingStationName, status, null, null);
     }
+
+    /**
+     * 对账详情
+     *
+     * @param historyOrderId 历史订单id
+     * @return
+     */
+    @Override
+    public AjaxResult info(Long historyOrderId) {
+        return AjaxResult.success(xhpcHistoryOrderSortingStatusMapper.info(historyOrderId));
+    }
 }

xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml

@@ -281,17 +281,17 @@
         where xho.del_flag = 0 and xho.history_order_id = #{historyOrderId}
     </select>
 
-    <update id="updateReconciliation" parameterType="com.xhpc.order.domain.XhpcHistoryOrderReconciliationStatus">
+    <update id="updateReconciliation" parameterType="java.lang.String">
         update xhpc_history_order set reconciliation_status = #{status} where history_order_id in
-        <foreach collection="array" item="xhpcHistoryOrderId" open="(" separator="," close=")">
+        <foreach collection="xhpcHistoryOrderIds" item="item" open="(" separator="," close=")">
-            #{xhpcHistoryOrderId}
+            #{item}
         </foreach>
     </update>
 
-    <update id="updateSorting" parameterType="com.xhpc.order.domain.XhpcHistoryOrderReconciliationStatus">
+    <update id="updateSorting" parameterType="java.lang.String">
         update xhpc_history_order set sorting_status = #{status} where history_order_id in
-        <foreach collection="array" item="xhpcHistoryOrderId" open="(" separator="," close=")">
+        <foreach collection="xhpcHistoryOrderIds" item="item" open="(" separator="," close=")">
-            #{xhpcHistoryOrderId}
+            #{item}
         </foreach>
     </update>
 

xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderReconciliationStatusMapper.xml

@@ -118,8 +118,8 @@
     </select>
 
     <select id="page" parameterType="java.lang.Long" resultType="java.util.Map">
-        select sum(xho.act_price-xho.internet_commission-xho.internet_svc_commission)
+        select xho.act_price-xho.internet_commission-xho.internet_svc_commission
-        realIncome,
+        realIncome,xho.history_order_id historyOrderId,
         xho.user_id userId,xho.serial_number serialNumber,xho.create_time createTime,
         xo.`name` operatorName,xcs.`name` chargingStationName,xho.`reconciliation_status`
         reconciliationStatus,sdd.dict_label reconciliationStatusName
@@ -159,4 +159,20 @@
         </if>
         ORDER BY xho.create_time DESC
     </select>
+
+    <select id="info" parameterType="java.lang.Long" resultType="java.util.Map">
+      select  sum(xho.act_price-xho.internet_commission-xho.internet_svc_commission)
+        realIncome,xho.history_order_id historyOrderId,
+        xho.user_id userId,xho.serial_number serialNumber,xho.create_time createTime,
+        xo.`name` operatorName,xcs.`name` chargingStationName,xho.`reconciliation_status`
+        reconciliationStatus,sdd.dict_label reconciliationStatusName,
+        xho.end_soc endSoc
+        from xhpc_history_order xho
+        LEFT JOIN xhpc_charge_order xco on xco.charge_order_id = xho.charging_order_id
+        LEFT JOIN xhpc_charging_station xcs on xcs.charging_station_id = xho.charging_station_id
+        LEFT JOIN xhpc_operator xo on xo.operator_id = xcs.operator_id
+        LEFT JOIN sys_dict_data sdd on sdd.`dict_type` = 'reconciliation_status' and sdd.dict_value =
+        xho.`reconciliation_status`
+        where xho.del_flag = 0 and xho.history_order_id = #{historyOrderId}
+    </select>
 </mapper> 

xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderSortingStatusMapper.xml

@@ -18,7 +18,7 @@
 
     <insert id="insert" parameterType="com.xhpc.order.domain.XhpcHistoryOrderSortingStatus" useGeneratedKeys="true"
             keyProperty="historyOrderSortingStatusId">
-        INSERT INTO xhpc_recharge_order
+        INSERT INTO xhpc_history_order_reconciliation_status
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="null != historyOrderId and '' != historyOrderId">
                 history_order_id,
@@ -144,8 +144,8 @@
     </select>
 
     <select id="page" parameterType="java.lang.Long" resultType="java.util.Map">
-        select sum(xho.act_power_price+xho.act_service_price)
+        select xho.act_power_price+xho.act_service_price
-        expenditure,
+        expenditure,xho.history_order_id historyOrderId,
         xho.user_id userId,xho.serial_number serialNumber,xco.create_time createTime,
         xcs.`name` chargingStationName,xho.`sorting_status` sortingStatus,sdd.dict_label sortingStatusName,
         xco.source,
@@ -185,5 +185,24 @@
         <if test="chargingStation != null and chargingStation != ''">
             and xup.user_id = #{userId}
         </if>
+        ORDER BY xho.create_time DESC
+    </select>
+
+    <select id="info" parameterType="java.lang.Long" resultType="java.util.Map">
+        select sum(xho.act_power_price+xho.act_service_price)
+        expenditure,xho.history_order_id historyOrderId,
+        xho.user_id userId,xho.serial_number serialNumber,xco.create_time createTime,
+        xcs.`name` chargingStationName,xho.`sorting_status` sortingStatus,sdd.dict_label sortingStatusName,
+        xco.source,
+        CASE WHEN xco.source = 0 THEN '平台' else xiu.`name` end sourceName,
+        xho.end_soc endSoc
+        from xhpc_history_order xho
+        LEFT JOIN xhpc_charge_order xco on xco.charge_order_id = xho.charging_order_id
+        LEFT JOIN xhpc_charging_station xcs on xcs.charging_station_id = xho.charging_station_id
+        LEFT JOIN xhpc_operator xo on xo.operator_id = xcs.operator_id
+        LEFT JOIN sys_user su on xo.operator_id = su.operator_id
+        LEFT JOIN sys_dict_data sdd on sdd.`dict_type` = 'sorting_status' and sdd.dict_value = xho.`sorting_status`
+        LEFT JOIN xhpc_internet_user xiu on xiu.internet_user_id = su.internet_user_id
+        where xho.del_flag = 0 and xho.history_order_id = #{historyOrderId}
     </select>
 </mapper> 

xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcOperatorMapper.xml

@@ -286,7 +286,7 @@
         CASE WHEN xo.`status` = 0 THEN '正常' else '禁用' end statusName,su.user_id userId,
 		xdb.dict_value attributenName
 		from xhpc_operator `xo`
-        LEFT JOIN sys_user su on su.internet_user_id = `xo`.operator_id
+        LEFT JOIN sys_user su on su.operator_id = `xo`.operator_id
 		LEFT JOIN xhpc_dict_biz xdb on xdb.`code` = 'operator_attribute' and xdb.dict_key = xo.attribute
         where xo.del_flag = 0
         <if test="name != null and name != ''">