user/role/tright 7.9

src/main/java/com/pangding/web/authority/controller/DataController.java

 package com.pangding.web.authority.controller;
 
 import com.pangding.web.authority.service.DataService;
-import com.pangding.web.authority.vo.reqvo.SaveDataReqVo;
 import com.pangding.web.authority.vo.resvo.FindResVo;
-import com.pangding.web.authority.vo.resvo.OrderResVo;
+import com.pangding.web.authority.vo.resvo.OrderStepOneResVo;
+import com.pangding.web.authority.vo.resvo.OrderStepThreeResVo;
 import com.yanzuoguang.util.vo.ResponseResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
@@ -28,9 +28,15 @@ public class DataController {
         return new ResponseResult();
     }
 
-    @PostMapping(value = "/saveOrderStepTwo",produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public ResponseResult saveOrderStepTwo(@RequestBody OrderResVo reqVo){
-        dataServiceImpl.saveOrderStepTwo(reqVo);
+    @PostMapping(value = "/saveOrderStepThree",produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public ResponseResult saveOrderStepThree(@RequestBody OrderStepThreeResVo reqVo){
+        dataServiceImpl.saveOrderStepThree(reqVo);
+        return new ResponseResult();
+    }
+
+    @PostMapping(value = "/saveOrderStepOne",produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public ResponseResult saveOrderStepOne(@RequestBody OrderStepOneResVo reqVo){
+        dataServiceImpl.saveOrderStepOne(reqVo);
         return new ResponseResult();
     }
 }

src/main/java/com/pangding/web/authority/service/DataService.java

 package com.pangding.web.authority.service;
 
 import com.pangding.web.authority.vo.resvo.FindResVo;
-import com.pangding.web.authority.vo.resvo.OrderResVo;
+import com.pangding.web.authority.vo.resvo.OrderStepOneResVo;
+import com.pangding.web.authority.vo.resvo.OrderStepThreeResVo;
 
 
 /**
@@ -11,5 +12,7 @@ import com.pangding.web.authority.vo.resvo.OrderResVo;
 public interface DataService {
     void save(FindResVo reqVo);
 
-    void saveOrderStepTwo(OrderResVo reqVo);
+    void saveOrderStepThree(OrderStepThreeResVo reqVo);
+
+    void saveOrderStepOne(OrderStepOneResVo reqVo);
 }

src/main/java/com/pangding/web/authority/service/impl/DataServiceImpl.java

 package com.pangding.web.authority.service.impl;
 
 import com.pangding.web.authority.dao.*;
-import com.pangding.web.authority.feign.DataFeign;
 import com.pangding.web.authority.service.DataService;
 import com.pangding.web.authority.util.CompanyConstant;
 import com.pangding.web.authority.util.RoleConstant;
 import com.pangding.web.authority.vo.*;
 import com.pangding.web.authority.vo.reqvo.*;
 import com.pangding.web.authority.vo.resvo.FindResVo;
-import com.pangding.web.authority.vo.resvo.OrderResVo;
-import com.yanzuoguang.util.exception.CodeException;
+import com.pangding.web.authority.vo.resvo.OrderStepOneResVo;
+import com.pangding.web.authority.vo.resvo.OrderStepThreeResVo;
 import com.yanzuoguang.util.helper.StringHelper;
-import com.yanzuoguang.util.vo.ResponseResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @Author zhangjinyao
@@ -184,7 +179,7 @@ public class DataServiceImpl implements DataService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void saveOrderStepTwo(OrderResVo reqVo) {
+    public void saveOrderStepThree(OrderStepThreeResVo reqVo) {
         TyyOrdersVo tyyOrdersVo = reqVo.getTyyOrdersVo();
         List<TyyOrderbackVo> tyyOrderbackVoList = reqVo.getTyyOrderbackVoList();
         TyyOrderdetailsVo tyyOrderdetailsVo = reqVo.getTyyOrderdetailsVo();
@@ -360,4 +355,9 @@ public class DataServiceImpl implements DataService {
         }
     }
 
+    @Override
+    public void saveOrderStepOne(OrderStepOneResVo reqVo) {
+
+    }
+
 }

src/main/java/com/pangding/web/authority/vo/TyyOrderMixVo.java

+package com.pangding.web.authority.vo;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/7/9 18:12
+ */
+public class TyyOrderMixVo {
+    private String ordersn;
+    private String consignee;
+    private String scenicspotname;
+    private String productsn;
+    private Integer buynum;
+    private Double price;
+    private Double total;
+    private String traveldate;
+    private String paytype;
+    private String paymenttime;
+    private String paystatus;
+    private Integer order_status;
+    private String piaostorderid;
+    private String memberid;
+    private String enterpriseid;
+    private String usertel;
+    private String ordertime;
+    private Double purchaseprice;
+    private Integer sub_order_type;
+    private String emancipated;
+    private String emancipated_date;
+    private String profit_checked;
+    private String profit_checked_date;
+    private String fxsid;
+    private String isdelete;
+    private Double realprice;
+    private Double discountprice;
+    private String sight_spot_code;
+    private String play_address;
+    private String play_time;
+    private String tongl_third_ordersn;
+    private String tongl_ordersn;
+    private String pid;
+    private Integer order_type;
+    private Integer return_num;
+    private Double return_money;
+    private String pay_type_id;
+    private Double order_poundage_price;
+    private String product_company_id;
+
+    public String getOrdersn() {
+        return ordersn;
+    }
+
+    public void setOrdersn(String ordersn) {
+        this.ordersn = ordersn;
+    }
+
+    public String getConsignee() {
+        return consignee;
+    }
+
+    public void setConsignee(String consignee) {
+        this.consignee = consignee;
+    }
+
+    public String getScenicspotname() {
+        return scenicspotname;
+    }
+
+    public void setScenicspotname(String scenicspotname) {
+        this.scenicspotname = scenicspotname;
+    }
+
+    public String getProductsn() {
+        return productsn;
+    }
+
+    public void setProductsn(String productsn) {
+        this.productsn = productsn;
+    }
+
+    public Integer getBuynum() {
+        return buynum;
+    }
+
+    public void setBuynum(Integer buynum) {
+        this.buynum = buynum;
+    }
+
+    public Double getPrice() {
+        return price;
+    }
+
+    public void setPrice(Double price) {
+        this.price = price;
+    }
+
+    public Double getTotal() {
+        return total;
+    }
+
+    public void setTotal(Double total) {
+        this.total = total;
+    }
+
+    public String getTraveldate() {
+        return traveldate;
+    }
+
+    public void setTraveldate(String traveldate) {
+        this.traveldate = traveldate;
+    }
+
+    public String getPaytype() {
+        return paytype;
+    }
+
+    public void setPaytype(String paytype) {
+        this.paytype = paytype;
+    }
+
+    public String getPaymenttime() {
+        return paymenttime;
+    }
+
+    public void setPaymenttime(String paymenttime) {
+        this.paymenttime = paymenttime;
+    }
+
+    public String getPaystatus() {
+        return paystatus;
+    }
+
+    public void setPaystatus(String paystatus) {
+        this.paystatus = paystatus;
+    }
+
+    public Integer getOrder_status() {
+        return order_status;
+    }
+
+    public void setOrder_status(Integer order_status) {
+        this.order_status = order_status;
+    }
+
+    public String getPiaostorderid() {
+        return piaostorderid;
+    }
+
+    public void setPiaostorderid(String piaostorderid) {
+        this.piaostorderid = piaostorderid;
+    }
+
+    public String getMemberid() {
+        return memberid;
+    }
+
+    public void setMemberid(String memberid) {
+        this.memberid = memberid;
+    }
+
+    public String getEnterpriseid() {
+        return enterpriseid;
+    }
+
+    public void setEnterpriseid(String enterpriseid) {
+        this.enterpriseid = enterpriseid;
+    }
+
+    public String getUsertel() {
+        return usertel;
+    }
+
+    public void setUsertel(String usertel) {
+        this.usertel = usertel;
+    }
+
+    public String getOrdertime() {
+        return ordertime;
+    }
+
+    public void setOrdertime(String ordertime) {
+        this.ordertime = ordertime;
+    }
+
+    public Double getPurchaseprice() {
+        return purchaseprice;
+    }
+
+    public void setPurchaseprice(Double purchaseprice) {
+        this.purchaseprice = purchaseprice;
+    }
+
+    public Integer getSub_order_type() {
+        return sub_order_type;
+    }
+
+    public void setSub_order_type(Integer sub_order_type) {
+        this.sub_order_type = sub_order_type;
+    }
+
+    public String getEmancipated() {
+        return emancipated;
+    }
+
+    public void setEmancipated(String emancipated) {
+        this.emancipated = emancipated;
+    }
+
+    public String getEmancipated_date() {
+        return emancipated_date;
+    }
+
+    public void setEmancipated_date(String emancipated_date) {
+        this.emancipated_date = emancipated_date;
+    }
+
+    public String getProfit_checked() {
+        return profit_checked;
+    }
+
+    public void setProfit_checked(String profit_checked) {
+        this.profit_checked = profit_checked;
+    }
+
+    public String getProfit_checked_date() {
+        return profit_checked_date;
+    }
+
+    public void setProfit_checked_date(String profit_checked_date) {
+        this.profit_checked_date = profit_checked_date;
+    }
+
+    public String getFxsid() {
+        return fxsid;
+    }
+
+    public void setFxsid(String fxsid) {
+        this.fxsid = fxsid;
+    }
+
+    public String getIsdelete() {
+        return isdelete;
+    }
+
+    public void setIsdelete(String isdelete) {
+        this.isdelete = isdelete;
+    }
+
+    public Double getRealprice() {
+        return realprice;
+    }
+
+    public void setRealprice(Double realprice) {
+        this.realprice = realprice;
+    }
+
+    public Double getDiscountprice() {
+        return discountprice;
+    }
+
+    public void setDiscountprice(Double discountprice) {
+        this.discountprice = discountprice;
+    }
+
+    public String getSight_spot_code() {
+        return sight_spot_code;
+    }
+
+    public void setSight_spot_code(String sight_spot_code) {
+        this.sight_spot_code = sight_spot_code;
+    }
+
+    public String getPlay_address() {
+        return play_address;
+    }
+
+    public void setPlay_address(String play_address) {
+        this.play_address = play_address;
+    }
+
+    public String getPlay_time() {
+        return play_time;
+    }
+
+    public void setPlay_time(String play_time) {
+        this.play_time = play_time;
+    }
+
+    public String getTongl_third_ordersn() {
+        return tongl_third_ordersn;
+    }
+
+    public void setTongl_third_ordersn(String tongl_third_ordersn) {
+        this.tongl_third_ordersn = tongl_third_ordersn;
+    }
+
+    public String getTongl_ordersn() {
+        return tongl_ordersn;
+    }
+
+    public void setTongl_ordersn(String tongl_ordersn) {
+        this.tongl_ordersn = tongl_ordersn;
+    }
+
+    public String getPid() {
+        return pid;
+    }
+
+    public void setPid(String pid) {
+        this.pid = pid;
+    }
+
+    public Integer getOrder_type() {
+        return order_type;
+    }
+
+    public void setOrder_type(Integer order_type) {
+        this.order_type = order_type;
+    }
+
+    public Integer getReturn_num() {
+        return return_num;
+    }
+
+    public void setReturn_num(Integer return_num) {
+        this.return_num = return_num;
+    }
+
+    public Double getReturn_money() {
+        return return_money;
+    }
+
+    public void setReturn_money(Double return_money) {
+        this.return_money = return_money;
+    }
+
+    public String getPay_type_id() {
+        return pay_type_id;
+    }
+
+    public void setPay_type_id(String pay_type_id) {
+        this.pay_type_id = pay_type_id;
+    }
+
+    public Double getOrder_poundage_price() {
+        return order_poundage_price;
+    }
+
+    public void setOrder_poundage_price(Double order_poundage_price) {
+        this.order_poundage_price = order_poundage_price;
+    }
+
+    public String getProduct_company_id() {
+        return product_company_id;
+    }
+
+    public void setProduct_company_id(String product_company_id) {
+        this.product_company_id = product_company_id;
+    }
+}

src/main/java/com/pangding/web/authority/vo/TyyOrderVo.java

+package com.pangding.web.authority.vo;
+
+import com.yanzuoguang.dao.TableAnnotation;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/7/9 18:03
+ */
+@TableAnnotation("pd_order")
+public class TyyOrderVo {
+    /**
+     * 订单编号
+     */
+    private String id;
+    /**
+     * 父订单编号
+     */
+    private String pid;
+    /**
+     * 分销商编号
+     */
+    private String sale_company_id;
+    /**
+     * 运营商编号
+     */
+    private String product_company_id;
+    /**
+     * 用户编号
+     */
+    private String user_id;
+    /**
+     * 订单类型  1:景区,2:酒店,3:餐饮,4:特产,10:组合
+     */
+    private Integer order_type;
+    /**
+     * 订单子类型: 1、扫码购票，2、网络购票，3、自助机购票，4、扫码支付，5、预约
+     */
+    private Integer sub_order_type;
+    private String product_id;
+    /**
+     * 产品名称
+     */
+    private String product_name;
+    /**
+     * 游玩时间
+     */
+    private String play_date;
+    /**
+     * 单价
+     */
+    private Double price;
+    /**
+     * 购买数量
+     */
+    private Integer order_num;
+    /**
+     * 售价
+     */
+    private Double sale_price;
+    /**
+     * 折扣价
+     */
+    private Double discount_price;
+    /**
+     * 订单实际支付金额
+     */
+    private Double real_price;
+    /**
+     * 成本单价
+     */
+    private Double settlement_price;
+    /**
+     * 成本价
+     */
+    private Double cost_price;
+    /**
+     * 利润金额
+     */
+    private Double profit_price;
+    /**
+     * 手续费
+     */
+    private Double order_poundage_price;
+    /**
+     * 退款数量
+     */
+    private Integer return_num;
+    /**
+     * 退款总额
+     */
+    private Double return_money;
+    /**
+     * 总手续费
+     */
+    private Double refund_poundage_price;
+    /**
+     * 订单状态
+     * 0,待付款、1,已付款（出票中）、2,成功出票、3,核销中、4,核销完成、5,部分退款、6,全部退款、7,已取消
+     */
+    private Integer order_status;
+
+    private String create_date;
+    /**
+     * 付款类型 0：微信  1:支付宝 2:通联
+     */
+    private Integer pay_type;
+    /**
+     * 付款凭证编号
+     */
+    private String pay_type_id;
+    /**
+     * 付款扩展值
+     */
+    private String pay_type_extend;
+    /**
+     * 付款时间
+     */
+    private String pay_date;
+    /**
+     * 支付状态 0:待付款  1:已付款给商户 2:已付款
+     */
+    private Integer pay_status;
+    private String tongl_third_ordersn;
+    private String tongl_ordersn;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getPid() {
+        return pid;
+    }
+
+    public void setPid(String pid) {
+        this.pid = pid;
+    }
+
+    public String getSale_company_id() {
+        return sale_company_id;
+    }
+
+    public void setSale_company_id(String sale_company_id) {
+        this.sale_company_id = sale_company_id;
+    }
+
+    public String getProduct_company_id() {
+        return product_company_id;
+    }
+
+    public void setProduct_company_id(String product_company_id) {
+        this.product_company_id = product_company_id;
+    }
+
+    public String getUser_id() {
+        return user_id;
+    }
+
+    public void setUser_id(String user_id) {
+        this.user_id = user_id;
+    }
+
+    public Integer getOrder_type() {
+        return order_type;
+    }
+
+    public void setOrder_type(Integer order_type) {
+        this.order_type = order_type;
+    }
+
+    public Integer getSub_order_type() {
+        return sub_order_type;
+    }
+
+    public void setSub_order_type(Integer sub_order_type) {
+        this.sub_order_type = sub_order_type;
+    }
+
+    public String getProduct_id() {
+        return product_id;
+    }
+
+    public void setProduct_id(String product_id) {
+        this.product_id = product_id;
+    }
+
+    public String getProduct_name() {
+        return product_name;
+    }
+
+    public void setProduct_name(String product_name) {
+        this.product_name = product_name;
+    }
+
+    public String getPlay_date() {
+        return play_date;
+    }
+
+    public void setPlay_date(String play_date) {
+        this.play_date = play_date;
+    }
+
+    public Double getPrice() {
+        return price;
+    }
+
+    public void setPrice(Double price) {
+        this.price = price;
+    }
+
+    public Integer getOrder_num() {
+        return order_num;
+    }
+
+    public void setOrder_num(Integer order_num) {
+        this.order_num = order_num;
+    }
+
+    public Double getSale_price() {
+        return sale_price;
+    }
+
+    public void setSale_price(Double sale_price) {
+        this.sale_price = sale_price;
+    }
+
+    public Double getDiscount_price() {
+        return discount_price;
+    }
+
+    public void setDiscount_price(Double discount_price) {
+        this.discount_price = discount_price;
+    }
+
+    public Double getReal_price() {
+        return real_price;
+    }
+
+    public void setReal_price(Double real_price) {
+        this.real_price = real_price;
+    }
+
+    public Double getSettlement_price() {
+        return settlement_price;
+    }
+
+    public void setSettlement_price(Double settlement_price) {
+        this.settlement_price = settlement_price;
+    }
+
+    public Double getCost_price() {
+        return cost_price;
+    }
+
+    public void setCost_price(Double cost_price) {
+        this.cost_price = cost_price;
+    }
+
+    public Double getProfit_price() {
+        return profit_price;
+    }
+
+    public void setProfit_price(Double profit_price) {
+        this.profit_price = profit_price;
+    }
+
+    public Double getOrder_poundage_price() {
+        return order_poundage_price;
+    }
+
+    public void setOrder_poundage_price(Double order_poundage_price) {
+        this.order_poundage_price = order_poundage_price;
+    }
+
+    public Integer getReturn_num() {
+        return return_num;
+    }
+
+    public void setReturn_num(Integer return_num) {
+        this.return_num = return_num;
+    }
+
+    public Double getReturn_money() {
+        return return_money;
+    }
+
+    public void setReturn_money(Double return_money) {
+        this.return_money = return_money;
+    }
+
+    public Double getRefund_poundage_price() {
+        return refund_poundage_price;
+    }
+
+    public void setRefund_poundage_price(Double refund_poundage_price) {
+        this.refund_poundage_price = refund_poundage_price;
+    }
+
+    public Integer getOrder_status() {
+        return order_status;
+    }
+
+    public void setOrder_status(Integer order_status) {
+        this.order_status = order_status;
+    }
+
+    public String getCreate_date() {
+        return create_date;
+    }
+
+    public void setCreate_date(String create_date) {
+        this.create_date = create_date;
+    }
+
+    public Integer getPay_type() {
+        return pay_type;
+    }
+
+    public void setPay_type(Integer pay_type) {
+        this.pay_type = pay_type;
+    }
+
+    public String getPay_type_id() {
+        return pay_type_id;
+    }
+
+    public void setPay_type_id(String pay_type_id) {
+        this.pay_type_id = pay_type_id;
+    }
+
+    public String getPay_type_extend() {
+        return pay_type_extend;
+    }
+
+    public void setPay_type_extend(String pay_type_extend) {
+        this.pay_type_extend = pay_type_extend;
+    }
+
+    public String getPay_date() {
+        return pay_date;
+    }
+
+    public void setPay_date(String pay_date) {
+        this.pay_date = pay_date;
+    }
+
+    public Integer getPay_status() {
+        return pay_status;
+    }
+
+    public void setPay_status(Integer pay_status) {
+        this.pay_status = pay_status;
+    }
+
+    public String getTongl_third_ordersn() {
+        return tongl_third_ordersn;
+    }
+
+    public void setTongl_third_ordersn(String tongl_third_ordersn) {
+        this.tongl_third_ordersn = tongl_third_ordersn;
+    }
+
+    public String getTongl_ordersn() {
+        return tongl_ordersn;
+    }
+
+    public void setTongl_ordersn(String tongl_ordersn) {
+        this.tongl_ordersn = tongl_ordersn;
+    }
+}

src/main/java/com/pangding/web/authority/vo/resvo/OrderStepOneResVo.java

+package com.pangding.web.authority.vo.resvo;
+
+import com.pangding.web.authority.vo.*;
+
+import java.util.List;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/7/9 19:08
+ */
+public class OrderStepOneResVo {
+    private String reqId;
+
+    private TyyOrderVo tyyOrderVo;
+
+    private TyyOrderMixVo tyyOrderMixVo;
+
+    private List<TyyOrderbackVo> tyyOrderbackVoList;
+
+    private TyyOrderdetailsVo tyyOrderdetailsVo;
+
+    private TyyTouristVo tyyTouristVo;
+
+    public String getReqId() {
+        return reqId;
+    }
+
+    public void setReqId(String reqId) {
+        this.reqId = reqId;
+    }
+
+    public TyyOrderVo getTyyOrderVo() {
+        return tyyOrderVo;
+    }
+
+    public void setTyyOrderVo(TyyOrderVo tyyOrderVo) {
+        this.tyyOrderVo = tyyOrderVo;
+    }
+
+    public TyyOrderMixVo getTyyOrderMixVo() {
+        return tyyOrderMixVo;
+    }
+
+    public void setTyyOrderMixVo(TyyOrderMixVo tyyOrderMixVo) {
+        this.tyyOrderMixVo = tyyOrderMixVo;
+    }
+
+    public List<TyyOrderbackVo> getTyyOrderbackVoList() {
+        return tyyOrderbackVoList;
+    }
+
+    public void setTyyOrderbackVoList(List<TyyOrderbackVo> tyyOrderbackVoList) {
+        this.tyyOrderbackVoList = tyyOrderbackVoList;
+    }
+
+    public TyyOrderdetailsVo getTyyOrderdetailsVo() {
+        return tyyOrderdetailsVo;
+    }
+
+    public void setTyyOrderdetailsVo(TyyOrderdetailsVo tyyOrderdetailsVo) {
+        this.tyyOrderdetailsVo = tyyOrderdetailsVo;
+    }
+
+    public TyyTouristVo getTyyTouristVo() {
+        return tyyTouristVo;
+    }
+
+    public void setTyyTouristVo(TyyTouristVo tyyTouristVo) {
+        this.tyyTouristVo = tyyTouristVo;
+    }
+}

src/main/java/com/pangding/web/authority/vo/resvo/OrderResVo.java → src/main/java/com/pangding/web/authority/vo/resvo/OrderStepThreeResVo.java

@@ -11,7 +11,7 @@ import java.util.List;
  * @Author zhangjinyao
  * @create 2019/7/7 20:40
  */
-public class OrderResVo {
+public class OrderStepThreeResVo {
     private String reqId;
 
     private TyyOrdersVo tyyOrdersVo;