更改

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -5483,10 +5483,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         String mobile = appOrderDetailsVo.getPhone();
         //车辆交付地点
         //根据存放地点查询
-        ScmWarehouseVo scmWarehouseVo = scmWarehouseFeign.fetchBySid(priceInfo.getPlannedPickUpLocationKey()).getData();
         String finalAddress = "";
-        if (scmWarehouseVo != null) {
-            finalAddress = scmWarehouseVo.getWarehouseAttribute();
+        if (StringUtils.isNotBlank(priceInfo.getPlannedPickUpLocationKey())){
+            ScmWarehouseVo scmWarehouseVo = scmWarehouseFeign.fetchBySid(priceInfo.getPlannedPickUpLocationKey()).getData();
+            if (scmWarehouseVo != null) {
+                finalAddress = scmWarehouseVo.getWarehouseAttribute();
+            }
         }
         String depositTotal = depositInfo.getDepositTotal();
         //查询台数
@@ -5548,8 +5550,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         commonContract.setCustomerTypeKey(appOrderDetailsVo.getCustomerKey());
 
         if (StringUtils.isBlank(busSalesOrder.getContractNo())) {
-            commonContractFeign.saveContract(commonContract);
             baseMapper.updateContractNoBySid(commonContract.getContractNo(), sid);
+            commonContractFeign.saveContract(commonContract);
         } else {
             commonContract.setContractNo(busSalesOrder.getContractNo());
         }

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaappendix/OaAppendix.java

@@ -33,7 +33,7 @@ import lombok.Data;
 
 @Data
 @ApiModel(value = "售后服务附件表", description = "售后服务附件表")
-@TableName("as_appendix")
+@TableName("oa_appendix")
 public class OaAppendix extends BaseEntity {
     private static final long serialVersionUID = 1L;
 

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaappendix/OaAppendixMapper.java

@@ -34,6 +34,6 @@ import java.util.List;
 @Mapper
 public interface OaAppendixMapper extends BaseMapper<OaAppendix> {
 
-    @Select("select * from as_appendix where linkSid = #{linkSid}")
+    @Select("select * from oa_appendix where linkSid = #{linkSid}")
     List<OaAppendix> fetchByLinkSid(String linkSid);
 }