update 站点选择器返参简化

jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileStationInfoController.java

@@ -7,7 +7,6 @@ import com.jsowell.common.core.controller.BaseController;
 import com.jsowell.common.core.domain.AjaxResult;
 import com.jsowell.common.core.page.TableDataInfo;
 import com.jsowell.common.enums.BusinessType;
-import com.jsowell.common.enums.thirdparty.ThirdPlatformTypeEnum;
 import com.jsowell.common.enums.ykc.ReturnCodeEnum;
 import com.jsowell.common.exception.BusinessException;
 import com.jsowell.common.response.RestApiResponse;
@@ -16,7 +15,6 @@ import com.jsowell.common.util.poi.ExcelUtil;
 import com.jsowell.pile.domain.PileStationInfo;
 import com.jsowell.pile.domain.ThirdpartyParkingConfig;
 import com.jsowell.pile.dto.FastCreateStationDTO;
-import com.jsowell.pile.dto.PushStationInfoDTO;
 import com.jsowell.pile.dto.QueryStationDTO;
 import com.jsowell.pile.dto.ThirdPartyStationRelationDTO;
 import com.jsowell.pile.dto.amap.EditAmapFlagDTO;
@@ -27,6 +25,7 @@ import com.jsowell.pile.service.ThirdPartySettingInfoService;
 import com.jsowell.pile.service.ThirdPartyStationRelationService;
 import com.jsowell.pile.vo.base.ThirdPartyStationRelationVO;
 import com.jsowell.pile.vo.web.PileStationVO;
+import com.jsowell.pile.vo.web.StationSelectVO;
 import com.jsowell.service.PileService;
 import com.jsowell.thirdparty.amap.service.AMapService;
 import com.jsowell.thirdparty.common.CommonService;
@@ -36,7 +35,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * 充电站信息Controller
@@ -89,7 +87,7 @@ public class PileStationInfoController extends BaseController {
     public TableDataInfo getStationSelectList(QueryStationDTO dto) {
         logger.info("dto:{}", JSON.toJSONString(dto));
         startPage();
-        List<PileStationVO> list = pileStationInfoService.getStationSelectList(dto);
+        List<StationSelectVO> list = pileStationInfoService.getStationSelectList(dto);
         return getDataTable(list);
     }
 

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

@@ -9,6 +9,7 @@ import com.jsowell.pile.dto.ningxiajiaotou.NXJTQueryStationInfoDTO;
 import com.jsowell.pile.vo.base.ThirdPartyStationInfoVO;
 import com.jsowell.pile.vo.ningxiajiaotou.NXJTStationInfoVO;
 import com.jsowell.pile.vo.web.PileStationVO;
+import com.jsowell.pile.vo.web.StationSelectVO;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -111,7 +112,7 @@ public interface PileStationInfoMapper {
 	 * @param dto
 	 * @return
 	 */
-    List<PileStationVO> getStationSelectList(@Param("dto") QueryStationDTO dto);
+    List<StationSelectVO> getStationSelectList(@Param("dto") QueryStationDTO dto);
 
 	/**
 	 * 宁夏交投查询充电站信息

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

@@ -2,18 +2,20 @@ package com.jsowell.pile.service;
 
 import com.jsowell.common.core.page.PageResponse;
 import com.jsowell.pile.domain.PileStationInfo;
-import com.jsowell.pile.domain.UserFrequentedStationInfo;
+import com.jsowell.pile.dto.FastCreateStationDTO;
-import com.jsowell.pile.dto.*;
+import com.jsowell.pile.dto.QueryStationDTO;
+import com.jsowell.pile.dto.QueryStationInfoDTO;
 import com.jsowell.pile.dto.amap.GetStationInfoDTO;
 import com.jsowell.pile.dto.business.StationBusinessAnalyzeInfoDTO;
 import com.jsowell.pile.dto.business.StationStatisticsInfoDTO;
 import com.jsowell.pile.dto.lutongyunting.BindParkingPlatformDTO;
 import com.jsowell.pile.dto.ningxiajiaotou.NXJTQueryStationInfoDTO;
-import com.jsowell.pile.vo.uniapp.business.StationBusinessAnalyzeInfoVO;
 import com.jsowell.pile.vo.base.ThirdPartyStationInfoVO;
 import com.jsowell.pile.vo.ningxiajiaotou.NXJTStationInfoVO;
+import com.jsowell.pile.vo.uniapp.business.StationBusinessAnalyzeInfoVO;
 import com.jsowell.pile.vo.uniapp.business.StationStatisticsInfosVO;
 import com.jsowell.pile.vo.web.PileStationVO;
+import com.jsowell.pile.vo.web.StationSelectVO;
 
 import java.util.List;
 
@@ -155,7 +157,7 @@ public interface PileStationInfoService {
 	/**
 	 * 查询充电站下拉列表
 	 */
-    List<PileStationVO> getStationSelectList(QueryStationDTO dto);
+    List<StationSelectVO> getStationSelectList(QueryStationDTO dto);
 
 	/**
 	 * 宁夏交投查询站点信息

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

@@ -37,6 +37,7 @@ import com.jsowell.pile.vo.uniapp.business.StationOrderQuantityInfoVO;
 import com.jsowell.pile.vo.uniapp.business.StationStatisticsInfosVO;
 import com.jsowell.pile.vo.uniapp.customer.CurrentTimePriceDetails;
 import com.jsowell.pile.vo.web.PileStationVO;
+import com.jsowell.pile.vo.web.StationSelectVO;
 import com.jsowell.system.service.SysDeptService;
 import com.jsowell.system.service.SysUserService;
 import lombok.extern.slf4j.Slf4j;
@@ -840,7 +841,7 @@ public class PileStationInfoServiceImpl implements PileStationInfoService {
      * @return
      */
     @Override
-    public List<PileStationVO> getStationSelectList(QueryStationDTO dto) {
+    public List<StationSelectVO> getStationSelectList(QueryStationDTO dto) {
         AuthorizedDeptVO authorizedMap = UserUtils.getAuthorizedMap();
         if (authorizedMap == null) {
             // 为空表示没有权限，返回空数组

jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java

@@ -556,21 +556,26 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic {
         dto.setOrderDetail(orderDetail);
         transactionService.doUpdateOrder(dto);
 
-        // 组装after参数
+        try {
-        AfterSettleOrderDTO afterSettleOrderDTO = AfterSettleOrderDTO.builder()
+            // 组装after参数
-                .orderCode(orderBasicInfo.getOrderCode())
+            AfterSettleOrderDTO afterSettleOrderDTO = AfterSettleOrderDTO.builder()
-                .merchantId(orderBasicInfo.getMerchantId())
+                    .orderCode(orderBasicInfo.getOrderCode())
-                .stationId(orderBasicInfo.getStationId())
+                    .merchantId(orderBasicInfo.getMerchantId())
-                .orderPayAmount(orderBasicInfo.getPayAmount()) // 支付金额
+                    .stationId(orderBasicInfo.getStationId())
-                .orderConsumeAmount(orderBasicInfo.getOrderAmount()) // 消费金额
+                    .orderPayAmount(orderBasicInfo.getPayAmount()) // 支付金额
-                .orderSettleAmount(orderBasicInfo.getSettleAmount()) // 结算金额
+                    .orderConsumeAmount(orderBasicInfo.getOrderAmount()) // 消费金额
-                .orderElectricityAmount(orderDetail.getTotalElectricityAmount()) // 电费金额
+                    .orderSettleAmount(orderBasicInfo.getSettleAmount()) // 结算金额
-                .orderElectricityDiscountAmount(orderDetail.getDiscountElectricityAmount()) // 电费折扣金额
+                    .orderElectricityAmount(orderDetail.getTotalElectricityAmount()) // 电费金额
-                .orderServiceAmount(orderDetail.getTotalServiceAmount()) // 服务费金额
+                    .orderElectricityDiscountAmount(orderDetail.getDiscountElectricityAmount()) // 电费折扣金额
-                .orderServiceDiscountAmount(orderDetail.getDiscountServiceAmount()) // 服务费折扣金额
+                    .orderServiceAmount(orderDetail.getTotalServiceAmount()) // 服务费金额
-                .orderRefundAmount(orderBasicInfo.getRefundAmount()) // 退款金额
+                    .orderServiceDiscountAmount(orderDetail.getDiscountServiceAmount()) // 服务费折扣金额
-                .build();
+                    .orderRefundAmount(orderBasicInfo.getRefundAmount()) // 退款金额
-        rabbitTemplate.convertAndSend(RabbitConstants.YKC_EXCHANGE_NAME, RabbitConstants.QUEUE_CHARGE_ORDER_DATA, afterSettleOrderDTO);
+                    .build();
+            // 发送到rabbitMQ
+            rabbitTemplate.convertAndSend(RabbitConstants.YKC_EXCHANGE_NAME, RabbitConstants.QUEUE_CHARGE_ORDER_DATA, afterSettleOrderDTO);
+        } catch (Exception e) {
+            logger.error("【{}】-结算订单V2, 发送到rabbitMQ异常", this.getClass().getSimpleName(), e);
+        }
 
         // 将卡/vin状态解锁
         if (!StringUtils.equals("0000000000000000", data.getLogicCard())) {

jsowell-pile/src/main/java/com/jsowell/pile/vo/web/StationSelectVO.java

@@ -0,0 +1,28 @@
+package com.jsowell.pile.vo.web;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 站点管理列表反参
+ *
+ * @author JS-ZZA
+ * @date 2022/9/1 13:28
+ */
+@Builder
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class StationSelectVO {
+    /**
+     * 站点id
+     */
+    private String id;
+
+    /**
+     * 站点名称
+     */
+    private String stationName;
+}

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

@@ -649,7 +649,7 @@
             id = #{stationId,jdbcType=VARCHAR}
     </update>
 
-    <select id="getStationSelectList" resultType="com.jsowell.pile.vo.web.PileStationVO">
+    <select id="getStationSelectList" resultType="com.jsowell.pile.vo.web.StationSelectVO">
         select
             t1.id,
             t1.station_name as stationName