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

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/AbstractOrderHandle.java

@@ -78,7 +78,7 @@ public abstract class AbstractOrderHandle<Biz extends BaseBiz, Detail extends Or
         detail.setOrderId(detail.getOrder().getId());
         detailBiz.insertSelective(detail);
         detail.getOrder().setDetailId(detail.getId());
-        baseOrderBiz.updateById(detail.getOrder());
+        baseOrderBiz.updateSelectiveById(detail.getOrder());
     }
 
 //    /**

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderTourService.java

@@ -113,11 +113,11 @@ public class OrderTourService extends AbstractOrderHandle<OrderTourDetailBiz, To
         bo.setStartCityName(sysRegion.getName());
 
         //设置verificationId 核销id
-        bo.setVerificationId(tourFeign.entityList(BeanUtil.beanToMap(new TourGoodVerification(){{
-            setSpeId(bo.getSpePriceId());
-            setGoodId(bo.getGoodId());
-            setSiteId(bo.getSiteId());
-        }})).getData().get(0).getId());
+//        bo.setVerificationId(tourFeign.entityList(BeanUtil.beanToMap(new TourGoodVerification(){{
+//            setSpeId(bo.getSpePriceId());
+//            setGoodId(bo.getGoodId());
+//            setSiteId(bo.getSiteId());
+//        }})).getData().get(0).getId());
 
         //扣減庫存
         tourFeign.stock(bo.getSpePriceId(), bo.getTotalNumber());