1.禅道bug-3236-出库工单列表增加一列已出库数量

2.禅道bug-3257-“是否批次号 ”搜索不生效
3.禅道bug-3292-上架管理，花纹搜索无效
4.禅道bug-3282-销售导入-商品名称/code码为空时，提示信息错误
5.销售订单，门店app等相关接口去掉运费
6.禅道bug-3297-上架管理的导出错误
7.禅道bug-3299-库存查询导出问题
8.禅道bug-3298-库存查询-库存数量，点击明细详情报错
9.禅道bug-3275-出库工单，生成发货单。判断剩余发货数量错误

blade-service-api/gubersail-dealer-admin-api/src/main/java/com/gubersail/dealer/admin/api/excel/PjOrderExportExcelXS.java

@@ -87,11 +87,6 @@ public class PjOrderExportExcelXS implements Serializable {
 	 */
 	@ExcelProperty(value = "金额")
 	private BigDecimal totalMoney;
-	/**
-	 * 运费
-	 */
-	@ExcelProperty(value = "运费")
-	private BigDecimal freight;
 
 	/**
 	 * 订单状态

blade-service-api/gubersail-dealer-admin-api/src/main/java/com/gubersail/dealer/admin/api/excel/StockExportExcel.java

@@ -4,6 +4,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -52,29 +53,22 @@ public class StockExportExcel implements Serializable {
 	 */
 	@ExcelProperty(value = "商品描述")
 	private String productDescription;
+	/**
+	 * 分类id
+	 */
+	@ExcelProperty(value = "分类")
+	private String goodsTypeName;
 
 	/**
 	 * 仓库/库区名称
 	 */
 	@ExcelProperty(value = "仓库")
 	private String storageName;
-
 	/**
-	 * 结余数量
+	 * 库区
 	 */
-	@ExcelProperty(value = "库存数量")
-	private BigDecimal balanceQuantity;
-
-	/**
-	 * 结余数量（融资）
-	 */
-	@ExcelProperty(value = "结余数量（融资）")
-	private BigDecimal balanceQuantityFinancing;
-	/**
-	 * 结余数量（自有）
-	 */
-	@ExcelProperty(value = "结余数量（自有）")
-	private BigDecimal balanceQuantityHave;
+	@ExcelProperty(value = "库区")
+	private String reservoirArea;
 
 	/**
 	 * 批次号
@@ -83,34 +77,21 @@ public class StockExportExcel implements Serializable {
 	private String dot;
 
 	/**
-	 * 商城库存
-	 */
-	@ExcelProperty(value = "上架库存")
-	private BigDecimal storeInventory;
-
-	/**
-	 * 库存金额
+	 * 结余数量
 	 */
-	@ExcelProperty(value = "库存金额")
-	private BigDecimal inventoryAmount;
-
+	@ExcelProperty(value = "库存数量")
+	private BigDecimal balanceQuantity;
 	/**
 	 * 库存成本价
 	 */
-	@ExcelProperty(value = "库存成本")
+	@ExcelProperty(value = "库存单价")
 	private BigDecimal inventoryCostPrice;
 
 	/**
-	 * 返利后单价
-	 */
-	@ExcelProperty(value = "返利后单价")
-	private BigDecimal rebatePrice;
-
-	/**
-	 * 返利后单价库存金额
+	 * 库存金额
 	 */
-	@ExcelProperty(value = "返利后单价库存金额")
-	private BigDecimal rebateInventoryAmount;
+	@ExcelProperty(value = "库存金额")
+	private BigDecimal inventoryAmount;
 
 	/**
 	 * 库存预警
@@ -119,12 +100,6 @@ public class StockExportExcel implements Serializable {
 	private Integer inventoryAlert;
 
 	/**
-	 * 盘点库存
-	 */
-	@ExcelProperty(value = "实际库存")
-	private BigDecimal profitLossNum;
-
-	/**
 	 * 商品IDS
 	 */
 	@ExcelProperty(value = "商品IDS")

blade-service-api/gubersail-dealer-admin-api/src/main/java/com/gubersail/dealer/admin/api/ship/dto/ShipItemsDTO.java

@@ -17,6 +17,7 @@
 package com.gubersail.dealer.admin.api.ship.dto;
 
 import com.gubersail.dealer.admin.api.ship.entity.PjShipItems;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -89,6 +90,11 @@ public class ShipItemsDTO extends PjShipItems {
 	private BigDecimal goodsTotalShipAmount;
 
 	/**
+	 * 已出实际数量
+	 */
+	private BigDecimal outGoodsTotalShipNum;
+
+	/**
 	 * 收发货明细list
 	 */
 	private List<PjShipItems> shipItemsList;

blade-service/gubersail-dealer-admin/src/main/java/com/gubersail/admin/goods/controller/GoodsDescController.java

@@ -209,6 +209,7 @@ public class GoodsDescController extends BladeController {
 			.eq(PjGoodsDesc::getIsDeleted, 0)
 			.eq(ObjectUtils.isNotNull(goods.getEnableOrNot()), PjGoodsDesc::getEnableOrNot, goods.getEnableOrNot())
 			.eq(ObjectUtils.isNotNull(goods.getBrandId()), PjGoodsDesc::getBrandId, goods.getBrandId())
+			.eq(ObjectUtils.isNotNull(goods.getWhether()), PjGoodsDesc::getWhether, goods.getWhether())
 			.eq(ObjectUtils.isNotNull(goods.getSpecificationAndModel()), PjGoodsDesc::getSpecificationAndModel, goods.getSpecificationAndModel())
 			.eq(ObjectUtils.isNotNull(goods.getBrandItem()), PjGoodsDesc::getBrandItem, goods.getBrandItem())
 			.eq(ObjectUtils.isNotNull(goods.getExplosionProof()), PjGoodsDesc::getExplosionProof, goods.getExplosionProof())

blade-service/gubersail-dealer-admin/src/main/java/com/gubersail/admin/order/controller/OrderController.java

@@ -495,11 +495,6 @@ public class OrderController extends BladeController {
 		IPage<PjOrder> pages = orderService.page(Condition.getPage(query), lambdaQueryWrapper);
 		IPage<ShipItemsDTO> voPage = new Page<>();
 		List<ShipItemsDTO> shipItemsList = new ArrayList<>();
-		voPage.setPages(pages.getPages());
-		voPage.setCurrent(pages.getCurrent());
-		voPage.setTotal(pages.getTotal());
-		voPage.setTotal(pages.getTotal());
-		voPage.setSize(pages.getSize());
 		if (CollectionUtils.isNotEmpty(pages.getRecords())) {
 			List<Long> ids = pages.getRecords().stream().map(PjOrder::getId).collect(Collectors.toList());
 			List<PjOrderItems> pjOrderItemsList = orderItemsService.list(new LambdaQueryWrapper<PjOrderItems>()
@@ -533,6 +528,7 @@ public class OrderController extends BladeController {
 						shipItems.setGoodsDescription(e.getGoodsDescription());
 						shipItems.setUnits(e.getUnits());
 						shipItems.setGoodsNum(e.getGoodsNum());
+						shipItems.setOutGoodsTotalShipNum(e.getSendNum());
 						shipItems.setPrice(e.getPrice());
 						shipItems.setSubTotalMoney(e.getSubTotalMoney());
 						shipItems.setSendNum(e.getGoodsNum().subtract(e.getSendNum()));
@@ -548,6 +544,10 @@ public class OrderController extends BladeController {
 				}
 			}
 		}
+		voPage.setPages(pages.getPages());
+		voPage.setCurrent(pages.getCurrent());
+		voPage.setTotal(shipItemsList.size());
+		voPage.setSize(pages.getSize());
 		voPage.setRecords(shipItemsList);
 		return R.data(voPage);
 	}

blade-service/gubersail-dealer-admin/src/main/java/com/gubersail/admin/order/service/impl/OrderServiceImpl.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gubersail.admin.corp.mapper.CorpsDescMapper;
 import com.gubersail.admin.goods.mapper.GoodsDescMapper;
@@ -31,7 +30,6 @@ import com.gubersail.dealer.admin.api.ship.entity.PjShip;
 import com.gubersail.dealer.admin.api.ship.entity.ShipItemsRecord;
 import com.gubersail.dealer.admin.api.stock.entity.TireStockDesc;
 import lombok.AllArgsConstructor;
-import org.springblade.common.enums.CommonEnum;
 import org.springblade.common.enums.NumberEnum;
 import org.springblade.common.enums.OrderTypeEnum;
 import org.springblade.core.secure.BladeUser;
@@ -614,7 +612,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 		List<PjOrderItems> list = new ArrayList<>();
 		List<String> codesList = excelList.stream().map(ShipItemImportXSExcel::getGoodsName).distinct()
 			.filter(Objects::nonNull).collect(Collectors.toList());
-		if (excelList.size() != codesList.size()) {
+		if (!codesList.isEmpty() && excelList.size() != codesList.size()) {
 			throw new RuntimeException("导入数据存在重复商品名称，请处理后再导入");
 		}
 		String codes = String.join(",", codesList);
@@ -696,7 +694,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 		List<PjOrderItems> list = new ArrayList<>();
 		List<String> codesList = excelList.stream().map(ShipItemImportXSCodeExcel::getCode).distinct()
 			.filter(Objects::nonNull).collect(Collectors.toList());
-		if (excelList.size() != codesList.size()) {
+		if (!codesList.isEmpty() && excelList.size() != codesList.size()) {
 			throw new RuntimeException("导入数据存在重复商品编码，请处理后再导入");
 		}
 		String codes = String.join(",", codesList);
@@ -928,17 +926,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 					.multiply(y.getPrice())), BigDecimal::add).setScale(2, RoundingMode.HALF_UP);
 				order.setSalesAmount(totalMoney);
 				order.setTotalMoney(totalMoney);
-				BigDecimal one = new BigDecimal(CommonEnum.ONE.info);
-				String freight = sysClient.getParamService("freight");
-				BigDecimal freightAmount = ObjectUtils.isNotNull(freight) ? new BigDecimal(freight) : BigDecimal.ZERO;
-				BigDecimal goodsTotalNum = order.getGoodsTotalNum();
-				if (StringUtils.isNotBlank(order.getSrcOrdNo()) && !Objects.equals(order.getSrcOrdNo(), order.getOrdNo())) {
-					// srcorderno != orderno 时代表是小程序单, 小程单则加上拆分出去订单的数量
-					BigDecimal orderItemSum = orderMapper.selectGoodsNumBySrcOrderNo(order.getSrcOrdNo(), order.getId());
-					goodsTotalNum = goodsTotalNum.add(orderItemSum);
-				}
-				order.setTotalMoney(goodsTotalNum.compareTo(one) == 0 ? totalMoney.add(freightAmount) : totalMoney);
-				order.setFreight(goodsTotalNum.compareTo(one) == 0 ? freightAmount : BigDecimal.ZERO);
 			} else {
 				order.setNumberRows(0);//行数
 				//总数量

blade-service/gubersail-dealer-admin/src/main/java/com/gubersail/admin/ship/mapper/ShipMapper.xml

@@ -40,18 +40,18 @@
     </select>
     <select id="stockDataDetails" resultType="com.gubersail.dealer.admin.api.excel.PjShipStockDetails">
         SELECT
-        ps.id as id,
-        ps.storage_id as stockId,
-        ps.call_in_storage_id as callInStorageId,
+        ANY_VALUE(ps.id) as id,
+        ANY_VALUE(ps.storage_id) as stockId,
+        ANY_VALUE(ps.call_in_storage_id) as callInStorageId,
         ps.billno AS billno,
-        ps.customer_name AS corpName,
-        ps.status_name AS statusName,
-        ps.create_time AS updateTime,
-        pgd.brand_item AS brandItem,
-        pgd.cname AS goodsName,
-        pgd.specification_and_model AS specificationAndModel,
-        psi.inventory as totalNum,
-        CASE
+        ANY_VALUE(ps.customer_name) AS corpName,
+        ANY_VALUE(ps.status_name) AS statusName,
+        ANY_VALUE(ps.create_time) AS updateTime,
+        ANY_VALUE(pgd.brand_item) AS brandItem,
+        ANY_VALUE(pgd.cname) AS goodsName,
+        ANY_VALUE(pgd.specification_and_model) AS specificationAndModel,
+        ANY_VALUE(psi.inventory) as totalNum,
+        ANY_VALUE(CASE
         ps.biz_type_name
         WHEN 'FHGD' THEN
         '出库'
@@ -65,8 +65,8 @@
         '退货入库'
         WHEN 'TKFHGD' THEN
         '退货出库'
-        END AS bizTypeName,
-        CASE
+        END) AS bizTypeName,
+        ANY_VALUE(CASE
         ps.biz_type_name
         WHEN 'FHGD' THEN
         IF
@@ -74,14 +74,14 @@
         WHEN 'TKFHGD' THEN
         IF
         ( SUM( psi.send_num ), SUM( psi.send_num ), 0 ) ELSE 0
-        END AS SubSendTotalNum,
-        CASE
+        END) AS SubSendTotalNum,
+        ANY_VALUE(CASE
         ps.biz_type_name
         WHEN 'DBGD' THEN
         IF
         ( SUM( psi.goods_num ), SUM( psi.goods_num ), 0 ) ELSE 0
-        END AS transferAllocateNum,
-        CASE
+        END) AS transferAllocateNum,
+        ANY_VALUE(CASE
         ps.biz_type_name
         WHEN 'SHGD' THEN
         IF
@@ -93,7 +93,7 @@
         IF
         ( SUM( psi.send_num ), SUM( psi.send_num ), 0 )
         ELSE 0
-        END AS addSendTotalNum
+        END) AS addSendTotalNum
         FROM
         pjpf_ship_items psi
         LEFT JOIN pjpf_ship ps ON ps.id = psi.pid

blade-service/gubersail-dealer-admin/src/main/java/com/gubersail/admin/ship/service/impl/ShipServiceImpl.java

@@ -480,8 +480,9 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 					order.setDeliveryBusinesDate(null);
 					order.setStatus(OrderTypeEnum.GENERATED.getType());
 					order.setVersion(order.getVersion() + 1);
-					order.setOutGoodsTotalShipNum(order.getOutGoodsTotalShipNum().subtract(pjOrderItemsList.stream().map(PjOrderItems::getSendNum).filter(Objects::nonNull)
-						.reduce(BigDecimal.ZERO, BigDecimal::add)));
+					BigDecimal sendNum = shipVO.getShipItemsList().stream().map(PjShipItems::getSendNum).filter(Objects::nonNull)
+						.reduce(BigDecimal.ZERO, BigDecimal::add);
+					order.setOutGoodsTotalShipNum(order.getOutGoodsTotalShipNum().subtract(sendNum));
 					orderMapper.updateById(order);
 				} else {
 					throw new RuntimeException("数据异常请联系管理员");

blade-service/gubersail-dealer-admin/src/main/java/com/gubersail/admin/shoppingCart/service/impl/ShoppingCartServiceImpl.java

@@ -205,10 +205,6 @@ public class ShoppingCartServiceImpl extends ServiceImpl<ShoppingCartMapper, PjS
 
 						order.setSalesAmount(totalMoney);
 						order.setTotalMoney(totalMoney);
-						// 运费不会为空，返回的只有零或设置的参数
-						BigDecimal freightAmount = WxParamUtil.getFreightByOrder(order.getGoodsTotalNum(), freight);
-						order.setTotalMoney(totalMoney.add(freightAmount));
-						order.setFreight(freightAmount);
 						amount = amount.add(order.getTotalMoney());
 					}
 					if (goodsName.length() > 0) {
@@ -398,18 +394,6 @@ public class ShoppingCartServiceImpl extends ServiceImpl<ShoppingCartMapper, PjS
 						order.setSalesAmount(totalMoney);
 						order.setTotalMoney(totalMoney);
 
-						if (order.getGoodsTotalNum().compareTo(new BigDecimal(1)) == 0) {
-							String freight = sysClient.getParamServiceDWT("freight", finalCorpsDesc.getTenantId());
-							if (ObjectUtils.isNotNull(freight)) {
-								try {
-									BigDecimal freightAmount = new BigDecimal(freight);
-									order.setTotalMoney(totalMoney.add(freightAmount));
-									order.setFreight(freightAmount);
-								} catch (Exception ignored) {
-									order.setFreight(new BigDecimal(0));
-								}
-							}
-						}
 						amount = amount.add(order.getTotalMoney());
 					}
 					if (goodsName.length() > 0) {
@@ -572,18 +556,6 @@ public class ShoppingCartServiceImpl extends ServiceImpl<ShoppingCartMapper, PjS
 						order.setSalesAmount(totalMoney);
 						order.setTotalMoney(totalMoney);
 
-						if (order.getGoodsTotalNum().compareTo(new BigDecimal(1)) == 0) {
-							String freight = sysClient.getParamServiceDWT("freight", finalCorpsDesc.getTenantId());
-							if (ObjectUtils.isNotNull(freight)) {
-								try {
-									BigDecimal freightAmount = new BigDecimal(freight);
-									order.setTotalMoney(totalMoney.add(freightAmount));
-									order.setFreight(freightAmount);
-								} catch (Exception ignored) {
-									order.setFreight(new BigDecimal(0));
-								}
-							}
-						}
 						amount = amount.add(order.getTotalMoney());
 						order.setPaymentDate(new Date());
 						order.setActualPaymentStatus(1);

blade-service/gubersail-dealer-admin/src/main/java/com/gubersail/admin/stock/controller/TireStockDescController.java

@@ -101,6 +101,7 @@ public class TireStockDescController extends BladeController {
 			.like(ObjectUtil.isNotEmpty(stockDesc.getStorageName()), TireStockDesc::getStorageName, stockDesc.getStorageName())
 			.eq(ObjectUtil.isNotEmpty(stockDesc.getBrandId()), TireStockDesc::getBrandId, stockDesc.getBrandId())
 			.eq(ObjectUtil.isNotEmpty(stockDesc.getBrandName()), TireStockDesc::getBrandName, stockDesc.getBrandName())
+			.eq(ObjectUtil.isNotEmpty(stockDesc.getBrandItem()), TireStockDesc::getBrandItem, stockDesc.getBrandItem())
 			.eq(ObjectUtil.isNotEmpty(stockDesc.getGoodsTypeId()), TireStockDesc::getGoodsTypeId, stockDesc.getGoodsTypeId())
 			.like(ObjectUtil.isNotEmpty(stockDesc.getDot()), TireStockDesc::getDot, stockDesc.getDot())
 			.like(ObjectUtil.isNotEmpty(stockDesc.getPoNo()), TireStockDesc::getPoNo, stockDesc.getPoNo())
@@ -622,6 +623,8 @@ public class TireStockDescController extends BladeController {
 			.like(ObjectUtil.isNotEmpty(stockDesc.getTypeNo()), TireStockDesc::getTypeNo, stockDesc.getTypeNo())
 			.eq(ObjectUtil.isNotEmpty(stockDesc.getStorageId()), TireStockDesc::getStorageId, stockDesc.getStorageId())
 			.eq(ObjectUtil.isNotEmpty(stockDesc.getBrandId()), TireStockDesc::getBrandId, stockDesc.getBrandId())
+			.eq(ObjectUtil.isNotEmpty(stockDesc.getBrandName()), TireStockDesc::getBrandName, stockDesc.getBrandName())
+			.eq(ObjectUtil.isNotEmpty(stockDesc.getBrandItem()), TireStockDesc::getBrandItem, stockDesc.getBrandItem())
 			.eq(ObjectUtil.isNotEmpty(stockDesc.getGoodsTypeId()), TireStockDesc::getGoodsTypeId, stockDesc.getGoodsTypeId())
 			.like(ObjectUtil.isNotEmpty(stockDesc.getDot()), TireStockDesc::getDot, stockDesc.getDot())
 			.like(ObjectUtil.isNotEmpty(stockDesc.getCname()), TireStockDesc::getCname, stockDesc.getCname())

blade-service/gubersail-dealer-app/src/main/java/com/gubersail/app/order/service/impl/AppOrderServiceImpl.java

@@ -1033,17 +1033,6 @@ public class AppOrderServiceImpl extends ServiceImpl<AppOrderMapper, AppOrder> i
 				.multiply(y.getPrice())), BigDecimal::add).setScale(2, RoundingMode.HALF_UP);
 			order.setSalesAmount(totalMoney);
 			order.setTotalMoney(totalMoney);
-			BigDecimal one = new BigDecimal(CommonEnum.ONE.info);
-			String freight = sysClient.getParamService("freight");
-			BigDecimal freightAmount = ObjectUtils.isNotNull(freight) ? new BigDecimal(freight) : BigDecimal.ZERO;
-			BigDecimal goodsTotalNum = order.getGoodsTotalNum();
-			if (StringUtils.isNotBlank(order.getSrcOrdNo()) && !Objects.equals(order.getSrcOrdNo(), order.getOrdNo())) {
-				// srcorderno != orderno 时代表是小程序单, 小程单则加上拆分出去订单的数量
-				BigDecimal orderItemSum = appOrderMapper.selectGoodsNumBySrcOrderNo(order.getSrcOrdNo(), order.getId());
-				goodsTotalNum = goodsTotalNum.add(orderItemSum);
-			}
-			order.setTotalMoney(goodsTotalNum.compareTo(one) == 0 ? totalMoney.add(freightAmount) : totalMoney);
-			order.setFreight(goodsTotalNum.compareTo(one) == 0 ? freightAmount : BigDecimal.ZERO);
 		} else {
 			order.setNumberRows(0);//行数
 			//总数量

blade-service/gubersail-dealer-app/src/main/java/com/gubersail/app/shoppingCart/service/impl/AppShoppingCartServiceImpl.java

@@ -217,10 +217,6 @@ public class AppShoppingCartServiceImpl extends ServiceImpl<AppShoppingCartMappe
 
 						order.setSalesAmount(totalMoney);
 						order.setTotalMoney(totalMoney);
-						// 运费不会为空，返回的只有零或设置的参数
-						BigDecimal freightAmount = AppWxParamUtil.getFreightByOrder(order.getGoodsTotalNum(), freight);
-						order.setTotalMoney(totalMoney.add(freightAmount));
-						order.setFreight(freightAmount);
 						amount = amount.add(order.getTotalMoney());
 					}
 					if (goodsName.length() > 0) {
@@ -410,19 +406,6 @@ public class AppShoppingCartServiceImpl extends ServiceImpl<AppShoppingCartMappe
 
 						order.setSalesAmount(totalMoney);
 						order.setTotalMoney(totalMoney);
-
-						if (order.getGoodsTotalNum().compareTo(new BigDecimal(1)) == 0) {
-							String freight = sysClient.getParamServiceDWT("freight", finalCorpsDesc.getTenantId());
-							if (ObjectUtils.isNotNull(freight)) {
-								try {
-									BigDecimal freightAmount = new BigDecimal(freight);
-									order.setTotalMoney(totalMoney.add(freightAmount));
-									order.setFreight(freightAmount);
-								} catch (Exception ignored) {
-									order.setFreight(new BigDecimal(0));
-								}
-							}
-						}
 						amount = amount.add(order.getTotalMoney());
 					}
 					if (goodsName.length() > 0) {
@@ -592,19 +575,6 @@ public class AppShoppingCartServiceImpl extends ServiceImpl<AppShoppingCartMappe
 
 						order.setSalesAmount(totalMoney);
 						order.setTotalMoney(totalMoney);
-
-						if (order.getGoodsTotalNum().compareTo(new BigDecimal(1)) == 0) {
-							String freight = sysClient.getParamServiceDWT("freight", finalCorpsDesc.getTenantId());
-							if (ObjectUtils.isNotNull(freight)) {
-								try {
-									BigDecimal freightAmount = new BigDecimal(freight);
-									order.setTotalMoney(totalMoney.add(freightAmount));
-									order.setFreight(freightAmount);
-								} catch (Exception ignored) {
-									order.setFreight(new BigDecimal(0));
-								}
-							}
-						}
 						amount = amount.add(order.getTotalMoney());
 						order.setPaymentDate(new Date());
 						order.setActualPaymentStatus(1);

blade-service/gubersail-shop-app/src/main/java/com/gubersail/shop/app/order/service/impl/ShopAppOrderServiceImpl.java

@@ -188,17 +188,6 @@ public class ShopAppOrderServiceImpl extends ServiceImpl<ShopAppOrderMapper, Sho
 					.multiply(y.getPrice())), BigDecimal::add).setScale(2, RoundingMode.HALF_UP);
 				order.setSalesAmount(totalMoney);
 				order.setTotalMoney(totalMoney);
-				BigDecimal one = new BigDecimal(CommonEnum.ONE.info);
-				String freight = sysClient.getParamService("freight");
-				BigDecimal freightAmount = ObjectUtils.isNotNull(freight) ? new BigDecimal(freight) : BigDecimal.ZERO;
-				BigDecimal goodsTotalNum = order.getGoodsTotalNum();
-				if (StringUtils.isNotBlank(order.getSrcOrdNo()) && !Objects.equals(order.getSrcOrdNo(), order.getOrdNo())) {
-					// srcorderno != orderno 时代表是小程序单, 小程单则加上拆分出去订单的数量
-					BigDecimal orderItemSum = orderMapper.selectGoodsNumBySrcOrderNo(order.getSrcOrdNo(), order.getId());
-					goodsTotalNum = goodsTotalNum.add(orderItemSum);
-				}
-				order.setTotalMoney(goodsTotalNum.compareTo(one) == 0 ? totalMoney.add(freightAmount) : totalMoney);
-				order.setFreight(goodsTotalNum.compareTo(one) == 0 ? freightAmount : BigDecimal.ZERO);
 			} else {
 				order.setNumberRows(0);//行数
 				//总数量

blade-service/gubersail-shop-app/src/main/java/com/gubersail/shop/app/shoppingCart/service/impl/ShopAppShoppingCartServiceImpl.java

@@ -177,10 +177,6 @@ public class ShopAppShoppingCartServiceImpl extends ServiceImpl<ShopAppShoppingC
 
 			order.setSalesAmount(totalMoney);
 			order.setTotalMoney(totalMoney);
-			// 运费不会为空，返回的只有零或设置的参数
-			BigDecimal freightAmount = WxParamUtil.getFreightByOrder(order.getGoodsTotalNum(), freight);
-			order.setTotalMoney(totalMoney.add(freightAmount));
-			order.setFreight(freightAmount);
 			if (goodsName.length() > 0) {
 				order.setGoodsNameJoin(goodsName.substring(0, goodsName.length() - 1));
 			}
@@ -329,18 +325,6 @@ public class ShopAppShoppingCartServiceImpl extends ServiceImpl<ShopAppShoppingC
 			order.setSalesAmount(totalMoney);
 			order.setTotalMoney(totalMoney);
 
-			if (order.getGoodsTotalNum().compareTo(new BigDecimal(1)) == 0) {
-				String freight = sysClient.getParamServiceDWT("freight", finalCorpsDesc.getTenantId());
-				if (ObjectUtils.isNotNull(freight)) {
-					try {
-						BigDecimal freightAmount = new BigDecimal(freight);
-						order.setTotalMoney(totalMoney.add(freightAmount));
-						order.setFreight(freightAmount);
-					} catch (Exception ignored) {
-						order.setFreight(new BigDecimal(0));
-					}
-				}
-			}
 			if (goodsName.length() > 0) {
 				order.setGoodsNameJoin(goodsName.substring(0, goodsName.length() - 1));
 			}