fix

netflix-dao/src/main/java/com/cyksj/model/entity/GoodsWholesaleOrderDon.java

@@ -1,5 +1,7 @@
 package com.cyksj.model.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.ejlchina.searcher.bean.DbIgnore;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Setter;
@@ -58,6 +60,10 @@ public class GoodsWholesaleOrderDon extends BaseEntity{
 	 */
 	private String buyerId;
 
+	@DbIgnore
+	@TableField(exist = false)
+	private Boolean isDeposit;
+
 	public enum Status {
 		/**
 		 * 订单状态

netflix-dao/src/main/java/com/cyksj/model/entity/GoodsWholesaleUserDeposit.java

@@ -66,6 +66,10 @@ public class GoodsWholesaleUserDeposit extends BaseEntity{
 
 	private String buyerId;
 
+	@DbIgnore
+	@TableField(exist = false)
+	private Boolean isDeposit;
+
 	public enum Status {
 		/**
 		 * 订单状态

netflix-service/src/main/java/com/cyksj/service/order/impl/GoodsWholesalePayServiceImpl.java

@@ -364,12 +364,18 @@ public class GoodsWholesalePayServiceImpl implements GoodsWholesalePayService {
 					.in(GoodsWholesaleUserDeposit::getUserId, userIdList)
 					.eq(GoodsWholesaleUserDeposit::getId, orderId)
 					.last("limit 1"));
+			if (goodsWholesaleUserDeposit != null) {
+				goodsWholesaleUserDeposit.setIsDeposit(true);
+			}
 			return goodsWholesaleUserDeposit;
 		}
 		GoodsWholesaleOrderDon orderDon = goodsWholesaleOrderDonMapper.selectOne(Wrappers.lambdaQuery(GoodsWholesaleOrderDon.class)
 				.in(GoodsWholesaleOrderDon::getUserId, userIdList)
 				.eq(GoodsWholesaleOrderDon::getId, orderId)
 				.last("limit 1"));
+		if (orderDon != null) {
+			orderDon.setIsDeposit(false);
+		}
 		return orderDon;
 	}