订单配送范围错误拦截

fs-service-system/src/main/java/com/fs/live/service/impl/LiveAfterSalesServiceImpl.java

@@ -543,6 +543,9 @@ public class LiveAfterSalesServiceImpl implements ILiveAfterSalesService {
         storeAfterSales.setOrderId(order.getOrderId());
         storeAfterSales.setStoreId(order.getStoreId());
         storeAfterSales.setDeptId(order.getDeptId());
+        if (param.getRefundAmount().compareTo(order.getPayMoney()) > 0) {
+            param.setRefundAmount(order.getPayMoney());
+        }
         storeAfterSales.setRefundAmount(param.getRefundAmount());
         storeAfterSales.setRefundType(param.getRefundType());
         storeAfterSales.setReasons(param.getReasons());

fs-service-system/src/main/java/com/fs/live/service/impl/LiveOrderServiceImpl.java

@@ -988,7 +988,7 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
                 order.setDeliveryType(null);
             }
 
-
+            order.setPayDelivery(order.getPayPostage());
             LiveOrderPayment liveOrderPayment = paymentMap.get(String.valueOf(order.getOrderId()));
             if (ObjectUtil.isNotNull(liveOrderPayment)) {
                 order.setBankTrxId(liveOrderPayment.getBankTransactionId());

fs-service-system/src/main/java/com/fs/store/service/impl/FsStoreOrderServiceImpl.java

@@ -3096,6 +3096,9 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
                 FsShippingTemplatesRegion shippingTemplatesRegion = shippingTemplatesRegionMap.get(tempId);
                 BigDecimal price = NumberUtil.round(NumberUtil.mul(storeCartVO.getCartNum(),
                         storeCartVO.getPrice()), 2);
+                if (shippingTemplatesRegion == null) {
+                    throw new CustomException("当前地址，【" + storeCartVO.getProductName() + "】商品不在快递配送范围！");
+                }
                 if (!templateDTOMap.containsKey(tempId)) {
                     TemplateDTO templateDTO = TemplateDTO.builder()
                             .number(num)