Merge branch 'dev/2024/0703/update-app-Y' of Harper/feifan-backend-zx-app into master

调整运费平摊

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/service/order/TradeOrderUpdateServiceImpl.java

@@ -773,7 +773,7 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
             orderItems.forEach(itemDO -> {
                 ProductSpuDO spuDO = productSpuMapper.selectById(itemDO.getSpuId());
                 templateIdMap.forEach((id, count) -> {
-                    if (spuDO.getDeliveryTemplateId().equals(id) && itemDO.getDeliveryPrice() != 0) {
+                    if (spuDO.getDeliveryTemplateId().equals(id) && deliveryPriceMap.get(spuDO.getDeliveryTemplateId()) != null) {
                         itemDO.setDeliveryPrice(deliveryPriceMap.get(spuDO.getDeliveryTemplateId()) / count.intValue());
 
                         // 订单项实付rmb = 订单项实付rmb + 运费金额