update 处理未分账订单

jsowell-pile/src/main/java/com/jsowell/pile/domain/AdapayUnsplitRecord.java

@@ -1,13 +1,16 @@
 package com.jsowell.pile.domain;
 
-import java.math.BigDecimal;
-import java.util.Date;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 import lombok.experimental.SuperBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.math.BigDecimal;
+import java.util.Date;
 
 @Data
 @Accessors(chain = true)
@@ -100,4 +103,27 @@ public class AdapayUnsplitRecord {
     * 更新时间
     */
     private Date updateTime;
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.JSON_STYLE)
+                .append("id", id)
+                .append("merchantCode", merchantCode)
+                .append("payTime", payTime)
+                .append("paymentId", paymentId)
+                .append("orderNo", orderNo)
+                .append("payAmount", payAmount)
+                .append("confirmedSplitAmount", confirmedSplitAmount)
+                .append("refundAmount", refundAmount)
+                .append("paymentRevokeAmount", paymentRevokeAmount)
+                .append("remainingSplitAmount", remainingSplitAmount)
+                .append("orderCode", orderCode)
+                .append("pileType", pileType)
+                .append("dueRefundAmount", dueRefundAmount)
+                .append("settleAmount", settleAmount)
+                .append("refundFlag", refundFlag)
+                .append("splitFlag", splitFlag)
+                .append("updateTime", updateTime)
+                .toString();
+    }
 }

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

@@ -3,9 +3,11 @@ package com.jsowell.pile.mapper;
 import com.jsowell.pile.domain.AdapayUnsplitRecord;
 import com.jsowell.pile.vo.AdapayUnsplitRecordVO;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
+@Repository
 public interface AdapayUnsplitRecordMapper {
     int deleteByPrimaryKey(Integer id);
 

jsowell-pile/src/main/java/com/jsowell/pile/vo/AdapayUnsplitRecordVO.java

@@ -7,6 +7,9 @@ public class AdapayUnsplitRecordVO {
     // 订单号
     private String orderCode;
 
+    // 支付ID
+    private String paymentId;
+
     // 支付金额
     private String payAmount;
 
@@ -23,7 +26,7 @@ public class AdapayUnsplitRecordVO {
     private String refundAmount;
 
     // 已退款金额
-        private String paidAmount;
+    private String paidAmount;
 
     // 待退款金额
     private String refundPayAmount;

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

@@ -702,14 +702,15 @@
   <select id="queryUnsplitOrders" resultMap="BaseResultMap">
     select * from adapay_unsplit_record
     where pay_time >= #{startTime} and pay_time &lt;= #{endTime}
-    and due_refund_amount is null
-    and settle_amount is null
-    and order_code like 'C%'
-    </select>
+    <!--and due_refund_amount is null-->
+    <!--and settle_amount is null-->
+    <!--and order_code like 'C%'-->
+  </select>
 
   <select id="queryList" resultType="com.jsowell.pile.vo.AdapayUnsplitRecordVO">
     SELECT
       order_code as orderCode,
+      payment_id as paymentId,
       pay_amount as payAmount,
       settle_amount as settleAmount,
       confirmed_split_amount as confirmedSplitAmount,