Merge branch 'master-chw' into dev-chw

# Conflicts:
#	xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehiclePublishMapper.xml

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java

@@ -547,7 +547,17 @@ public class BaseOrderController extends CommonBaseController implements UserRes
     @RequestMapping(value = "/updateBaseOrder", method = RequestMethod.POST)
     @ResponseBody
     public ObjectRestResponse updateBaseOrder(@RequestBody BaseOrder baseOrder) {
-         baseOrderBiz.updateSelectiveById(baseOrder);
+        String no = baseOrder.getNo();
+        if (StringUtils.isNotBlank(no)){
+            BaseOrder baseOrder1 = new BaseOrder();
+            baseOrder1.setNo(no);
+            baseOrder1 = baseOrderBiz.selectOne(baseOrder1);
+            if (baseOrder1 != null ){
+                baseOrder.setId(baseOrder1.getId());
+                baseOrder.setVersion(baseOrder1.getVersion());
+            }
+        }
+        baseOrderBiz.updateSelectiveById(baseOrder);
          return  ObjectRestResponse.succ();
     }
 }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehiclePublishReceiveBiz.java

@@ -10,6 +10,7 @@ import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import com.xxfc.platform.order.contant.enumerate.OrderStatusEnum;
 import com.xxfc.platform.order.entity.BaseOrder;
 import com.xxfc.platform.order.feign.OrderFeign;
 import com.xxfc.platform.order.pojo.dto.ReceiveRefundDTO;
@@ -33,6 +34,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.beans.Transient;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -636,6 +638,43 @@ public class VehiclePublishReceiveBiz extends BaseBiz<VehiclePublishReceiveMappe
     }
 
 
+    @Transient
+    public  void   endPublish(Integer publishId){
+        VehiclePublish vehiclePublish = vehiclePublishBiz.selectById(publishId);
+        if (vehiclePublish == null )
+            throw  new BaseException("需求不存在--id==="+publishId, ResultCode.FAILED_CODE);
+        VehiclePublishGoods publishGoods = new VehiclePublishGoods();
+        publishGoods.setPublishId(publishId);
+        List<VehiclePublishGoods> publishGoodsList = publishGoodsBiz.selectList(publishGoods);
+        if (publishGoodsList == null || publishGoodsList.size() == 0 )
+            throw  new BaseException("子需求不存在", ResultCode.FAILED_CODE);
+        List<Integer> publishGoodsIds = publishGoodsList.stream().map(VehiclePublishGoods::getId).distinct().collect(Collectors.toList());
+        List<VehiclePublishReceive> list = mapper.getListByPublishGoodsIds(publishGoodsIds);
+        List<String> receiveOrderNos = null;
+        if (list.size() >  0){
+            List<VehiclePublishReceive> payList = list.stream().filter(x -> x.getStatus() == 1).collect(Collectors.toList());
+            if (payList != null && payList.size() > 0)
+                throw  new BaseException("存在待确认无法取消", ResultCode.FAILED_CODE);
+            receiveOrderNos = list.stream().filter(x -> x.getStatus() == 0).map(VehiclePublishReceive::getReceiveOrderNo).distinct().collect(Collectors.toList());
+        }
+        vehiclePublish.setStatus(3);
+        vehiclePublishBiz.updateSelectiveById(vehiclePublish);
+        if (receiveOrderNos != null && receiveOrderNos.size() > 0){
+            for (String receiveOrderNo : receiveOrderNos){
+                mapper.updStatusByOrderNo(receiveOrderNo);
+                BaseOrder baseOrder = new BaseOrder();
+                baseOrder.setNo(receiveOrderNo);
+                baseOrder.setStatus(OrderStatusEnum.ORDER_CANCEL.getCode());
+                orderFeign.updateBaseOrder(baseOrder);
+            }
+
+        }
+
+
+
+    }
+
+
 
 
 }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/VehiclePublishReceiveMapper.java

@@ -9,6 +9,7 @@ import com.xxfc.platform.vehicle.pojo.vo.VehiclePublishGoodsVo;
 import com.xxfc.platform.vehicle.pojo.vo.VehiclePublishReceiveVo;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
 import tk.mybatis.mapper.additional.idlist.SelectByIdListMapper;
 import tk.mybatis.mapper.common.Mapper;
 
@@ -38,4 +39,9 @@ public interface VehiclePublishReceiveMapper extends Mapper<VehiclePublishReceiv
     @Select("SELECT * FROM vehicle_publish_receive WHERE publish_goods_id =#{pubilishId} and `status` in (1,3,5,6) ORDER BY id DESC LIMIT 1")
     VehiclePublishReceive getReceivByPubilishId(@Param("pubilishId")Integer pubilishId);
 
+    List<VehiclePublishReceive>  getListByPublishGoodsIds(@Param("publishGoodsIds")List<Integer> publishGoodsIds);
+
+    @Update("update vehicle_publish_receive set status = 4 where receive_order_no = #{orderNo}")
+    void updStatusByOrderNo(@Param("orderNo")String orderNo);
+
 }
\ No newline at end of file

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/AppVehiclePublishController.java

@@ -58,6 +58,7 @@ public class AppVehiclePublishController extends BaseController<VehiclePublishBi
     @IgnoreUserToken
     public  ObjectRestResponse selectList(VehiclePublishFindDTO publishFindDTO) {
         publishFindDTO.setSelectType(1);
+        publishFindDTO.setNowTime(System.currentTimeMillis());
         return  ObjectRestResponse.succ(baseBiz.selectList(publishFindDTO));
     }
 
@@ -120,4 +121,7 @@ public class AppVehiclePublishController extends BaseController<VehiclePublishBi
 
 
 
+
+
+
 }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/AppVehiclePublishReceiveController.java

@@ -108,6 +108,14 @@ public class AppVehiclePublishReceiveController extends BaseController<VehiclePu
     }
 
 
+    @PostMapping("endPublish")
+    @ApiModelProperty("结束调车")
+    public  ObjectRestResponse endPublish(@RequestBody VehiclePublishReceiveDTO publishReceiveDTO){
+        baseBiz.endPublish(publishReceiveDTO.getPublishId());
+        return ObjectRestResponse.succ();
+    }
+
+
 
 
 

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehiclePublishMapper.xml

@@ -24,7 +24,7 @@
                 AND  p.`status`= #{status}
             </if>
             <if test="nowTime != null  and nowTime > 0">
-                AND  p.`publish_end_time` >= #{nowTime} AND  p.number > (p.confirm_number+p.wait_confirm_number)
+                AND  p.`publish_end_time` >= #{nowTime} AND  p.number > (p.confirm_number+p.wait_confirm_number) and p.status in (0)
             </if>
             <if test="dataCompanyIds != null and dataCompanyIds.size > 0">
                 and p.id in

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehiclePublishReceiveMapper.xml

@@ -159,4 +159,16 @@
         ORDER BY goodsNumber DESC
     </select>
 
+    <select id="getListByPublishGoodsIds"  resultType="com.xxfc.platform.vehicle.entity.VehiclePublishReceive">
+        SELECT *  FROM vehicle_publish_receive
+        <where>
+            <if test="publishGoodsIds != null and publishGoodsIds.size > 0">
+                and  publish_goods_id  in
+                <foreach collection="publishGoodsIds" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
+        </where>
+    </select>
+
 </mapper>
\ No newline at end of file