zoujiajian vor 1 Jahr
Ursprung
Commit
6aa6739753

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

@@ -20,8 +20,9 @@ import java.util.Date;
  */
 @Getter
 @Setter
-@SearchBean(tables = "goods_wholesale_user_deposit gwud")
-public class GoodsWholesaleUserDeposit extends BaseEntity{
+@SearchBean(tables = "goods_wholesale_user_deposit gwud",
+		where = "gwud.status != 'noPayment'")
+public class GoodsWholesaleUserDeposit extends BaseEntity {
 	private Long userId;
 
 	private BigDecimal money;
@@ -98,12 +99,11 @@ public class GoodsWholesaleUserDeposit extends BaseEntity{
 
 	@Getter
 	@AllArgsConstructor
-	public enum Type{
-		WeChat("wechat","微信"),
-		ALI_PAY("zfb","支付宝"),
-		PAYPAL("paypal","paypal支付"),
-		STRIPE("stripe","stripe支付")
-		;
+	public enum Type {
+		WeChat("wechat", "微信"),
+		ALI_PAY("zfb", "支付宝"),
+		PAYPAL("paypal", "paypal支付"),
+		STRIPE("stripe", "stripe支付");
 		String type;
 		String desc;
 

+ 0 - 1
netflix-web/src/main/java/com/cyksj/web/controller/manage/goods/CmsGoodsDonWholeSaleController.java

@@ -175,7 +175,6 @@ public class CmsGoodsDonWholeSaleController {
 	@GetMapping("/get/deposit")
 	public Result<SearchResult<GoodsWholesaleUserDeposit>> getDeposit() {
 		SearchResult<GoodsWholesaleUserDeposit> search = beanSearcher.search(GoodsWholesaleUserDeposit.class, MapUtils.flatBuilder(request.getParameterMap())
-				.field(GoodsWholesaleUserDeposit::getStatus, GoodsWholesaleUserDeposit.Status.noPayment).op(Operator.NotEqual)
 				.build());
 		search.getDataList().forEach(data -> {
 			List<Long> userIdList = userBindRelationService.getRelationUserIdList(data.getUserId(), null);