submit

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/service/impl/GoodsServiceImpl.java

@@ -1239,6 +1239,22 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
                     }else {
                         supply.setSupplyId(null);
                         supply.setTenantId(newTenantId);
+                        //服务类型ID
+                        if (ObjectUtil.isNotNull(supply.getServerId())){
+                            PayServe payServe = iPayServeService.getById(supply.getServerId());
+                            if (ObjectUtils.isNotNull(payServe)){
+                                PayServe newPayServer = iPayServeService.getPayServeByTenant(payServe.getServeName(),newTenantId);
+                                if (ObjectUtils.isNotNull(newPayServer)){
+                                    supply.setServerId(newPayServer.getServeId());
+                                }else {
+                                    //新增服务
+                                    payServe.setServeId(null);
+                                    payServe.setTenantId(newTenantId);
+                                    iPayServeService.save(payServe);
+                                    supply.setServerId(newPayServer.getServeId());
+                                }
+                            }
+                        }
                         iPaySupplyService.save(supply);
                         goods.setSupplyId(supply.getSupplyId());
                     }
@@ -1273,6 +1289,33 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
                     }else {
                         business.setId(null);
                         business.setTenantId(newTenantId);
+                        //项目ID
+                        if (ObjectUtils.isNotNull(business.getProjectId())){
+                            CourseProjectType projectType = iCourseProjectTypeService.getById(business.getProjectId());
+                            if (ObjectUtil.isNotNull(projectType)){
+                                CourseProjectType newProject = iCourseProjectTypeService.getProjectByTenant(projectType.getEncoder(), newTenantId);
+                                if (ObjectUtil.isNotNull(newProject)){
+                                    business.setProjectId(newProject.getId().intValue());
+                                }else {
+                                    //新增项目
+                                    //判断项目的教育类型是否存在
+                                    CourseEducationType educationType = iCourseEducationTypeService.getById(projectType.getEducationId());
+                                    CourseEducationType newEducationType = iCourseEducationTypeService.getEducationTypeBytenant(educationType.getEncoder(), newTenantId);
+                                    if (ObjectUtil.isNotNull(newEducationType)){
+                                        projectType.setEducationId(newEducationType.getId().intValue());
+                                    }else {
+                                        educationType.setId(null);
+                                        educationType.setTenantId(newTenantId);
+                                        iCourseEducationTypeService.save(educationType);
+                                        projectType.setEducationId(educationType.getId().intValue());
+                                    }
+                                    projectType.setId(null);
+                                    projectType.setTenantId(newTenantId);
+                                    iCourseProjectTypeService.save(projectType);
+                                    business.setProjectId(projectType.getId().intValue());
+                                }
+                            }
+                        }
                         iCourseBusinessService.save(business);
                         goods.setBusinessId(business.getId());
                     }
@@ -1322,6 +1365,17 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
                     }else {
                         project.setId(null);
                         project.setTenantId(newTenantId);
+                        //判断项目的教育类型是否存在
+                        CourseEducationType educationType = iCourseEducationTypeService.getById(project.getEducationId());
+                        CourseEducationType newEducationType = iCourseEducationTypeService.getEducationTypeBytenant(educationType.getEncoder(), newTenantId);
+                        if (ObjectUtil.isNotNull(newEducationType)){
+                            project.setEducationId(newEducationType.getId().intValue());
+                        }else {
+                            educationType.setId(null);
+                            educationType.setTenantId(newTenantId);
+                            iCourseEducationTypeService.save(educationType);
+                            project.setEducationId(educationType.getId().intValue());
+                        }
                         iCourseProjectTypeService.save(project);
                         goods.setProjectId(project.getId().intValue());
                     }
@@ -1343,6 +1397,8 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
                     }
                 }
             }
+
+
         }
         return false;
     }

zhongzheng-system/src/main/java/com/zhongzheng/modules/pay/mapper/PayServeMapper.java

@@ -1,7 +1,9 @@
 package com.zhongzheng.modules.pay.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.zhongzheng.modules.pay.domain.PayServe;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 服务模式Mapper接口
@@ -11,4 +13,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface PayServeMapper extends BaseMapper<PayServe> {
 
+    @InterceptorIgnore(tenantLine = "true")
+    PayServe getPayServeByTenant(@Param("serveName") String serveName,@Param("newTenantId") Long newTenantId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/pay/service/IPayServeService.java

@@ -49,4 +49,6 @@ public interface IPayServeService extends IService<PayServe> {
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    PayServe getPayServeByTenant(String serveName, Long newTenantId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/pay/service/impl/PayServeServiceImpl.java

@@ -129,4 +129,9 @@ public class PayServeServiceImpl extends ServiceImpl<PayServeMapper, PayServe> i
         }
         return this.removeByIds(ids);
     }
+
+    @Override
+    public PayServe getPayServeByTenant(String serveName, Long newTenantId) {
+        return baseMapper.getPayServeByTenant(serveName,newTenantId);
+    }
 }

zhongzheng-system/src/main/resources/mapper/modules/pay/PayServeMapper.xml

@@ -13,5 +13,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remark" column="remark"/>
     </resultMap>
 
+    <select id="getPayServeByTenant" parameterType="map" resultType="com.zhongzheng.modules.pay.domain.PayServe">
+        select * from pay_serve where serve_name = #{serveName} and tenant_id = #{newTenantId}
+    </select>
 
 </mapper>