2023年6月16日20:09:04

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/controller/DeliveryController.java

@@ -29,6 +29,7 @@ import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.client.entity.CorpsDesc;
 import org.springblade.client.entity.StorageDesc;
+import org.springblade.client.entity.StorageType;
 import org.springblade.client.feign.ICorpsDescClient;
 import org.springblade.client.feign.IRedisClient;
 import org.springblade.client.feign.IStorageClient;
@@ -142,7 +143,7 @@ public class DeliveryController extends BladeController {
 		redisClient.basicData("all");
 		List<CorpsDesc> corpsDescList = castToList(redisTemplate.opsForValue().get("corps"), CorpsDesc.class);
 		List<User> userList = castToList(redisTemplate.opsForValue().get("user"), User.class);
-		List<StorageDesc> storageDescList = castToList(redisTemplate.opsForValue().get("storageType"), StorageDesc.class);
+		List<StorageType> storageDescList = castToList(redisTemplate.opsForValue().get("storageType"), StorageType.class);
 
 		if (CollectionUtils.isNotEmpty(pages.getRecords())){
 			pages.getRecords().forEach(item ->{
@@ -172,7 +173,7 @@ public class DeliveryController extends BladeController {
 				}
 				//仓库信息
 				if (item.getStorageId() != null){
-					StorageDesc storageDesc = storageDescList.stream().filter(e -> e.getId().equals(item.getStorageId())).findFirst().orElse(null);
+					StorageType storageDesc = storageDescList.stream().filter(e -> e.getId().equals(item.getStorageId())).findFirst().orElse(null);
 					if(storageDesc!=null)
 					{
 						item.setStorageName(storageDesc.getCname());
@@ -233,7 +234,7 @@ public class DeliveryController extends BladeController {
 		redisClient.basicData("all");
 		List<CorpsDesc> corpsDescList = castToList(redisTemplate.opsForValue().get("corps"), CorpsDesc.class);
 		List<User> userList = castToList(redisTemplate.opsForValue().get("user"), User.class);
-		List<StorageDesc> storageDescList = castToList(redisTemplate.opsForValue().get("storageDesc"), StorageDesc.class);
+		List<StorageType> storageDescList = castToList(redisTemplate.opsForValue().get("storageType"), StorageType.class);
 
 		if (CollectionUtils.isNotEmpty(list)){
 			list.forEach(item ->{
@@ -263,10 +264,10 @@ public class DeliveryController extends BladeController {
 				}
 				//仓库信息
 				if (item.getStorageId() != null){
-					StorageDesc storageDesc = storageDescList.stream().filter(e -> e.getId().equals(item.getStorageId())).findFirst().orElse(null);
-					if(storageDesc!=null)
+					StorageType storageType = storageDescList.stream().filter(e -> e.getId().equals(item.getStorageId())).findFirst().orElse(null);
+					if(storageType!=null)
 					{
-						item.setStorageName(storageDesc.getCname());
+						item.setStorageName(storageType.getCname());
 					}
 				}
 

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderServiceImpl.java

@@ -507,17 +507,26 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				}
 				List<OrderFees> feeList = orderFeesService.list(new LambdaQueryWrapper<OrderFees>().eq(OrderFees::getPid, order.getId()).ne(OrderFees::getItemId, feeId).eq(OrderFees::getIsDeleted, 0));
 				BigDecimal totalFee = feeList.stream().map(OrderFees::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
-				if ("681169".equals(AuthUtil.getTenantId()) || "941197".equals(AuthUtil.getTenantId())){
+				if ("681169".equals(AuthUtil.getTenantId()) || "941197".equals(AuthUtil.getTenantId())) {
 					grossProfit = grossProfit.add(totalFee);
-				}else{
+				} else {
 					grossProfit = grossProfit.subtract(totalFee);
 				}
 
 				//毛利额减去产生返利
 				grossProfit = grossProfit.subtract(order.getCreateProfit() == null ? BigDecimal.ZERO : order.getCreateProfit());
+//毛利			额加采购返利
+				BigDecimal purchaseRebatePrice = new BigDecimal("0.00");
+				for (OrderItems orderItems : list) {
+					if (ObjectUtils.isNull(orderItems.getPurchaseRebatePrice()) || orderItems.getPurchaseRebatePrice().compareTo(new BigDecimal("0.00")) == 0) {
+						purchaseRebatePrice = purchaseRebatePrice.add(new BigDecimal("0.00"));
+					}else{
+						purchaseRebatePrice = purchaseRebatePrice.add((orderItems.getPurchaseAmount().subtract(orderItems.getPurchaseRebatePrice())).multiply(orderItems.getOrderQuantity()));
+					}
+				}
 
 				//毛利额加采购返利
-				BigDecimal purchaseRebatePrice = list.stream().reduce(BigDecimal.ZERO, (x, y) -> x.add((y.getPurchaseAmount().subtract(y.getPurchaseRebatePrice() == null ? BigDecimal.ZERO : y.getPurchaseRebatePrice())).multiply(y.getOrderQuantity())), BigDecimal::add);
+//				BigDecimal purchaseRebatePrice = list.stream().reduce(BigDecimal.ZERO, (x, y) -> x.add((y.getPurchaseAmount().subtract(y.getPurchaseRebatePrice() == null ? BigDecimal.ZERO : y.getPurchaseRebatePrice())).multiply(y.getOrderQuantity())), BigDecimal::add);
 				grossProfit = grossProfit.add(purchaseRebatePrice);
 
 				BigDecimal grossProfitRate = new BigDecimal(BigInteger.ZERO);