From ed47e1e1e04a70fbae4cb816e2db1c5cfacd9d52 Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Thu, 11 Jan 2024 17:28:45 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E8=AE=A1=E7=AE=97=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E4=BC=9A=E5=91=98=E6=8A=98=E6=89=A3=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../test/java/SpringBootTestController.java   |  9 +++
 .../impl/OrderBasicInfoServiceImpl.java       |  4 +-
 .../DelayMerchantProgramLogic.java            | 12 +++-
 .../mapper/pile/OrderBasicInfoMapper.xml      | 66 ++++++-------------
 4 files changed, 38 insertions(+), 53 deletions(-)

diff --git a/jsowell-admin/src/test/java/SpringBootTestController.java b/jsowell-admin/src/test/java/SpringBootTestController.java
index 602b8eeb3..2e3c7ae6d 100644
--- a/jsowell-admin/src/test/java/SpringBootTestController.java
+++ b/jsowell-admin/src/test/java/SpringBootTestController.java
@@ -572,6 +572,15 @@ public class SpringBootTestController {
         System.out.println(drawCashDetailVO);
     }
 
+    @Test
+    public void refundOrderTest() {
+        String orderCode = "C80410085692";
+        OrderBasicInfo orderBasicInfo = orderBasicInfoService.getOrderInfoByOrderCode(orderCode);
+        String mode = pileMerchantInfoService.getDelayModeByMerchantId(orderBasicInfo.getMerchantId());
+        AbstractProgramLogic orderLogic = ProgramLogicFactory.getProgramLogic(mode);
+        orderLogic.refundOrder(orderBasicInfo);
+    }
+
     @Test
     public void queryPaymentConfirmListTest() {
         QueryPaymentConfirmDTO dto = new QueryPaymentConfirmDTO();
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 1206fcced..13326946f 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
@@ -2360,8 +2360,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
     @Override
     public Map<String, Object> generateOrderByCard(GenerateOrderDTO dto) throws Exception {
         logger.info("充电桩主动申请启动充电生成订单 param:{}", JSON.toJSONString(dto));
-        // BigDecimal totalAccountAmount = BigDecimal.ZERO;
-        BigDecimal accountBalance = BigDecimal.ZERO;
+        BigDecimal accountBalance;
         String payMode;
         // 判断当前用户是否为平台测试员
         PlatformTesterVO platformTesterVO = memberBasicInfoService.selectPlatformTesterStatus(dto.getMemberId());
@@ -2375,7 +2374,6 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
             // 是平台测试员
             accountBalance = Constants.whitelistDefaultAmount;
             payMode = OrderPayModeEnum.PAYMENT_OF_WHITELIST.getValue();
-
         } else if (pileStationWhitelist != null) {
             // 站点白名单
             accountBalance = Constants.whitelistDefaultAmount;
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java
index 42c851cad..639b8a310 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java
@@ -584,13 +584,19 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic {
         Map<String, List<OrderPayRecord>> payRecordMap = payRecordList.stream().collect(Collectors.groupingBy(OrderPayRecord::getPayMode));
         // 获取本金支付的记录
         List<OrderPayRecord> principalPayRecordList = payRecordMap.get(OrderPayRecordEnum.PRINCIPAL_BALANCE_PAYMENT.getValue());
-        BigDecimal principalPay = principalPayRecordList.stream().map(OrderPayRecord::getPayAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+        BigDecimal principalPay = null;
+        if (CollectionUtils.isNotEmpty(principalPayRecordList)) {
+            principalPay = principalPayRecordList.stream().map(OrderPayRecord::getPayAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+        }
         // 获取赠送金支付的记录
         List<OrderPayRecord> giftPayRecordList = payRecordMap.get(OrderPayRecordEnum.GIFT_BALANCE_PAYMENT.getValue());
-        BigDecimal giftPay = giftPayRecordList.stream().map(OrderPayRecord::getPayAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+        BigDecimal giftPay = null;
+        if (CollectionUtils.isNotEmpty(giftPayRecordList)) {
+            giftPay = giftPayRecordList.stream().map(OrderPayRecord::getPayAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+        }
 
         // 计算需要退回的金额
-        Map<String, BigDecimal> returnAmountMap = calculateReturnAmount(principalPay, giftPay, orderAmount);
+        Map<String, BigDecimal> returnAmountMap = calculateReturnAmount(principalPay, giftPay, orderAmount, orderBasicInfo.getDiscountAmount());
         logger.info("结算订单:{}, 剩余金额退回余额, 订单消费金额:{}, 本金支付金额:{}, 赠送支付金额:{}, 退回金额map:{}",
                 orderCode, orderAmount, principalPay, null, JSONObject.toJSONString(returnAmountMap));
 
diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
index 5e4628e0e..ac943c168 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
@@ -1425,45 +1425,8 @@
       </if>
     </trim>
   </insert>
-    <resultMap id="OrderBasicInfoResult" type="com.jsowell.pile.domain.OrderBasicInfo">
-        <result column="id" property="id" />
-        <result column="order_code" property="orderCode" />
-        <result column="transaction_code" property="transactionCode" />
-        <result column="order_status" property="orderStatus" />
-        <result column="member_id" property="memberId" />
-        <result column="station_id" property="stationId" />
-        <result column="merchant_id" property="merchantId" />
-        <result column="pile_sn" property="pileSn" />
-        <result column="connector_code" property="connectorCode" />
-        <result column="pile_connector_code" property="pileConnectorCode" />
-        <result column="logic_card" property="logicCard" />
-        <result column="vin_code" property="vinCode" />
-        <result column="start_mode" property="startMode" />
-        <result column="pay_mode" property="payMode" />
-        <result column="pay_status" property="payStatus" />
-        <result column="pay_amount" property="payAmount" />
-        <result column="pay_time" property="payTime" />
-        <result column="plate_number" property="plateNumber" />
-        <result column="order_amount" property="orderAmount" />
-        <result column="virtual_amount" property="virtualAmount" />
-        <result column="settle_amount" property="settleAmount" />
-        <result column="charge_start_time" property="chargeStartTime" />
-        <result column="charge_end_time" property="chargeEndTime" />
-        <result column="start_type" property="startType" />
-        <result column="appointment_time" property="appointmentTime" />
-        <result column="start_soc" property="startSoc" />
-        <result column="end_soc" property="endSoc" />
-        <result column="reason" property="reason" />
-        <result column="settlement_time" property="settlementTime" />
-        <result column="refund_amount" property="refundAmount" />
-        <result column="create_by" property="createBy" />
-        <result column="create_time" property="createTime" />
-        <result column="update_by" property="updateBy" />
-        <result column="update_time" property="updateTime" />
-        <result column="del_flag" property="delFlag" />
-    </resultMap>
 
-    <resultMap extends="OrderBasicInfoResult" id="OrderBasicInfoOrderDetailResult" type="com.jsowell.pile.domain.OrderBasicInfo">
+    <resultMap extends="BaseResultMap" id="OrderBasicInfoOrderDetailResult" type="com.jsowell.pile.domain.OrderBasicInfo">
         <collection javaType="java.util.List" notNullColumn="sub_id" property="orderDetailList" resultMap="OrderDetailResult" />
     </resultMap>
 
@@ -2014,6 +1977,9 @@
             <if test="virtualAmount != null">
                 virtual_amount = #{virtualAmount},
             </if>
+          <if test="discountAmount != null">
+            discount_amount = #{discountAmount},
+          </if>
             <if test="settleAmount != null">
                 settle_amount = #{settleAmount},
             </if>
@@ -2128,9 +2094,15 @@
             <if test="totalElectricityAmount != null">
                 total_electricity_amount = #{totalElectricityAmount},
             </if>
+          <if test="discountElectricityAmount != null">
+            discount_electricity_amount = #{discountElectricityAmount},
+          </if>
             <if test="totalServiceAmount != null">
                 total_service_amount = #{totalServiceAmount},
             </if>
+          <if test="discountServiceAmount != null">
+            discount_service_amount = #{discountServiceAmount},
+          </if>
             <if test="sharpPrice != null">
                 sharp_price = #{sharpPrice},
             </if>
@@ -2205,7 +2177,7 @@
     </update>
 
 
-    <select id="getOrderInfoByOrderCode" resultMap="OrderBasicInfoResult">
+    <select id="getOrderInfoByOrderCode" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List" />
         from order_basic_info
@@ -2215,7 +2187,7 @@
         and del_flag = '0'
     </select>
 
-    <select id="getOrderInfoByTransactionCode" resultMap="OrderBasicInfoResult">
+    <select id="getOrderInfoByTransactionCode" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List" />
         from order_basic_info
@@ -2223,7 +2195,7 @@
           and transaction_code = #{transactionCode,jdbcType=VARCHAR}
     </select>
 
-    <select id="queryOrderBasicInfo" resultMap="OrderBasicInfoResult">
+    <select id="queryOrderBasicInfo" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List" />
         from order_basic_info
@@ -2316,7 +2288,7 @@
         group by DATE_FORMAT(t1.create_time, '%Y-%m-%d')
     </select>
 
-    <select id="getUnpaidOrderListOver15Min" resultMap="OrderBasicInfoResult">
+    <select id="getUnpaidOrderListOver15Min" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List" />
         from order_basic_info
@@ -2326,7 +2298,7 @@
           and create_time <![CDATA[ <= ]]> #{createTime,jdbcType=VARCHAR}
     </select>
 
-    <select id="selectOrderListByTimeRangeAndStatus" resultMap="OrderBasicInfoResult">
+    <select id="selectOrderListByTimeRangeAndStatus" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List" />
         from order_basic_info
@@ -2376,7 +2348,7 @@
             and t1.order_code = #{orderCode,jdbcType=VARCHAR}
     </select>
 
-    <select id="getOrderBasicInfo" resultMap="OrderBasicInfoResult">
+    <select id="getOrderBasicInfo" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List" />
         from order_basic_info
@@ -2415,7 +2387,7 @@
           AND t1.del_flag = '0'
     </select>
 
-    <select id="getAppointmentOrder" resultMap="OrderBasicInfoResult">
+    <select id="getAppointmentOrder" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List" />
         from order_basic_info
@@ -2511,7 +2483,7 @@
             #{item,jdbcType=VARCHAR}
         </foreach>
     </select>
-    <select id="tempQueryWeChatRefundOrders" resultMap="OrderBasicInfoResult">
+    <select id="tempQueryWeChatRefundOrders" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List" />
         from order_basic_info
@@ -2559,7 +2531,7 @@
         </foreach>
     </select>
 
-    <select id="queryOrderList" resultMap="OrderBasicInfoResult">
+    <select id="queryOrderList" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List" />
         from order_basic_info