13

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/contant/enumerate/OrderStatusEnum.java

@@ -9,6 +9,8 @@ public enum OrderStatusEnum {
     ORDER_CANCEL(2, "取消订单"),
     ORDER_UNPAY(3, "待支付"),
     ORDER_TOSTART(4, "待进行（待出行）"),
+    ORDER_WAIT(5, "出行中（进行中）"),
+    ORDER_FINISH(6, "已完成"),
     ;
     /**
      * 编码

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/OrderTourVerificationVO.java

+package com.xxfc.platform.order.pojo.order;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import javax.persistence.Column;
+import java.math.BigDecimal;
+
+@Data
+public class OrderTourVerificationVO {
+
+    //基础订单id
+    @ApiModelProperty(value = "基础订单id")
+    private Integer orderId;
+
+    //订单号
+    @ApiModelProperty(value = "订单号")
+    private String no;
+
+    //订单类型 1--租车；2--旅游
+    @ApiModelProperty(value = "订单类型 1--租车；2--旅游")
+    private Integer type;
+
+    //订单状态
+    @ApiModelProperty(value = "订单状态\n" +
+            "0--删除\n" +
+            "1--创建订单\n" +
+            "2--取消\n" +
+            "3--待付款\n" +
+            "4--待出行\n" +
+            "5--出行中（进行中）\n" +
+            "6--已完成")
+    private Integer status;
+
+    //实际价格
+    @ApiModelProperty(value = "实际价格")
+    private BigDecimal realAmount;
+
+    //联系人
+    @ApiModelProperty(value = "联系人")
+    private String contactMan;
+
+
+    //联系电话
+    @ApiModelProperty(value = "联系电话")
+    private String contactPhone;
+
+    //总人数
+    @ApiModelProperty(value = "总人数")
+    private Integer totalNumber;
+
+    //成人人数
+    @ApiModelProperty(value = "成人人数")
+    private Integer adultNum;
+
+    //儿童人数
+    @ApiModelProperty(value = "儿童人数")
+    private Integer childNum;
+
+
+
+}

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderTourVerificationBiz.java

+package com.xxfc.platform.order.biz;
+
+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.mapper.OrderTourVerificationMapper;
+import com.xxfc.platform.order.pojo.order.OrderTourVerificationVO;
+import com.xxfc.platform.tour.feign.TourFeign;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 旅游订单核销
+ *
+ * @author zjw
+ * @email nishijjo@qq.com
+ * @date 2019-06-06 18:18:33
+ */
+@Service
+public class OrderTourVerificationBiz{
+
+
+    @Autowired
+    private OrderTourVerificationMapper verificationMapper;
+    @Autowired
+    private BaseOrderBiz baseOrderBiz;
+    @Autowired
+    private TourFeign tourFeign;
+
+    /**
+     * 分页查询旅游订单核销列表
+     * @param page
+     * @param limit
+     * @return
+     */
+    public PageDataVO<OrderTourVerificationVO> getVerificationList(Integer page, Integer limit,Integer verificationId){
+
+        return  PageDataVO.pageInfo(page,limit,()->verificationMapper.pageByParm(verificationId));
+    }
+
+    //核销
+    public ObjectRestResponse VerificationByOrder(Integer orderId){
+        BaseOrder baseOrder=baseOrderBiz.selectById(orderId);
+        if(baseOrder==null){
+            return ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE, "订单不存在");
+        }
+        if(baseOrder.getStatus()!=OrderStatusEnum.ORDER_TOSTART.getCode()){
+            return ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE, "订单不是已支付状态");
+        }
+        baseOrder=new BaseOrder();
+        baseOrder.setId(orderId);
+        baseOrder.setStatus(OrderStatusEnum.ORDER_FINISH.getCode());
+        baseOrderBiz.updateSelectiveById(baseOrder);
+         return  ObjectRestResponse.succ();
+    }
+
+    //确定上车
+    public ObjectRestResponse finishByOrder(Integer verificationId){
+
+        return  ObjectRestResponse.succ();
+    }
+
+    //确定上车
+    public ObjectRestResponse finishByOrders(Integer verificationId){
+
+        return  ObjectRestResponse.succ();
+    }
+
+
+
+
+
+}
\ No newline at end of file

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/OrderTourVerificationMapper.java

+package com.xxfc.platform.order.mapper;
+
+
+import com.xxfc.platform.order.pojo.order.OrderTourVerificationVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 旅游订单详情
+ * 
+ * @author zjw
+ * @email nishijjo@qq.com
+ * @date 2019-06-06 18:18:33
+ */
+public interface OrderTourVerificationMapper  {
+
+    public List<OrderTourVerificationVO> pageByParm(@Param("verificationId")Integer verificationId);
+	
+}

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

+package com.xxfc.platform.order.rest;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.github.wxiaoqi.security.admin.feign.UserFeign;
+import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
+import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.github.wxiaoqi.security.common.rest.CommonBaseController;
+import com.xxfc.platform.order.biz.OrderTourDetailBiz;
+import com.xxfc.platform.order.biz.OrderTourVerificationBiz;
+import com.xxfc.platform.order.entity.BaseOrder;
+import com.xxfc.platform.order.entity.OrderTourDetail;
+import com.xxfc.platform.order.pojo.AddTourDTO;
+import com.xxfc.platform.order.pojo.order.TourBO;
+import com.xxfc.platform.order.pojo.price.TourPriceVO;
+import com.xxfc.platform.order.service.OrderTourService;
+import com.xxfc.platform.tour.feign.TourFeign;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("tour")
+@IgnoreClientToken
+@Api(value="旅游订单核销",tags={"旅游订单核销"})
+public class OrderTourVerificationController extends CommonBaseController {
+
+    @Autowired
+    OrderTourVerificationBiz verificationBiz;
+
+    @Autowired
+    TourFeign tourFeign;
+
+    @Autowired
+    protected UserAuthConfig userAuthConfig;
+
+    @Autowired
+    UserFeign userFeign;
+
+    public AppUserDTO getUserInfo(){
+        return  userFeign.userDetailByToken(userAuthConfig.getToken(request)).getData();
+    }
+
+    @RequestMapping(value = "/verification/orderlist",method = RequestMethod.GET)
+    @ApiOperation(value = "旅游核销订单列表")
+    public ObjectRestResponse orderlist(
+           @RequestParam(value = "page",defaultValue = "1") Integer page,
+           @RequestParam(value = "limit",defaultValue = "10") Integer limit,
+           @RequestParam(value = "verificationId",defaultValue = "0") Integer verificationId
+    ){
+        return ObjectRestResponse.succ(verificationBiz.getVerificationList(page,limit,verificationId));
+    }
+    @RequestMapping(value = "/verification/check",method = RequestMethod.POST)
+    @ApiOperation(value = "旅游核销")
+    public ObjectRestResponse<BaseOrder> check(
+            @RequestParam(value = "orderId",defaultValue = "0") Integer orderId
+    ){
+        return verificationBiz.VerificationByOrder(orderId);
+    }
+
+    @RequestMapping(value = "/verification/finish",method = RequestMethod.POST)
+    @ApiOperation(value = "确定发车")
+    public ObjectRestResponse<BaseOrder> finishOrder(
+            @RequestParam(value = "verificationId",defaultValue = "0") Integer verificationId
+    ){
+        return verificationBiz.finishByOrder(verificationId);
+    }
+
+    @RequestMapping(value = "/verification/list",method = RequestMethod.GET)
+    @ApiOperation(value = "旅游核销订单列表")
+    public ObjectRestResponse list(
+            @RequestParam(value = "page",defaultValue = "1") Integer page,
+            @RequestParam(value = "limit",defaultValue = "10") Integer limit,
+            @RequestParam(value = "verificationId",defaultValue = "0") Integer verificationId
+    ){
+        return ObjectRestResponse.succ(verificationBiz.getVerificationList(page,limit,verificationId));
+    }
+
+
+
+
+
+}
\ No newline at end of file

xx-order/xx-order-server/src/main/resources/mapper/OrderTourVerificationMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.xxfc.platform.order.mapper.OrderTourVerificationMapper">
+
+
+    <!--获取旅游核销列表-->
+    <select id="pageByParm" resultType="com.xxfc.platform.order.pojo.order.OrderTourVerificationVO">
+      SELECT o.no,o.real_amount as realAmount,o.`status`,o.type,d.contact_man as contactMan,d.contact_phone as contactPhone,
+        d.total_number as totalNumber,d.adult_num as adultNum,d.child_num as childNum
+        FROM base_order o LEFT JOIN
+        order_tour_detail d ON o.id=d.order_id
+        WHERE o.`type`=2 and o.`status`>2 and d.verification_id=#{verificationId}
+        ORDER BY  o.status
+    </select>
+</mapper>
\ No newline at end of file

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/rest/TourGoodVerificationController.java

+package com.xxfc.platform.tour.rest;
+
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.xxfc.platform.tour.biz.TourGoodVerificationBiz;
+import com.xxfc.platform.tour.entity.TourGoodVerification;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("tour")
+@IgnoreClientToken
+public class TourGoodVerificationController extends BaseController<TourGoodVerificationBiz, TourGoodVerification> {
+
+
+
+
+
+
+
+
+
+
+}
\ No newline at end of file