修改需求

src/main/java/com/travel/controller/ConfirmOrderingController.java

@@ -84,7 +84,7 @@ public class ConfirmOrderingController {
             List<Release> list1 = privateOrderService.getPrivateTypeVal(privateOrder1);
             for(Release release1 : list1){
                 //判断不是当前报价单的供应商返回次数
-                if(!release1.getCode().equals(confirmOrdering.getSupplierCode()) && !release1.getCode().equals("0000000000")){
+                if(!release1.getCode().equals(confirmOrdering.getSupplierCode())){
                     privateOrderService.updateSupplierOffer(release1);
                 }
             }

src/main/java/com/travel/controller/PersonalController.java

@@ -32,7 +32,11 @@ public class PersonalController {
     private static final Random RANDOM = new SecureRandom();
 
     @Autowired
-    private LoginService  loginService;
+    private LoginService loginService;
+
+    //私人订制
+    @Autowired
+    private PrivateOrderService privateOrderService;
 
     /**
      * 登录判断
@@ -393,4 +397,20 @@ public class PersonalController {
         }
         return letter + id;
     }
+
+    @GetMapping("test")
+    public void test(){
+        try{
+            //查询有多少个付过费且到达开始时间的定制单
+            List<PrivateOrder> list = privateOrderService.updatePrivateThree();
+            //循环修改
+            for(PrivateOrder privateOrder : list){
+                PrivateOrder privateOrder1 = new PrivateOrder().setUuid(privateOrder.getUuid()).setSupplieName(privateOrder.getSupplieName());
+                privateOrder1.setOrderType(3);
+                privateOrderService.updatePrivateType(privateOrder1);
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
 }

src/main/java/com/travel/service/impl/PrivateOrderServiceImpl.java

@@ -145,13 +145,15 @@ public class PrivateOrderServiceImpl implements PrivateOrderService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void updateSupplierOffer(Release release1) {
-        Supplier supplier = supplierMapper.getSuppierPhone(release1.getCode());
-        //如果操作人不是父级账号 则改变成父级账号操作
-        if(!supplier.getAccountAssociated().equals("0")){
-            release1.setCode(supplier.getAccountAssociated());
+        if(!release1.getCode().equals("0000000000")){
+            Supplier supplier = supplierMapper.getSuppierPhone(release1.getCode());
+            //如果操作人不是父级账号 则改变成父级账号操作
+            if(!supplier.getAccountAssociated().equals("0")){
+                release1.setCode(supplier.getAccountAssociated());
+            }
+            privateOrderMapper.updateSupplierOffer(release1);
+            privateOrderMapper.updateSupplierOfferChild(release1);//子账号同步
         }
-        privateOrderMapper.updateSupplierOffer(release1);
-        privateOrderMapper.updateSupplierOfferChild(release1);//子账号同步
     }
 
     @Override

src/main/resources/config/mapping/ReleaseTravelMapper.xml

@@ -188,7 +188,7 @@
             LEFT JOIN ( SELECT COUNT ( * ) AS flag, travel_uuid FROM sys_travel_give WHERE code = #{code} GROUP BY travel_uuid ) c ON a.uuid = c.travel_uuid
             LEFT JOIN ( SELECT COUNT ( * ) AS commCount, travel_uuid FROM bus_travel_comments GROUP BY travel_uuid ) d ON a.uuid = d.travel_uuid
             LEFT JOIN (SELECT headpir,name,code from sys_users) f on f.code = a.code
-        where a.state_type = '1'
+        where a.state_type = '1' and demand_uuid is not null
         ORDER BY NEWID()
     </select>
     <!-- 查询游记详情 -->
@@ -306,9 +306,6 @@
                 select id
                 from bus_travel
                 <trim prefix="WHERE" prefixOverrides="and | or">
-                    <if test="stateType != null and stateType != ''">
-                        and state_type = #{stateType}
-                    </if>
                     <if test="demandUuid != null and demandUuid != ''">
                         and demand_uuid = #{demandUuid}
                     </if>
@@ -330,9 +327,6 @@
                 select id
                 FROM bus_supplier_route
                 <trim prefix="WHERE" prefixOverrides="and | or">
-                    <if test="stateType != null and stateType != ''">
-                        and state_type = #{stateType}
-                    </if>
                     <if test="demandUuid != null and demandUuid != ''">
                         and demand_uuid = #{demandUuid}
                     </if>
@@ -348,6 +342,7 @@
                     <if test="features != null and features != ''">
                         and features = #{features}
                     </if>
+                    and state_type = '1'
                 </trim>
             ) a
     </select>