新增 后管财务中心运营商订单列表页

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

@@ -6,6 +6,7 @@ import com.jsowell.pile.dto.IndexQueryDTO;
 import com.jsowell.pile.dto.QueryOrderDTO;
 import com.jsowell.pile.dto.QueryPersonPileDTO;
 import com.jsowell.pile.dto.QueryStationInfoDTO;
+import com.jsowell.pile.vo.base.MerchantOrderInfoVO;
 import com.jsowell.pile.vo.lianlian.AccumulativeInfoVO;
 import com.jsowell.pile.vo.uniapp.OrderVO;
 import com.jsowell.pile.vo.uniapp.PersonPileConnectorSumInfoVO;
@@ -210,4 +211,11 @@ public interface OrderBasicInfoMapper {
 	List<OrderDetail> getOrderDetailList(List<String> orderCodes);
 
     List<OrderBasicInfo> tempQueryWeChatRefundOrders(@Param("startTime") String startTime, @Param("endTime") String endTime);
+
+	/**
+	 * 获取运营商订单列表
+	 * @param dto
+	 * @return
+	 */
+	List<MerchantOrderInfoVO> getMerchantOrderInfoList(@Param("dto") QueryOrderDTO dto);
 }

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

@@ -5,6 +5,7 @@ import com.jsowell.common.core.domain.ykc.TransactionRecordsData;
 import com.jsowell.pile.domain.OrderBasicInfo;
 import com.jsowell.pile.domain.OrderDetail;
 import com.jsowell.pile.dto.*;
+import com.jsowell.pile.vo.base.MerchantOrderInfoVO;
 import com.jsowell.pile.vo.base.OrderAmountDetailVO;
 import com.jsowell.pile.vo.base.OrderPeriodAmountVO;
 import com.jsowell.pile.vo.lianlian.AccumulativeInfoVO;
@@ -270,4 +271,10 @@ public interface IOrderBasicInfoService {
 	 * 生成订单日报
 	 */
 	void generateDailyOrderReports(String stationId);
+
+	/**
+	 * 获取运营商订单列表
+	 * @return
+	 */
+	List<MerchantOrderInfoVO> getMerchantOrderInfoList(QueryOrderDTO dto);
 }

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

@@ -30,6 +30,7 @@ import com.jsowell.pile.mapper.OrderBasicInfoMapper;
 import com.jsowell.pile.service.*;
 import com.jsowell.pile.transaction.dto.OrderTransactionDTO;
 import com.jsowell.pile.transaction.service.TransactionService;
+import com.jsowell.pile.vo.base.MerchantOrderInfoVO;
 import com.jsowell.pile.vo.base.OrderAmountDetailVO;
 import com.jsowell.pile.vo.base.OrderPeriodAmountVO;
 import com.jsowell.pile.vo.base.PileInfoVO;
@@ -1978,4 +1979,19 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
         settleOrderReport.setTradeAmount(totalSettleAmount.subtract(tradeFee));
         settleOrderReportService.insertSettleOrderReport(settleOrderReport);
     }
+
+    /**
+     * 获取运营商订单列表
+     * @param dto
+     * @return
+     */
+    @Override
+    public List<MerchantOrderInfoVO> getMerchantOrderInfoList(QueryOrderDTO dto) {
+        String startTime = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.addDays(new Date(), -7));
+
+        startTime = dto.getStartTime() == null ? startTime : dto.getStartTime();
+
+        dto.setStartTime(startTime);
+        return orderBasicInfoMapper.getMerchantOrderInfoList(dto);
+    }
 }

jsowell-pile/src/main/java/com/jsowell/pile/vo/base/MerchantOrderInfoVO.java

@@ -0,0 +1,21 @@
+package com.jsowell.pile.vo.base;
+
+import lombok.Data;
+
+/**
+ * 运营商订单列表VO
+ *
+ * @author Lemon
+ * @Date 2023/7/6 16:12
+ */
+@Data
+public class MerchantOrderInfoVO {
+    private String orderCode;
+    private String transactionCode;
+    private String orderStatus;
+    private String stationId;
+    private String stationName;
+    private String orderSource;
+    private String orderAmount;
+    private String orderSettleTime;
+}

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

@@ -1062,4 +1062,29 @@
         and refund_amount > '0.00'
         and create_time BETWEEN #{startTime} and #{endTime}
     </select>
+
+    <select id="getMerchantOrderInfoList" resultType="com.jsowell.pile.vo.base.MerchantOrderInfoVO">
+        select
+            t1.order_code as orderCode,
+            t1.transaction_code as transactionCode,
+            t1.order_status as orderStatus,
+            t1.station_id as stationId,
+            t2.station_name as stationName,
+            t1.order_amount as orderAmount,
+            t1.settlement_time as orderSettleTime
+        from order_basic_info t1
+        left join pile_station_info t2 on t1.station_id = t2.id
+        where
+            t1.del_flag = '0'
+        and t1.merchant_id = #{dto.merchantId,jdbcType=VARCHAR}
+        <if test="dto.startTime != null" >
+            and t1.create_time <![CDATA[ >= ]]> #{dto.startTime,jdbcType=VARCHAR}
+        </if>
+        <if test="dto.endTime != null" >
+            and t1.settlement_time <![CDATA[ <= ]]> #{dto.endTime,jdbcType=VARCHAR}
+        </if>
+
+
+        order by t1.create_time desc
+    </select>
 </mapper>