切换 test 提交

src/main/java/com/ydtech/modules/order/entity/po/InsOrdersCarInfo.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ydtech.constants.enums.dict.insurance.EnergyType;
 import com.ydtech.modules.ins.model.vo.CarInfoVo;
+import com.ydtech.modules.order.entity.InsAreaCompanyCarInfo;
 import com.ydtech.utils.idgen.IdGenerate;
 import lombok.Data;
 import org.springframework.beans.BeanUtils;
@@ -416,4 +417,10 @@ public class InsOrdersCarInfo implements Serializable {
         BeanUtils.copyProperties(this,carInfoVo);
         return carInfoVo;
     }
+
+    public InsAreaCompanyCarInfo toInsAreaCompanyCarInfo(){
+        InsAreaCompanyCarInfo insAreaCompanyCarInfo = new InsAreaCompanyCarInfo();
+        BeanUtils.copyProperties(this,insAreaCompanyCarInfo);
+        return insAreaCompanyCarInfo;
+    }
 }

src/main/java/com/ydtech/modules/order/entity/po/InsOrdersCarUserInfo.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ydtech.modules.ins.model.vo.CarInfoVo;
 import com.ydtech.modules.ins.model.vo.CustomerInfoVo;
+import com.ydtech.modules.order.entity.InsAreaCompanyCarUserInfo;
 import com.ydtech.utils.idgen.IdGenerate;
 import lombok.Data;
 import org.springframework.beans.BeanUtils;
@@ -128,4 +129,10 @@ public class InsOrdersCarUserInfo implements Serializable {
         BeanUtils.copyProperties(this,customerInfoVo);
         return customerInfoVo;
     }
+
+    public InsAreaCompanyCarUserInfo toInsAreaCompanyCarUserInfo(){
+        InsAreaCompanyCarUserInfo insAreaCompanyCarUserInfo = new InsAreaCompanyCarUserInfo();
+        BeanUtils.copyProperties(this,insAreaCompanyCarUserInfo);
+        return insAreaCompanyCarUserInfo;
+    }
 }

src/main/java/com/ydtech/modules/order/service/InsAreaCompanyRiskService.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.ydtech.modules.order.entity.InsAreaCompanyCarUserInfo;
 import com.ydtech.modules.order.entity.InsAreaCompanyRisk;
 
+import java.util.List;
+
 /**
  * 子订单车辆信息(InsAreaCompanyCarInfo)表服务接口
  *
@@ -13,6 +15,6 @@ import com.ydtech.modules.order.entity.InsAreaCompanyRisk;
  */
 public interface InsAreaCompanyRiskService extends IService<InsAreaCompanyRisk> {
 
-    boolean saveRisks(String companyId, JSONArray risks);
+    boolean saveRisks(String companyId, List<InsAreaCompanyRisk> risks);
 
 }

src/main/java/com/ydtech/modules/order/service/impl/InsAreaCompanyRiskServiceImpl.java

@@ -23,13 +23,12 @@ import java.util.List;
 public class InsAreaCompanyRiskServiceImpl extends ServiceImpl<InsAreaCompanyRiskMapper, InsAreaCompanyRisk> implements InsAreaCompanyRiskService {
 
     @Override
-    public boolean saveRisks(String companyId,JSONArray risks) {
-        List<InsAreaCompanyRisk> riskList = JSONArray.parseArray(risks.toJSONString(), InsAreaCompanyRisk.class);
-        riskList.forEach(risk -> {
+    public boolean saveRisks(String companyId,List<InsAreaCompanyRisk> risks) {
+        risks.forEach(risk -> {
             risk.setCompanyId(companyId);
             risk.setId(IdGenerate.nextId());
         });
-        this.saveBatch(riskList);
+        this.saveBatch(risks);
         return true;
     }
 }

src/main/java/com/ydtech/modules/order/service/impl/InsAreaCompanyServiceImpl.java

@@ -14,10 +14,7 @@ import com.ydtech.modules.order.entity.dto.InsAreaCompanyQueryDto;
 import com.ydtech.modules.order.entity.po.InsOrdersCarInfo;
 import com.ydtech.modules.order.entity.po.InsOrdersCarUserInfo;
 import com.ydtech.modules.order.entity.vo.OrderQueryVo;
-import com.ydtech.modules.order.service.InsAreaCompanyCarInfoService;
-import com.ydtech.modules.order.service.InsAreaCompanyService;
-import com.ydtech.modules.order.service.InsOrdersService;
-import com.ydtech.modules.order.service.InsOrdersTrackService;
+import com.ydtech.modules.order.service.*;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
@@ -25,6 +22,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -43,6 +41,15 @@ public class InsAreaCompanyServiceImpl extends ServiceImpl<InsAreaCompanyMapper,
     @Autowired
     private InsAreaCompanyCarInfoService insAreaCompanyCarInfoService;
 
+    @Autowired
+    private InsAreaCompanyCarUserInfoService insAreaCompanyCarUserInfoService;
+
+    @Autowired
+    private InsAreaCompanyRiskService insAreaCompanyRiskService;
+
+    @Autowired
+    private InsAreaCompanyKindService insAreaCompanyKindService;
+
     public InsAreaCompanyServiceImpl(@Lazy InsOrdersService insOrdersService, InsOrdersTrackService insOrdersTrackService) {
         this.insOrdersService = insOrdersService;
         this.insOrdersTrackService = insOrdersTrackService;
@@ -93,8 +100,29 @@ public class InsAreaCompanyServiceImpl extends ServiceImpl<InsAreaCompanyMapper,
     }
 
     @Override
+    @Transactional
     public void insertCompanyAndOrders(InsAreaCompany insAreaCompany) {
+        InsOrdersBo insOrdersBo = insOrdersService.queryInsOrders(insAreaCompany.getOrderno());
+        //插入主表信息
         baseMapper.insert(insAreaCompany);
+
+        //车辆信息
+        InsAreaCompanyCarInfo insAreaCompanyCarInfo = insOrdersBo.getCarinfo().toInsAreaCompanyCarInfo();
+        insAreaCompanyCarInfoService.save(insAreaCompanyCarInfo);
+
+        //人员信息
+        List<InsAreaCompanyCarUserInfo> insAreaCompanyCarUserInfos = new ArrayList<>();
+        InsAreaCompanyCarUserInfo ownerInfo = insOrdersBo.getOwnerinfo().toInsAreaCompanyCarUserInfo();
+        InsAreaCompanyCarUserInfo applyInfo = insOrdersBo.getApplyinfo().toInsAreaCompanyCarUserInfo();
+        InsAreaCompanyCarUserInfo insureInfo = insOrdersBo.getInsureinfo().toInsAreaCompanyCarUserInfo();
+        insAreaCompanyCarUserInfos.add(ownerInfo);
+        insAreaCompanyCarUserInfos.add(applyInfo);
+        insAreaCompanyCarUserInfos.add(insureInfo);
+        insAreaCompanyCarUserInfoService.saveBatch(insAreaCompanyCarUserInfos);
+
+        //risk
+        insAreaCompanyRiskService.saveRisks(insAreaCompany.getCompanyId(), insAreaCompany.getRisk());
+
         insOrdersTrackService.addingTrajectories(insAreaCompany);
         insOrdersService.updateByOrderStatus(insAreaCompany);
     }