功能开发

src/main/java/org/springblade/modules/jinchao/controller/CatalogController.java

@@ -25,6 +25,7 @@
  */
 package org.springblade.modules.jinchao.controller;
 
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
@@ -33,6 +34,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
 import jakarta.validation.Valid;
 
+import org.springblade.core.mp.base.BaseEntity;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.annotation.IsAdmin;
 import org.springblade.core.mp.support.Condition;
@@ -40,6 +42,10 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.modules.jinchao.constant.BaseCol;
+import org.springblade.modules.jinchao.pojo.entity.OrderEntity;
+import org.springblade.modules.jinchao.pojo.entity.OrderProjectProductEntity;
+import org.springblade.modules.jinchao.service.IOrderProjectProductService;
+import org.springblade.modules.jinchao.service.IOrderService;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -52,6 +58,7 @@ import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.excel.util.ExcelUtil;
 
+import java.util.Arrays;
 import java.util.Map;
 import java.util.List;
 
@@ -70,6 +77,8 @@ import jakarta.servlet.http.HttpServletResponse;
 public class CatalogController extends BladeController {
 
 	private final ICatalogService catalogService;
+	private final IOrderProjectProductService orderProjectProductService;
+	private final IOrderService orderService;
 
 	/**
 	 * [产品目录] 详情
@@ -135,6 +144,26 @@ public class CatalogController extends BladeController {
 		if(catalog1 != null && Long.compare(catalog1.getId(),catalog.getId()) != 0){
 			return R.fail("简称已存在！");
 		}
+		List<OrderEntity> orderList = orderService.list(Wrappers.<OrderEntity>lambdaQuery().in(BaseEntity::getStatus, Arrays.asList(new Integer[]{1,2,3,4})));
+		if(CollectionUtils.isNotEmpty(orderList)){
+			for(OrderEntity order : orderList){
+				List<OrderProjectProductEntity> list1 = orderProjectProductService.list(Wrappers.<OrderProjectProductEntity>lambdaQuery().eq(OrderProjectProductEntity::getCatalogOneId,catalog.getId()).eq(OrderProjectProductEntity::getOrderId,order.getId()));
+				if(CollectionUtils.isNotEmpty(list1)){
+					for(OrderProjectProductEntity orderProjectProduct : list1){
+						orderProjectProduct.setCatalogOne(catalog.getName());
+						orderProjectProductService.updateById(orderProjectProduct);
+					}
+				}
+				List<OrderProjectProductEntity> list2 = orderProjectProductService.list(Wrappers.<OrderProjectProductEntity>lambdaQuery().eq(OrderProjectProductEntity::getCatalogTwoId,catalog.getId()).eq(OrderProjectProductEntity::getOrderId,order.getId()));
+				if(CollectionUtils.isNotEmpty(list2)){
+					for(OrderProjectProductEntity orderProjectProduct : list2){
+						orderProjectProduct.setCatalogTwo(catalog.getName());
+						orderProjectProductService.updateById(orderProjectProduct);
+					}
+				}
+			}
+		}
+
 		return R.status(catalogService.updateById(catalog));
 	}
 

src/main/java/org/springblade/modules/jinchao/controller/WaterBillController.java

@@ -26,6 +26,8 @@
 package org.springblade.modules.jinchao.controller;
 
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -45,9 +47,11 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.modules.jinchao.excel.WaterBillExcel;
 import org.springblade.modules.jinchao.pojo.entity.OrderEntity;
+import org.springblade.modules.jinchao.pojo.entity.RemittanceRecordEntity;
 import org.springblade.modules.jinchao.pojo.entity.WaterBillEntity;
 import org.springblade.modules.jinchao.pojo.vo.WaterBillVO;
 import org.springblade.modules.jinchao.service.IOrderService;
+import org.springblade.modules.jinchao.service.IRemittanceRecordService;
 import org.springblade.modules.jinchao.service.IWaterBillService;
 import org.springblade.modules.jinchao.wrapper.WaterBillWrapper;
 import org.springblade.modules.system.pojo.entity.User;
@@ -76,6 +80,7 @@ public class WaterBillController extends BladeController {
 
 	private final IWaterBillService waterBillService;
 	private final IOrderService orderService;
+	private final IRemittanceRecordService remittanceRecordService;
 
 	/**
 	 * 水单表 详情
@@ -152,6 +157,13 @@ public class WaterBillController extends BladeController {
 	@ApiOperationSupport(order = 7)
 	@Operation(summary = "逻辑删除", description  = "传入ids")
 	public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
+		List<Long> idList = Func.toLongList(ids);
+		for(Long id : idList){
+			List<RemittanceRecordEntity> remittanceRecordList = remittanceRecordService.list(Wrappers.<RemittanceRecordEntity>lambdaQuery().eq(RemittanceRecordEntity::getWaterBillId,id));
+			if(CollectionUtils.isNotEmpty(remittanceRecordList)){
+				return R.fail("该水单已生成汇款记录，无法删除！");
+			}
+		}
 		return R.status(waterBillService.deleteLogic(Func.toLongList(ids)));
 	}
 

src/main/java/org/springblade/modules/jinchao/pojo/entity/OrderProjectProductEntity.java

@@ -127,4 +127,16 @@ public class OrderProjectProductEntity extends TenantEntity {
 	 */
 	@Schema(description = "倍率")
 	private Double multiple;
+
+	/**
+	 * 产品大类id
+	 */
+	@Schema(description = "产品大类id")
+	private Long catalogOneId;
+
+	/**
+	 * 产品小类id
+	 */
+	@Schema(description = "产品小类id")
+	private Long catalogTwoId;
 }

src/main/java/org/springblade/modules/jinchao/pojo/vo/ProductVO.java

@@ -97,4 +97,8 @@ public class ProductVO extends ProductEntity {
 	private String startTime;
 
 	private String endTime;
+
+	private Long catalogOneId;
+
+	private Long catalogTwoId;
 }

src/main/java/org/springblade/modules/jinchao/service/impl/ProductServiceImpl.java

@@ -147,6 +147,8 @@ public class ProductServiceImpl extends BaseServiceImpl<ProductMapper, ProductEn
 				CatalogEntity catalogOne = catalogService.getById(catalogTwo.getParentId());
 				vo.setCatalogOne(catalogOne.getName());
 				vo.setCatalogTwo(catalogTwo.getName());
+				vo.setCatalogOneId(catalogOne.getId());
+				vo.setCatalogTwoId(catalogTwo.getId());
 				listVO.add(vo);
 			}
 		});
@@ -154,7 +156,6 @@ public class ProductServiceImpl extends BaseServiceImpl<ProductMapper, ProductEn
 		IPage<ProductVO> pagesVO = Condition.getPage(query);
 		pagesVO.setRecords(listVO);
 		pagesVO.setSize(listVO.size());
-		if(user.getRoleName().equals("administrator")){
 		// 迭代器去添加元素。
 		ListIterator<ProductVO> it = pagesVO.getRecords().listIterator();
 		while (it.hasNext()) {
@@ -169,6 +170,7 @@ public class ProductServiceImpl extends BaseServiceImpl<ProductMapper, ProductEn
 			}
 			long count = bizPriceService.count(wrapper);
 			if (count != 0L) {
+				it.remove();
 				List<BizPriceEntity> listBP = bizPriceService.listByProductId(vo1.getId(),customerId);
 				listBP.forEach(bp -> {
 					ProductVO vo2 = new ProductVO();
@@ -202,7 +204,6 @@ public class ProductServiceImpl extends BaseServiceImpl<ProductMapper, ProductEn
 				log.info("not contain.");
 			}
 		}
-		}
 
 		//筛选
 		if(map.get("nameCn") != null || map.get("bizRemark") != null){