1

ydd_mer_java/crmeb-front/src/main/java/com/zbkj/front/service/impl/FrontOrderServiceImpl.java

@@ -223,13 +223,14 @@ public class FrontOrderServiceImpl implements FrontOrderService {
             if (ObjectUtil.isNotNull(userAddress)) {
                 // 计算运费
                 getFreightFee_V_1_8(preOrderInfoVo, userAddress, user.getIsPaidMember());
-                getPackingFee(preOrderInfoVo);
                 preOrderInfoVo.setAddressId(userAddress.getId());
             } else {
                 preOrderInfoVo.setFreightFee(BigDecimal.ZERO);
                 preOrderInfoVo.setPickingFee(BigDecimal.ZERO);
                 preOrderInfoVo.setAddressId(0);
             }
+            //计算打包费
+            getPackingFee(preOrderInfoVo);
         }
         // 实际支付金额
         preOrderInfoVo.setSvipDiscountPrice(BigDecimal.ZERO);