Merge remote-tracking branch 'origin/master'

blade-service/blade-client/src/main/java/org/springblade/client/goods/controller/GoodsDescController.java

@@ -1053,6 +1053,7 @@ public class GoodsDescController extends BladeController {
 		goodsDescLambdaQueryWrapper.like(!StringUtils.isBlank(goodsTypeId), GoodsDesc::getGoodsTypeId, goodsTypeId);
 		goodsDescLambdaQueryWrapper.eq(GoodsDesc::getTenantId, AuthUtil.getTenantId());
 		goodsDescLambdaQueryWrapper.eq(GoodsDesc::getType, 0);
+		goodsDescLambdaQueryWrapper.eq(GoodsDesc::getIsDeleted, 0);
 		goodsDescLambdaQueryWrapper.orderByDesc(GoodsDesc::getCreateTime);
 		if (!"admin".equals(AuthUtil.getUserName())) {
 			goodsDescLambdaQueryWrapper.and(qw -> qw.like(GoodsDesc::getSupervisorUserIdGroup, AuthUtil.getUserId())

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

@@ -8452,15 +8452,17 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					.findFirst().orElse(null);
 				if (salesPolicyItem != null) {
 					item.setPurchasePrice(salesPolicyItem.getPurchasePrice());
+					item.setRealSpecialOffer(salesPolicyItem.getRealSpecialOffer());
 					item.setPriceType(salesPolicy.getCname());
+					item.setInputMold(1);
 					if ("正常".equals(salesPolicy.getType())) {
 						item.setPrice(salesPolicyItem.getSalesPrice());
+						item.setIsSpecial(0);
 					} else {
-						item.setPrice(salesPolicyItem.getSpecialOffer());
-						item.setRealSpecialOffer(salesPolicyItem.getRealSpecialOffer());
-						item.setInputMold(1);
 						item.setIsSpecial(1);
+						item.setPrice(salesPolicyItem.getSpecialOffer());
 					}
+					item.setAmount(item.getPrice().multiply(item.getOrderQuantity()));
 					orderItems.add(item);
 				}
 			}

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/ship/service/impl/ShipServiceImpl.java

@@ -17,7 +17,6 @@ import me.chanjar.weixin.mp.bean.template.WxMpTemplateData;
 import okhttp3.*;
 import org.springblade.client.entity.Message;
 import org.springblade.client.feign.IMessageClient;
-import org.springblade.common.enums.CommonEnum;
 import org.springblade.common.enums.NumberEnum;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
@@ -836,7 +835,13 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 						BigDecimal inventoryAmount = item.getSendNum().multiply(stockOne.getInventoryCostPrice());
 						BigDecimal rebateInventoryAmount = item.getSendNum().multiply(stockOne.getRebatePrice());
 						stockOne.setInventoryAmount(stockOne.getInventoryAmount().subtract(inventoryAmount));
+						if (new BigDecimal("0.00").compareTo(stockOne.getInventoryAmount()) == 0) {
+							stockOne.setInventoryCostPrice(new BigDecimal("0.00"));
+						}
 						stockOne.setRebateInventoryAmount(stockOne.getRebateInventoryAmount().subtract(rebateInventoryAmount));
+						if (new BigDecimal("0.00").compareTo(stockOne.getRebateInventoryAmount()) == 0) {
+							stockOne.setRebatePrice(new BigDecimal("0.00"));
+						}
 						stockOne.setVersion(stockOne.getVersion());
 					}
 					pjStockDescArrayList.add(stockOne);
@@ -1025,7 +1030,7 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 							}
 							List<PjOrderItems> orderItemList = orderItemsList.stream().filter(e -> e.getGoodsId().equals(shipItems.getGoodsId())).collect(Collectors.toList());
 							if (orderItemList.isEmpty()) {
-								throw new RuntimeException("商品：" + shipItems.getGoodsName() + "超过"+days+"天未赎回，请确认在出库");
+								throw new RuntimeException("商品：" + shipItems.getGoodsName() + "超过" + days + "天未赎回，请确认在出库");
 							}
 							List<FinancingShipItemDto> mapList = new ArrayList<>();
 							if (number.compareTo(new BigDecimal("0.00")) > 0) {
@@ -1356,6 +1361,12 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 					BigDecimal rebateInventoryAmount = item.getSendNum().multiply(stockOne.getRebatePrice());
 					stockOne.setInventoryAmount(stockOne.getInventoryAmount().add(inventoryAmount));
 					stockOne.setRebateInventoryAmount(stockOne.getRebateInventoryAmount().add(rebateInventoryAmount));
+					if (new BigDecimal("0.00").compareTo(stockOne.getInventoryAmount()) == 0) {
+						stockOne.setInventoryCostPrice(new BigDecimal("0.00"));
+					}
+					if (new BigDecimal("0.00").compareTo(stockOne.getRebateInventoryAmount()) == 0) {
+						stockOne.setRebatePrice(new BigDecimal("0.00"));
+					}
 					stockOne.setVersion(stockOne.getVersion());
 					pjStockDescArrayList.add(stockOne);
 				} else {
@@ -3794,6 +3805,12 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 						stockOne.setInventoryCostPrice(stockOne.getInventoryAmount().divide(stockOne.getBalanceQuantity(), MathContext.DECIMAL32).setScale(2, RoundingMode.HALF_UP));
 						stockOne.setRebatePrice(stockOne.getRebateInventoryAmount().divide(stockOne.getBalanceQuantity(), MathContext.DECIMAL32).setScale(2, RoundingMode.HALF_UP));
 					}
+					if (new BigDecimal("0.00").compareTo(stockOne.getInventoryAmount()) == 0) {
+						stockOne.setInventoryCostPrice(new BigDecimal("0.00"));
+					}
+					if (new BigDecimal("0.00").compareTo(stockOne.getRebateInventoryAmount()) == 0) {
+						stockOne.setRebatePrice(new BigDecimal("0.00"));
+					}
 					pjStockDescArrayList.add(stockOne);
 				} else {
 					System.err.println("商品：" + goodsDesc.getCname());
@@ -4049,6 +4066,12 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 						stockOne.setInventoryCostPrice(stockOne.getInventoryAmount().divide(stockOne.getBalanceQuantity(), MathContext.DECIMAL32).setScale(2, RoundingMode.HALF_UP));
 						stockOne.setRebatePrice(stockOne.getRebateInventoryAmount().divide(stockOne.getBalanceQuantity(), MathContext.DECIMAL32).setScale(2, RoundingMode.HALF_UP));
 					}*/
+					if (new BigDecimal("0.00").compareTo(stockOne.getInventoryAmount()) == 0) {
+						stockOne.setInventoryCostPrice(new BigDecimal("0.00"));
+					}
+					if (new BigDecimal("0.00").compareTo(stockOne.getRebateInventoryAmount()) == 0) {
+						stockOne.setRebatePrice(new BigDecimal("0.00"));
+					}
 					pjStockDescArrayList.add(stockOne);
 					/*R res = iStockDescService.updateByIdNew(stockOne);
 					if (!res.isSuccess()) {
@@ -4859,6 +4882,12 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 					BigDecimal rebateInventoryAmount = item.getSendNum().multiply(stockOne.getRebatePrice());
 					stockOne.setInventoryAmount(stockOne.getInventoryAmount().subtract(inventoryAmount));
 					stockOne.setRebateInventoryAmount(stockOne.getRebateInventoryAmount().subtract(rebateInventoryAmount));
+					if (new BigDecimal("0.00").compareTo(stockOne.getInventoryAmount()) == 0) {
+						stockOne.setInventoryCostPrice(new BigDecimal("0.00"));
+					}
+					if (new BigDecimal("0.00").compareTo(stockOne.getRebateInventoryAmount()) == 0) {
+						stockOne.setRebatePrice(new BigDecimal("0.00"));
+					}
 					stockOne.setVersion(stockOne.getVersion());
 					pjStockDescArrayList.add(stockOne);
 				} else {

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/util/ParameterUtils.java

@@ -24,7 +24,7 @@ public class ParameterUtils {
 
 
 	public static Boolean whetherDatabaseSharding() {
-		String status = sysClient.getParamService("whether.branch.management");
+		String status = sysClient.getParamServiceDWT("whether.branch.management",AuthUtil.getTenantId());
 		boolean whetherDatabaseSharding = false;
 		if (AuthUtil.getUserRole().contains("admin")){
 			return whetherDatabaseSharding;

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/util/WxParamUtil.java

@@ -92,19 +92,14 @@ public class WxParamUtil {
 		}
 		wxAppGoodsParamsVo.setWhetherIntegral(productLaunch.getWhetherIntegral());
 		if (!CommonEnum.ONE.info.equals(productLaunch.getWhetherIntegral())) {
-			String status = iSysClient.getParamService(CommonEnum.WHETHER_BRANCH_MANAGEMENT.info);
-			managementIf:
-			if (CommonEnum.ONE.info.equals(status) && ObjectUtils.isNotNull(corpsDesc.getDeliveryWarehouseId())) {
-				LambdaQueryWrapper<PjStockDesc> lambdaQueryWrapper = new LambdaQueryWrapper<PjStockDesc>();
-				lambdaQueryWrapper.eq(PjStockDesc::getTenantId, bladeUser.getTenantId())
-					.eq(PjStockDesc::getIsDeleted, 0);
-				if (ParameterUtils.whetherDatabaseSharding()) {
-					lambdaQueryWrapper.eq(ObjectUtils.isNotNull(ParameterUtils.getStorageId()), PjStockDesc::getStorageId, ParameterUtils.getStorageId());
-				}
-				List<PjStockDesc> stockDescList = stockDescService.list(lambdaQueryWrapper);
-				if (stockDescList.isEmpty()) {
-					break managementIf;
-				}
+			LambdaQueryWrapper<PjStockDesc> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+			lambdaQueryWrapper.eq(PjStockDesc::getTenantId, bladeUser.getTenantId())
+				.eq(PjStockDesc::getIsDeleted, 0);
+			if (ParameterUtils.whetherDatabaseSharding()) {
+				lambdaQueryWrapper.eq(ObjectUtils.isNotNull(ParameterUtils.getStorageId()), PjStockDesc::getStorageId, ParameterUtils.getStorageId());
+			}
+			List<PjStockDesc> stockDescList = stockDescService.list(lambdaQueryWrapper);
+			if (!stockDescList.isEmpty()) {
 				wxAppGoodsParamsVo.setGoodsIds(stockDescList.stream().map(PjStockDesc::getGoodsId).collect(Collectors.toList()));
 			}
 		}