小程序下单共享单去掉运费、共享与本地一起下单去掉运费

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/shoppingCart/service/impl/ShoppingCartServiceImpl.java

@@ -1226,7 +1226,7 @@ public class ShoppingCartServiceImpl extends ServiceImpl<ShoppingCartMapper, PjS
 					}, BigDecimal::add).setScale(2, RoundingMode.HALF_UP);
 					orderShare.setSalesAmount(totalMoney);
 					orderShare.setTotalMoney(totalMoney);
-					if (num.compareTo(new BigDecimal(1)) == 0) {
+/*					if (num.compareTo(new BigDecimal(1)) == 0) {
 						if (ObjectUtils.isNotNull(freight)) {
 							try {
 								BigDecimal freightAmount = new BigDecimal(freight);
@@ -1236,7 +1236,8 @@ public class ShoppingCartServiceImpl extends ServiceImpl<ShoppingCartMapper, PjS
 								orderShare.setFreight(new BigDecimal(0));
 							}
 						}
-					}
+					}*/
+					orderShare.setFreight(new BigDecimal(0));
 					orderShare.setGoodsNameJoin(orderItemsListShare.stream().map(PjOrderItems::getGoodsName).collect(Collectors.joining(",")));
 					orderShare.setShortcutJoin(orderItemsListShare.stream().map(PjOrderItems::getCnameInt).collect(Collectors.joining(",")));
 					orderShare.setPayType(payType);
@@ -1613,7 +1614,8 @@ public class ShoppingCartServiceImpl extends ServiceImpl<ShoppingCartMapper, PjS
 			}, BigDecimal::add).setScale(2, RoundingMode.HALF_UP);
 			order.setSalesAmount(totalMoney);
 			order.setTotalMoney(totalMoney);
-			if (order.getGoodsTotalNum().compareTo(new BigDecimal(1)) == 0) {
+			// order.getGoodsTotalNum()
+			if (num.compareTo(new BigDecimal(1)) == 0) {
 				String freight = sysClient.getParamServiceDWT("freight", corpsDesc.getTenantId());
 				if (ObjectUtils.isNotNull(freight)) {
 					try {