Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify

xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/entity/TourGoodVerification.java

@@ -50,14 +50,7 @@ public class TourGoodVerification implements Serializable {
     @ApiModelProperty(value = "出发路线id")
     private Integer siteId;
 
-    /**
-     * 出发时间
-     */
-    @Column(name = "depart_time")
-    @ApiModelProperty("出发时间")
-    private Long departTime;
-
-
+    
     /**
      * 总人数
      */

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/biz/TourGoodBiz.java

@@ -46,6 +46,8 @@ public class TourGoodBiz extends BaseBiz<TourGoodMapper, TourGood> {
     private TourGoodTagBiz tagBiz;
     @Autowired
     private TourGoodSpeBiz speBiz;
+    @Autowired
+    private TourGoodVerificationBiz verificationBiz;
 
     @Autowired
     private UserFeign userFeign;
@@ -141,6 +143,7 @@ public class TourGoodBiz extends BaseBiz<TourGoodMapper, TourGood> {
                         site.setGoodId(goodId);
                         if(siteId==null||siteId==0){
                             siteBiz.insertSelective(site);
+                            siteId=site.getId();
                         }else {
                             siteBiz.updateById(site);
                             siteIds.add(siteId);
@@ -210,9 +213,9 @@ public class TourGoodBiz extends BaseBiz<TourGoodMapper, TourGood> {
                         }
                         if(priceId==null||priceId==0){
                             speBiz.insertSelective(spePrice);
+                            priceId=spePrice.getId();
                         }else {
                             speBiz.updateById(spePrice);
-                            priceId=spePrice.getId();
                             priceIds.add(priceId);
                         }
                         prices.add(priceId);
@@ -221,7 +224,40 @@ public class TourGoodBiz extends BaseBiz<TourGoodMapper, TourGood> {
                         speBiz.delGoodSpe(null,priceIds);
                     }
                 }
+                if(sites.size()>0){
+                    List<Integer> vids=new ArrayList<>();
+                    List<TourGoodVerification> verifications=new ArrayList<>();
+                    for (Integer siteId:sites){
+                        if(prices.size()>0){
+                            for(Integer priceId:prices){
+                                TourGoodVerification verification=new TourGoodVerification();
+                                verification.setGoodId(goodId);
+                                verification.setSiteId(siteId);
+                                verification.setSpeId(priceId);
+                                verification.setIsDel(0);
+                                TourGoodVerification  verification1=verificationBiz.selectOne(verification);
+                                if(verification1==null){
+                                    verification.setTotalPerson(0);
+                                    verification.setVerificationPerson(0);
+                                    verification.setStatus(0);
+                                    verifications.add(verification);
+                                }else {
+                                    vids.add(verification1.getId());
+                                }
+
+                            }
+                        }
 
+                    }
+
+                    if(vids.size()>0){
+                        verificationBiz.delGoodVerification(vids);
+                    }
+                    if(verifications.size()>0){
+                        verificationBiz.addBathTourGoodVerification(verifications);
+                    }
+
+                }
                 List<TourGoodVerification> verifications=new ArrayList<>();
             }
         } catch (IllegalAccessException e) {

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/biz/TourGoodVerificationBiz.java

@@ -4,7 +4,6 @@ import org.springframework.stereotype.Service;
 import  com.xxfc.platform.tour.entity.TourGoodVerification;
 import  com.xxfc.platform.tour.mapper.TourGoodVerificationMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
-
 import java.util.List;
 
 /**