切换 test 提交

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

@@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ydtech.modules.order.entity.InsAreaCompanyKing;
 
+import java.util.List;
+
 /**
  * 子订单车辆信息(InsAreaCompanyCarInfo)表服务接口
  *
@@ -12,6 +14,6 @@ import com.ydtech.modules.order.entity.InsAreaCompanyKing;
  */
 public interface InsAreaCompanyKindService extends IService<InsAreaCompanyKing> {
 
-    boolean saveKinds(String companyId, JSONArray kinds);
+    boolean saveKinds(String companyId, List<InsAreaCompanyKing> kinds);
 
 }

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

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

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

@@ -20,13 +20,12 @@ import java.util.List;
 public class InsAreaCompanyKindServiceImpl extends ServiceImpl<InsAreaCompanyKindMapper, InsAreaCompanyKing> implements InsAreaCompanyKindService {
 
     @Override
-    public boolean saveKinds(String companyId, JSONArray kinds) {
-        List<InsAreaCompanyKing> kindList = JSONArray.parseArray(kinds.toJSONString(), InsAreaCompanyKing.class);
-        kindList.forEach(kind -> {
+    public boolean saveKinds(String companyId, List<InsAreaCompanyKing> kinds) {
+        kinds.forEach(kind -> {
             kind.setCompanyId(companyId);
             kind.setId(IdGenerate.nextId());
         });
-        this.saveBatch(kindList);
+        this.saveBatch(kinds);
         return true;
     }
 }

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

@@ -50,6 +50,9 @@ public class InsAreaCompanyServiceImpl extends ServiceImpl<InsAreaCompanyMapper,
     @Autowired
     private InsAreaCompanyKindService insAreaCompanyKindService;
 
+    @Autowired
+    private InsAreaCompanyTaxArrearsService insAreaCompanyTaxArrearsService;
+
     public InsAreaCompanyServiceImpl(@Lazy InsOrdersService insOrdersService, InsOrdersTrackService insOrdersTrackService) {
         this.insOrdersService = insOrdersService;
         this.insOrdersTrackService = insOrdersTrackService;
@@ -108,6 +111,7 @@ public class InsAreaCompanyServiceImpl extends ServiceImpl<InsAreaCompanyMapper,
 
         //车辆信息
         InsAreaCompanyCarInfo insAreaCompanyCarInfo = insOrdersBo.getCarinfo().toInsAreaCompanyCarInfo();
+        insAreaCompanyCarInfo.setCompanyId(insAreaCompany.getCompanyId());
         insAreaCompanyCarInfoService.save(insAreaCompanyCarInfo);
 
         //人员信息
@@ -115,6 +119,9 @@ public class InsAreaCompanyServiceImpl extends ServiceImpl<InsAreaCompanyMapper,
         InsAreaCompanyCarUserInfo ownerInfo = insOrdersBo.getOwnerinfo().toInsAreaCompanyCarUserInfo();
         InsAreaCompanyCarUserInfo applyInfo = insOrdersBo.getApplyinfo().toInsAreaCompanyCarUserInfo();
         InsAreaCompanyCarUserInfo insureInfo = insOrdersBo.getInsureinfo().toInsAreaCompanyCarUserInfo();
+        ownerInfo.setCompanyId(insAreaCompany.getCompanyId());
+        applyInfo.setCompanyId(insAreaCompany.getCompanyId());
+        insureInfo.setCompanyId(insAreaCompany.getCompanyId());
         insAreaCompanyCarUserInfos.add(ownerInfo);
         insAreaCompanyCarUserInfos.add(applyInfo);
         insAreaCompanyCarUserInfos.add(insureInfo);
@@ -123,6 +130,14 @@ public class InsAreaCompanyServiceImpl extends ServiceImpl<InsAreaCompanyMapper,
         //risk
         insAreaCompanyRiskService.saveRisks(insAreaCompany.getCompanyId(), insAreaCompany.getRisk());
 
+        //king
+        insAreaCompanyKindService.saveKinds(insAreaCompany.getCompanyId(), insAreaCompany.getKing());
+
+        //tax
+        insAreaCompany.getTaxArrearsInfo().setCompanyId(insAreaCompany.getCompanyId());
+        insAreaCompanyTaxArrearsService.save(insAreaCompany.getTaxArrearsInfo());
+//        insAreaCompanyTaxArrearsService.saveTaxArrears(insAreaCompany.getCompanyId(), insAreaCompany.getTaxArrearsInfo());
+
         insOrdersTrackService.addingTrajectories(insAreaCompany);
         insOrdersService.updateByOrderStatus(insAreaCompany);
     }

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

@@ -23,13 +23,13 @@ import java.util.List;
 public class InsAreaCompanyTaxArrearsServiceImpl extends ServiceImpl<InsAreaCompanyTaxArrearsMapper, InsAreaCompanyTaxArrears> implements InsAreaCompanyTaxArrearsService {
 
     @Override
-    public boolean saveTaxArrears(String companyId, JSONArray taxArrears) {
-        List<InsAreaCompanyTaxArrears> insAreaCompanyTaxArrears = JSONArray.parseArray(taxArrears.toJSONString(), InsAreaCompanyTaxArrears.class);
-        insAreaCompanyTaxArrears.forEach(tax -> {
+    public boolean saveTaxArrears(String companyId, List<InsAreaCompanyTaxArrears> taxArrears) {
+//        List<InsAreaCompanyTaxArrears> insAreaCompanyTaxArrears = JSONArray.parseArray(taxArrears.toJSONString(), InsAreaCompanyTaxArrears.class);
+        taxArrears.forEach(tax -> {
             tax.setCompanyId(companyId);
             tax.setId(IdGenerate.nextId());
         });
-        this.saveBatch(insAreaCompanyTaxArrears);
+        this.saveBatch(taxArrears);
         return true;
     }
 }