fix

netflix-dao/src/main/java/com/cyksj/mapper/GoodsWholesaleOrderDonMapper.java

@@ -0,0 +1,13 @@
+package com.cyksj.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cyksj.model.entity.GoodsWholesaleOrderDon;
+
+/**
+ * 项目名: yhlxj
+ * 文件名: GoodsWholesaleOrderDonMapper
+ * 创建者: JavaZou
+ * 创建时间:2024/8/26 12:24
+ */
+public interface GoodsWholesaleOrderDonMapper extends BaseMapper<GoodsWholesaleOrderDon> {
+}

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

@@ -0,0 +1,65 @@
+package com.cyksj.model.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 项目名: yhlxj
+ * 文件名: GoodsWholesaleOrderDon
+ * 创建者: JavaZou
+ * 创建时间:2024/8/26 12:22
+ */
+@Getter
+@Setter
+public class GoodsWholesaleOrderDon extends BaseEntity{
+	private Long userId;
+
+	private String orderNo;
+
+	private Long goodsId;
+
+	private Long skuId;
+
+	private Integer type;
+
+	private BigDecimal money;
+
+	private BigDecimal balance;
+
+	private Integer num;
+
+	private String source;
+
+	private Status status;
+
+	private Date payTime;
+
+	private Boolean sendStatus;
+
+	public enum Status {
+		/**
+		 * 订单状态
+		 */
+		close("已关闭"),
+		noPayment("待付款"),
+		hasPayment("已付款"),
+		transport("已发货"),
+		received("已签收"),
+		complete("已完成"),
+		refund("已退款"),
+		;
+
+		private String desc;
+
+		Status(String desc) {
+			this.desc = desc;
+		}
+
+		public String getDesc() {
+			return desc;
+		}
+	}
+}

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

@@ -1,5 +1,9 @@
 package com.cyksj.model.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.ejlchina.searcher.bean.DbField;
+import com.ejlchina.searcher.bean.DbIgnore;
+import com.ejlchina.searcher.bean.SearchBean;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Setter;
@@ -15,6 +19,7 @@ import java.util.Arrays;
  */
 @Getter
 @Setter
+@SearchBean(tables = "goods_wholesale_user_deposit gwud")
 public class GoodsWholesaleUserDeposit extends BaseEntity{
 	private Long userId;
 
@@ -27,6 +32,13 @@ public class GoodsWholesaleUserDeposit extends BaseEntity{
 	 */
 	private Boolean status;
 
+	/**
+	 * 累积批发
+	 */
+	@TableField(exist = false)
+	@DbIgnore
+	private Integer total;
+
 	/**
 	 * 操作人
 	 */

netflix-service/src/main/java/com/cyksj/service/goods/GoodsWholesaleService.java

@@ -0,0 +1,13 @@
+package com.cyksj.service.goods;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.cyksj.model.entity.GoodsWholesale;
+
+/**
+ * 项目名: yhlxj
+ * 文件名: GoodsWholesaleService
+ * 创建者: JavaZou
+ * 创建时间:2024/8/26 11:49
+ */
+public interface GoodsWholesaleService extends IService<GoodsWholesale> {
+}

netflix-service/src/main/java/com/cyksj/service/goods/impl/GoodsWholesaleServiceImpl.java

@@ -0,0 +1,20 @@
+package com.cyksj.service.goods.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.cyksj.mapper.GoodsWholesaleMapper;
+import com.cyksj.model.entity.GoodsWholesale;
+import com.cyksj.service.goods.GoodsWholesaleService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+/**
+ * 项目名: yhlxj
+ * 文件名: GoodsWholesaleServiceImpl
+ * 创建者: JavaZou
+ * 创建时间:2024/8/26 11:49
+ */
+@Service
+@RequiredArgsConstructor
+public class GoodsWholesaleServiceImpl extends ServiceImpl<GoodsWholesaleMapper, GoodsWholesale> implements GoodsWholesaleService {
+
+}

netflix-web/src/main/java/com/cyksj/web/controller/manage/goods/GoodsDonWholeSaleController.java

@@ -0,0 +1,97 @@
+package com.cyksj.web.controller.manage.goods;
+
+import com.cyksj.dto.Result;
+import com.cyksj.enums.GatewayResponse;
+import com.cyksj.mapper.GoodsWholesaleOrderDonMapper;
+import com.cyksj.model.entity.GoodsWholesale;
+import com.cyksj.model.entity.GoodsWholesaleUserDeposit;
+import com.cyksj.service.goods.GoodsWholesaleService;
+import com.cyksj.service.user.UserBindRelationService;
+import com.ejlchina.searcher.BeanSearcher;
+import com.ejlchina.searcher.SearchResult;
+import com.ejlchina.searcher.util.MapUtils;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * 项目名: yhlxj
+ * 文件名: GoodsDonWholeSaleController
+ * 创建者: JavaZou
+ * 创建时间:2024/8/26 11:46
+ */
+@RequestMapping("/manage/goods/whole/sale")
+@RestController
+@RequiredArgsConstructor
+public class GoodsDonWholeSaleController {
+	private final GoodsWholesaleService goodsWholesaleService;
+
+	private final BeanSearcher beanSearcher;
+
+	private final HttpServletRequest request;
+
+	private final UserBindRelationService userBindRelationService;
+
+	private final GoodsWholesaleOrderDonMapper goodsWholesaleOrderDonMapper;
+
+	/**
+	 * 新增批发平台
+	 */
+	@PostMapping("/post")
+	public Result<String> saveWholesale(@RequestBody GoodsWholesale wholesale) {
+		goodsWholesaleService.saveOrUpdateWholesale(wholesale);
+		return GatewayResponse.SUCCESS.newBuilder().toResult();
+	}
+
+
+	/**
+	 * 编辑批发平台
+	 */
+	@PostMapping("/post")
+	public Result<String> updateWholesale(@RequestBody GoodsWholesale wholesale) {
+		goodsWholesaleService.saveOrUpdateWholesale(wholesale);
+		return GatewayResponse.SUCCESS.newBuilder().toResult();
+	}
+
+	/**
+	 * 删除批发平台
+	 */
+	@DeleteMapping("/delete/{id}")
+	public Result<String> deleteWholesaleById(@PathVariable Long id) {
+		GoodsWholesale byId = goodsWholesaleService.getById(id);
+		if (byId != null) {
+			byId.setDeleted(false);
+			goodsWholesaleService.updateById(byId);
+		}
+		return GatewayResponse.SUCCESS.newBuilder().toResult();
+	}
+
+	/**
+	 * 批发平台列表
+	 */
+	@GetMapping("/get")
+	public Result<SearchResult<GoodsWholesale>> getWholesale() {
+		SearchResult<GoodsWholesale> search = beanSearcher.search(GoodsWholesale.class, MapUtils.flatBuilder(request.getParameterMap()).build());
+		return GatewayResponse.SUCCESS.newBuilder().toResult(search);
+	}
+
+
+	//----------------------------------------------------------------------- 押金管理
+
+	/**
+	 * 押金列表
+	 * @return
+	 */
+	@GetMapping("/get/deposit")
+	public Result<SearchResult<GoodsWholesaleUserDeposit>> getDeposit() {
+		SearchResult<GoodsWholesaleUserDeposit> search = beanSearcher.search(GoodsWholesaleUserDeposit.class, MapUtils.flatBuilder(request.getParameterMap()).build());
+		search.getDataList().forEach(data->{
+			List<Long> userIdList = userBindRelationService.getRelationUserIdList(data.getUserId(), null);
+			goodsWholesaleOrderDonMapper.getUserWholesa leNumByUserIds();
+			data.setTotal();
+		});
+		return GatewayResponse.SUCCESS.newBuilder().toResult(search);
+	}
+}