xiug

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

@@ -6,6 +6,7 @@ import com.pangding.web.authority.service.UserService;
 import com.pangding.web.authority.vo.CompanyVo;
 import com.pangding.web.authority.vo.resvo.SaveCompanyResVo;
 import com.yanzuoguang.util.helper.CheckerHelper;
+import com.yanzuoguang.util.helper.FileHelper;
 import com.yanzuoguang.util.vo.ResponseResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
@@ -13,6 +14,9 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.commons.CommonsMultipartFile;
+
+import java.io.IOException;
 
 /**
  * @Author zhangjinyao
@@ -140,4 +144,8 @@ public class ComputerRegisterController {
         return ResponseResult.result(verifyCode);
     }
 
+    @RequestMapping(value = "/fileUpload",method = RequestMethod.POST,produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public ResponseResult<String> fileUpload(@RequestBody CommonsMultipartFile file) throws IOException {
+        return ResponseResult.result(registerServiceImpl.fileUpload(file));
+    }
 }

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.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;
@@ -26,4 +27,16 @@ public class DataController {
         dataServiceImpl.save(reqVo);
         return new ResponseResult();
     }
+
+    @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/controller/PangdingManagementController.java

@@ -289,7 +289,7 @@ public class PangdingManagementController {
                 .notBlankCheck("qrCode",reqVo.getQrCode())
                 .checkException();
         System.out.println("change");
-        return ResponseResult.result(companyServiceImpl.getCompanyByQrCode(reqVo));
+        return ResponseResult.resultAllowNull(companyServiceImpl.getCompanyByQrCode(reqVo));
     }
 
     @RequestMapping(value = "/findCompanyDivideInfo",method = RequestMethod.POST,produces = MediaType.APPLICATION_JSON_UTF8_VALUE)

src/main/java/com/pangding/web/authority/dao/DiscountDetailDao.java

+package com.pangding.web.authority.dao;
+
+import com.yanzuoguang.dao.BaseDao;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/7/8 17:01
+ */
+public interface DiscountDetailDao extends BaseDao {
+}

src/main/java/com/pangding/web/authority/dao/OrderDao.java

+package com.pangding.web.authority.dao;
+
+import com.yanzuoguang.dao.BaseDao;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/7/7 21:30
+ */
+public interface OrderDao extends BaseDao {
+}

src/main/java/com/pangding/web/authority/dao/OrderExtendDao.java

+package com.pangding.web.authority.dao;
+
+import com.yanzuoguang.dao.BaseDao;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/7/7 21:39
+ */
+public interface OrderExtendDao extends BaseDao {
+}

src/main/java/com/pangding/web/authority/dao/OrderRefundDao.java

+package com.pangding.web.authority.dao;
+
+import com.yanzuoguang.dao.BaseDao;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/7/7 21:48
+ */
+public interface OrderRefundDao extends BaseDao {
+}

src/main/java/com/pangding/web/authority/dao/OrderStatusDao.java

+package com.pangding.web.authority.dao;
+
+import com.yanzuoguang.dao.BaseDao;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/7/7 22:06
+ */
+public interface OrderStatusDao extends BaseDao {
+}

src/main/java/com/pangding/web/authority/dao/OrderTicketDetailDao.java

+package com.pangding.web.authority.dao;
+
+import com.yanzuoguang.dao.BaseDao;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/7/7 22:15
+ */
+public interface OrderTicketDetailDao extends BaseDao {
+}

src/main/java/com/pangding/web/authority/dao/OrderTouristDao.java

+package com.pangding.web.authority.dao;
+
+import com.yanzuoguang.dao.BaseDao;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/7/8 16:53
+ */
+public interface OrderTouristDao extends BaseDao {
+}

src/main/java/com/pangding/web/authority/dao/impl/DiscountDetailDaoImpl.java

+package com.pangding.web.authority.dao.impl;
+
+import com.pangding.web.authority.dao.DiscountDetailDao;
+import com.pangding.web.authority.vo.DiscountDetailVo;
+import com.yanzuoguang.dao.impl.BaseDaoImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/7/8 17:02
+ */
+@Component
+public class DiscountDetailDaoImpl extends BaseDaoImpl implements DiscountDetailDao {
+    @Override
+    protected void init() {
+        register(DiscountDetailVo.class);
+    }
+}

src/main/java/com/pangding/web/authority/dao/impl/OrderDaoImpl.java

+package com.pangding.web.authority.dao.impl;
+
+import com.pangding.web.authority.dao.OrderDao;
+import com.pangding.web.authority.vo.OrderVo;
+import com.yanzuoguang.dao.impl.BaseDaoImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/7/7 21:31
+ */
+@Component
+public class OrderDaoImpl extends BaseDaoImpl implements OrderDao {
+    @Override
+    protected void init() {
+        register(OrderVo.class);
+    }
+}

src/main/java/com/pangding/web/authority/dao/impl/OrderExtendDaoImpl.java

+package com.pangding.web.authority.dao.impl;
+
+import com.pangding.web.authority.dao.OrderExtendDao;
+import com.pangding.web.authority.vo.OrderExtendVo;
+import com.yanzuoguang.dao.impl.BaseDaoImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/7/7 21:40
+ */
+@Component
+public class OrderExtendDaoImpl extends BaseDaoImpl implements OrderExtendDao {
+    @Override
+    protected void init() {
+        register(OrderExtendVo.class);
+    }
+}

src/main/java/com/pangding/web/authority/dao/impl/OrderRefundDaoImpl.java

+package com.pangding.web.authority.dao.impl;
+
+import com.pangding.web.authority.dao.OrderRefundDao;
+import com.pangding.web.authority.vo.OrderRefundVo;
+import com.yanzuoguang.dao.impl.BaseDaoImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/7/7 21:48
+ */
+@Component
+public class OrderRefundDaoImpl extends BaseDaoImpl implements OrderRefundDao {
+    @Override
+    protected void init() {
+        register(OrderRefundVo.class);
+    }
+}

src/main/java/com/pangding/web/authority/dao/impl/OrderStatusDaoImpl.java

+package com.pangding.web.authority.dao.impl;
+
+import com.pangding.web.authority.dao.OrderStatusDao;
+import com.pangding.web.authority.vo.OrderStatusVo;
+import com.yanzuoguang.dao.impl.BaseDaoImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/7/7 22:07
+ */
+@Component
+public class OrderStatusDaoImpl extends BaseDaoImpl implements OrderStatusDao {
+    @Override
+    protected void init() {
+        register(OrderStatusVo.class);
+    }
+}

src/main/java/com/pangding/web/authority/dao/impl/OrderTicketDetailDaoImpl.java

+package com.pangding.web.authority.dao.impl;
+
+import com.pangding.web.authority.dao.OrderTicketDetailDao;
+import com.pangding.web.authority.vo.OrderTicketDetailVo;
+import com.yanzuoguang.dao.impl.BaseDaoImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/7/7 22:15
+ */
+@Component
+public class OrderTicketDetailDaoImpl extends BaseDaoImpl implements OrderTicketDetailDao {
+    @Override
+    protected void init() {
+        register(OrderTicketDetailVo.class);
+    }
+}

src/main/java/com/pangding/web/authority/dao/impl/OrderTouristDaoImpl.java

+package com.pangding.web.authority.dao.impl;
+
+import com.pangding.web.authority.dao.OrderTouristDao;
+import com.pangding.web.authority.vo.OrderTouristVo;
+import com.yanzuoguang.dao.impl.BaseDaoImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/7/8 16:53
+ */
+@Component
+public class OrderTouristDaoImpl extends BaseDaoImpl implements OrderTouristDao {
+    @Override
+    protected void init() {
+        register(OrderTouristVo.class);
+    }
+}

src/main/java/com/pangding/web/authority/dao/impl/WechatUserDaoImpl.java

@@ -27,14 +27,14 @@ public class WechatUserDaoImpl extends BaseDaoImpl implements WechatUserDao {
         register(WechatUserVo.class);
 
         table.add(GET_USER_NUM,"select count(id) as num from pd_wechat_user where 1=1 ")
-                .add("companyId","and company_id = ? ")
+                .add("sourceCompanyId","and source_company_id = ? ")
                 .add("start","and subscribe_date >= ? ")
                 .add("end","and subscribe_date < ? ");
 
         table.add(GET_USER_LIST,"select * from pd_wechat_user where 1=1 ")
                 .add("start","and subscribe_date >= ? ")
                 .add("end","and subscribe_date < ? ")
-                .add("companyId","and company_id = ? order by subscribe_date desc");
+                .add("sourceCompanyId","and source_company_id = ? order by subscribe_date desc");
     }
 
     @Override

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.OrderStepOneResVo;
+import com.pangding.web.authority.vo.resvo.OrderStepThreeResVo;
 
 
 /**
@@ -9,4 +11,8 @@ import com.pangding.web.authority.vo.resvo.FindResVo;
  */
 public interface DataService {
     void save(FindResVo reqVo);
+
+    void saveOrderStepThree(OrderStepThreeResVo reqVo);
+
+    void saveOrderStepOne(OrderStepOneResVo reqVo);
 }

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

@@ -6,9 +6,11 @@ import com.pangding.web.authority.vo.cloudvo.LoginResVo;
 import com.pangding.web.authority.vo.reqvo.*;
 import com.pangding.web.authority.vo.CompanyVo;
 import com.pangding.web.authority.vo.resvo.SaveCompanyResVo;
+import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
+import java.io.IOException;
 
 /**
  * @Author zhangjinyao
@@ -79,4 +81,6 @@ public interface RegisterService {
      * @return
      */
     String enterpriceSubmit(EnterpriceSubmitReqVo reqVo);
+
+    String fileUpload(CommonsMultipartFile file) throws IOException;
 }

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.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
@@ -36,6 +32,20 @@ public class DataServiceImpl implements DataService {
     private CompanyBankCardDao companyBankCardDaoImpl;
     @Autowired
     private UserRoleDao userRoleDaoImpl;
+    @Autowired
+    private OrderDao orderDaoImpl;
+    @Autowired
+    private OrderExtendDao orderExtendDaoImpl;
+    @Autowired
+    private OrderRefundDao orderRefundDaoImpl;
+    @Autowired
+    private OrderStatusDao orderStatusDaoImpl;
+    @Autowired
+    private OrderTicketDetailDao orderTicketDetailDao;
+    @Autowired
+    private OrderTouristDao orderTouristDao;
+    @Autowired
+    private DiscountDetailDao discountDetailDao;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -65,8 +75,16 @@ public class DataServiceImpl implements DataService {
         companyVo.setContactPhone(tyyCompanyVo.getContactTel());
         companyVo.setStatus(tyyCompanyVo.getStatus());
         companyVo.setCreateTime(tyyCompanyVo.getCreateTime());
-        companyVo.setExamineStatus(Integer.parseInt(enterpriseVo.getExamine()));
-        companyVo.setCompanyAttribute(Integer.parseInt(enterpriseVo.getUsertype()));
+        if (null == enterpriseVo.getExamine()){
+            companyVo.setExamineStatus(0);
+        }else {
+            companyVo.setExamineStatus(Integer.parseInt(enterpriseVo.getExamine()));
+        }
+        if (null == enterpriseVo.getUsertype()){
+            companyVo.setCompanyAttribute(0);
+        }else {
+            companyVo.setCompanyAttribute(Integer.parseInt(enterpriseVo.getUsertype()));
+        }
         companyVo.setProductOrInterface(CompanyConstant.PRODUCT);
         if (null != tyyCompanyExtendVo ){
             companyVo.setElectromicAgreementCode(tyyCompanyExtendVo.getCode());
@@ -122,7 +140,11 @@ public class DataServiceImpl implements DataService {
         companyExtendVo.setQrCodeUrl(enterpriseVo.getQrcodepath());
         companyExtendVo.setQrCode(enterpriseVo.getQrcodesrc());
         companyExtendVo.setInvitationCode(enterpriseVo.getInvitationCode());
-        companyExtendVo.setDivedeStatus(Integer.parseInt(enterpriseVo.getIsShare()));
+        if (null == enterpriseVo.getIsShare()){
+            companyExtendVo.setDivedeStatus(0);
+        }else {
+            companyExtendVo.setDivedeStatus(Integer.parseInt(enterpriseVo.getIsShare()));
+        }
         if (null != tyyCompanyExtendVo ){
             companyExtendVo.setWithdrawTotalCash(tyyCompanyExtendVo.getMoney());
         }
@@ -166,4 +188,617 @@ public class DataServiceImpl implements DataService {
             }
         }
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void saveOrderStepThree(OrderStepThreeResVo reqVo) {
+        TyyOrdersVo tyyOrdersVo = reqVo.getTyyOrdersVo();
+        List<TyyOrderbackVo> tyyOrderbackVoList = reqVo.getTyyOrderbackVoList();
+        TyyOrderdetailsVo tyyOrderdetailsVo = reqVo.getTyyOrderdetailsVo();
+        TyyTouristVo tyyTouristVo = reqVo.getTyyTouristVo();
+        OrderRelVo orderRelVo = reqVo.getOrderRelVo();
+        /*OrderVo表*/
+        if (null != tyyOrdersVo){
+            saveOrderVoStepThree(tyyOrdersVo,tyyOrderbackVoList,orderRelVo);
+        }
+
+        /*OrderExtendVo表*/
+        if (null != tyyOrdersVo){
+            saveOrderExtendVoStepThree(tyyOrdersVo);
+        }
+
+        /*OrderRefundVo表*/
+        if (null != tyyOrderbackVoList){
+            saveOrderRefundVoStepThree(tyyOrderbackVoList);
+        }
+
+        /*OrderStatusVo表*/
+        if (null != tyyOrdersVo){
+            saveOrderStatusVoStepThree(tyyOrdersVo);
+        }
+
+        /*OrderTicketDetailVo表*/
+        if (null != tyyOrderdetailsVo && null != tyyOrdersVo){
+            saveOrderTicketDetailVoStepThree(tyyOrderdetailsVo,tyyOrdersVo);
+        }
+
+        /*OrderTouristVo表*/
+        if (null != tyyTouristVo){
+            saveOrderTouristVoStepThree(tyyTouristVo);
+        }
+
+        /*DiscountDetailVo表*/
+        if (null != tyyOrdersVo){
+            saveDiscountDetailVoStepThree(tyyOrdersVo);
+        }
+    }
+
+    private void saveDiscountDetailVoStepThree(TyyOrdersVo tyyOrdersVo) {
+        DiscountDetailVo discountDetailVo = new DiscountDetailVo();
+        discountDetailVo.setId(StringHelper.getNewID());
+        discountDetailVo.setOrder_id(tyyOrdersVo.getOrdersn());
+        discountDetailVo.setDiscount_money(tyyOrdersVo.getDiscountprice());
+        /*若该order_id存在则跳过,不存在则新增*/
+        DiscountDetailGetReqVo discountDetailGetReqVo = new DiscountDetailGetReqVo();
+        discountDetailGetReqVo.setOrder_id(discountDetailVo.getOrder_id());
+        DiscountDetailVo discountDetailVo1 = discountDetailDao.load(discountDetailGetReqVo,DiscountDetailVo.class);
+        if (null == discountDetailVo1){
+            discountDetailDao.create(discountDetailVo);
+        }
+    }
+
+    private void saveOrderTouristVoStepThree(TyyTouristVo tyyTouristVo) {
+        OrderTouristVo orderTouristVo = new OrderTouristVo();
+        orderTouristVo.setId(StringHelper.getNewID());
+        orderTouristVo.setOrder_id(tyyTouristVo.getOrdersn());
+        orderTouristVo.setName(tyyTouristVo.getName());
+        orderTouristVo.setPhone(tyyTouristVo.getPhone());
+        orderTouristVo.setCredential_type(tyyTouristVo.getCard_type());
+        orderTouristVo.setCredential_number(tyyTouristVo.getIdcard());
+        /*若该order_id存在则跳过,不存在则新增*/
+        OrderTouristGetReqVo orderTouristGetReqVo = new OrderTouristGetReqVo();
+        orderTouristGetReqVo.setOrder_id(orderTouristVo.getOrder_id());
+        OrderTouristVo orderTouristVo1 = orderTouristDao.load(orderTouristGetReqVo,OrderTouristVo.class);
+        if (null == orderTouristVo1){
+            orderTouristDao.create(orderTouristVo);
+        }
+    }
+
+    private void saveOrderTicketDetailVoStepThree(TyyOrderdetailsVo tyyOrderdetailsVo, TyyOrdersVo tyyOrdersVo) {
+        OrderTicketDetailVo orderTicketDetailVo = new OrderTicketDetailVo();
+        orderTicketDetailVo.setId(StringHelper.getNewID());
+        orderTicketDetailVo.setVerify_code(tyyOrderdetailsVo.getAuxiliarycode());
+        orderTicketDetailVo.setOrder_id(tyyOrdersVo.getOrdersn());
+        if (null == tyyOrderdetailsVo.getCodestatus()){
+            orderTicketDetailVo.setTicket_status(0);
+        }else {
+            orderTicketDetailVo.setTicket_status(Integer.parseInt(tyyOrderdetailsVo.getCodestatus()));
+        }
+        if ("1".equals(tyyOrderdetailsVo.getCodestatus())){
+            orderTicketDetailVo.setTime(tyyOrderdetailsVo.getChecktime());
+        }else if("2".equals(tyyOrderdetailsVo.getCodestatus())){
+            orderTicketDetailVo.setTime(tyyOrderdetailsVo.getRefundtime());
+        }
+        orderTicketDetailVo.setTicket_code(tyyOrderdetailsVo.getLinkid());
+        orderTicketDetailVo.setCode_url(tyyOrderdetailsVo.getPicUrl());
+        /*若该order_id存在则跳过,不存在则新增*/
+        OrderTicketDetailGetReqVo orderTicketDetailGetReqVo = new OrderTicketDetailGetReqVo();
+        orderTicketDetailGetReqVo.setOrder_id(orderTicketDetailVo.getOrder_id());
+        OrderTicketDetailVo orderTicketDetailVo1 = orderTicketDetailDao.load(orderTicketDetailGetReqVo,OrderTicketDetailVo.class);
+        if (null == orderTicketDetailVo1){
+            orderTicketDetailDao.create(orderTicketDetailVo);
+        }
+    }
+
+    private void saveOrderStatusVoStepThree(TyyOrdersVo tyyOrdersVo) {
+        OrderStatusVo orderStatusVo = new OrderStatusVo();
+        orderStatusVo.setId(tyyOrdersVo.getOrdersn());
+        if (null == tyyOrdersVo.getPaytype()){
+            orderStatusVo.setPay_type(0);
+        }else {
+            orderStatusVo.setPay_type(Integer.parseInt(tyyOrdersVo.getPaytype()));
+        }
+        orderStatusVo.setPayment_time(tyyOrdersVo.getPaymenttime());
+        if (null == tyyOrdersVo.getPaystatus()){
+            orderStatusVo.setPayment_status(0);
+        }else {
+            orderStatusVo.setPayment_status(Integer.parseInt(tyyOrdersVo.getPaystatus()));
+        }
+        if ("1".equals(tyyOrdersVo.getStatus())){
+            orderStatusVo.setOrder_status(2);
+        }else if("3".equals(tyyOrdersVo.getStatus()) && "0".equals(tyyOrdersVo.getPaystatus())){
+            orderStatusVo.setOrder_status(0);
+        }else if("3".equals(tyyOrdersVo.getStatus()) && "1".equals(tyyOrdersVo.getPaystatus())){
+            orderStatusVo.setOrder_status(1);
+        }
+        orderStatusVo.setThird_order_id(tyyOrdersVo.getPiaostorderid());
+        orderStatusVo.setProduct_company_id(tyyOrdersVo.getEnterpriseid());
+        orderStatusVo.setPayment_id(tyyOrdersVo.getTongl_third_ordersn());
+        if ("N".equals(tyyOrdersVo.getEmancipated())){
+            orderStatusVo.setIs_summarize(0);
+        }else{
+            orderStatusVo.setIs_summarize(1);
+        }
+        orderStatusVo.setSummarize_time(tyyOrdersVo.getEmancipated_date());
+        if (null == tyyOrdersVo.getProfit_checked()){
+            orderStatusVo.setDivide_status(0);
+        }else{
+            orderStatusVo.setDivide_status(Integer.parseInt(tyyOrdersVo.getProfit_checked()));
+        }
+        orderStatusVo.setDivide_time(tyyOrdersVo.getProfit_checked_date());
+        orderStatusVo.setAgent_company_id(tyyOrdersVo.getFxsid());
+        if (null == tyyOrdersVo.getIsdelete()){
+            orderStatusVo.setIs_delete(0);
+        }else {
+            orderStatusVo.setIs_delete(Integer.parseInt(tyyOrdersVo.getIsdelete()));
+        }
+        orderStatusVo.setPay_tonglian_id(tyyOrdersVo.getTongl_ordersn());
+        /*若该id存在则跳过,不存在则新增*/
+        OrderStatusGetReqVo orderStatusGetReqVo = new OrderStatusGetReqVo();
+        orderStatusGetReqVo.setId(orderStatusVo.getId());
+        OrderStatusVo orderStatusVo1 = orderStatusDaoImpl.load(orderStatusGetReqVo,OrderStatusVo.class);
+        if (null == orderStatusVo1){
+            orderStatusDaoImpl.create(orderStatusVo);
+        }
+    }
+
+    private void saveOrderRefundVoStepThree(List<TyyOrderbackVo> tyyOrderbackVoList) {
+        for (TyyOrderbackVo tyyOrderbackVo:tyyOrderbackVoList) {
+            OrderRefundVo orderRefundVo = new OrderRefundVo();
+            orderRefundVo.setId(tyyOrderbackVo.getId());
+            orderRefundVo.setOrder_id(tyyOrderbackVo.getOrdersn());
+            orderRefundVo.setOperator(tyyOrderbackVo.getAcceptanceuser());
+            orderRefundVo.setRefund_status(tyyOrderbackVo.getRefundstatus());
+            orderRefundVo.setRefund_date(tyyOrderbackVo.getRefundtime());
+            orderRefundVo.setRefund_fee(tyyOrderbackVo.getRefundFee());
+            orderRefundVo.setRefund_amount(tyyOrderbackVo.getReceiveMoney());
+            orderRefundVo.setRefund_reason(tyyOrderbackVo.getRefundReason());
+            /*若该id存在则跳过,不存在则新增*/
+            OrderRefundGetReqVo orderRefundGetReqVo = new OrderRefundGetReqVo();
+            orderRefundGetReqVo.setId(orderRefundVo.getId());
+            OrderRefundVo orderRefundVo1 = orderRefundDaoImpl.load(orderRefundGetReqVo,OrderRefundVo.class);
+            if (null == orderRefundVo1){
+                orderRefundDaoImpl.create(orderRefundVo);
+            }
+        }
+    }
+
+    private void saveOrderExtendVoStepThree(TyyOrdersVo tyyOrdersVo) {
+        /*游玩地址*/
+        OrderExtendVo orderExtendVoAddress = new OrderExtendVo();
+        orderExtendVoAddress.setId(StringHelper.getNewID());
+        orderExtendVoAddress.setOrder_id(tyyOrdersVo.getOrdersn());
+        orderExtendVoAddress.setTitle("游玩地址");
+        orderExtendVoAddress.setContent(tyyOrdersVo.getPlay_address());
+        OrderExtendGetReqVo orderExtendGetReqVo = new OrderExtendGetReqVo();
+        orderExtendGetReqVo.setOrder_id(orderExtendVoAddress.getOrder_id());
+        orderExtendGetReqVo.setTitle(orderExtendVoAddress.getTitle());
+        /*若该order_id存在则跳过,不存在则新增*/
+        OrderExtendVo orderExtendVo1 = orderExtendDaoImpl.load(orderExtendGetReqVo,OrderExtendVo.class);
+        if (null == orderExtendVo1){
+            orderExtendDaoImpl.create(orderExtendVoAddress);
+        }
+        /*OrderExtendVo表*/
+        /*游玩时间*/
+        OrderExtendVo orderExtendVoTime = new OrderExtendVo();
+        orderExtendVoTime.setId(StringHelper.getNewID());
+        orderExtendVoTime.setOrder_id(tyyOrdersVo.getOrdersn());
+        orderExtendVoTime.setTitle("游玩时间");
+        orderExtendVoTime.setContent(tyyOrdersVo.getPlay_time());
+        OrderExtendGetReqVo orderExtendGetReqVo1 = new OrderExtendGetReqVo();
+        orderExtendGetReqVo1.setOrder_id(orderExtendVoTime.getOrder_id());
+        orderExtendGetReqVo1.setTitle(orderExtendVoTime.getTitle());
+        /*若该order_id存在则跳过,不存在则新增*/
+        OrderExtendVo orderExtendVo2 = orderExtendDaoImpl.load(orderExtendGetReqVo,OrderExtendVo.class);
+        if (null == orderExtendVo2){
+            orderExtendDaoImpl.create(orderExtendVoTime);
+        }
+    }
+
+    private void saveOrderVoStepThree(TyyOrdersVo tyyOrdersVo, List<TyyOrderbackVo> tyyOrderbackVoList, OrderRelVo orderRelVo) {
+        int refundNum = 0;
+        double refundFee = 0d;
+        double pdRefundMoney = 0d;
+        double refundMoney = 0d;
+        for (TyyOrderbackVo tyyOrderbackVo:tyyOrderbackVoList) {
+            if (null != tyyOrderbackVo){
+                refundNum += tyyOrderbackVo.getRefundnum();
+                refundFee += tyyOrderbackVo.getRefundFee();
+                pdRefundMoney += tyyOrderbackVo.getReceiveMoney();
+                refundMoney += tyyOrderbackVo.getRefundMoney();
+            }
+        }
+        OrderVo orderVo = new OrderVo();
+        if (null != orderRelVo){
+            orderVo.setPid(orderRelVo.getGroup_ordersn());
+        }
+        orderVo.setId(tyyOrdersVo.getOrdersn());
+        orderVo.setProduct_name(tyyOrdersVo.getConsignee());
+        orderVo.setMerchant_name(tyyOrdersVo.getScenicspotname());
+        orderVo.setProduct_code(tyyOrdersVo.getProductsn());
+        orderVo.setRefund_num(refundNum);
+        orderVo.setOrder_num(tyyOrdersVo.getBuynum());
+        orderVo.setUnit_price(tyyOrdersVo.getPrice());
+        orderVo.setTotal_money(tyyOrdersVo.getTotal());
+        orderVo.setPlay_date(tyyOrdersVo.getTraveldate());
+        orderVo.setOrder_time(tyyOrdersVo.getOrdertime());
+        orderVo.setUser_id(tyyOrdersVo.getMemberid());
+        orderVo.setTicket_phone(tyyOrdersVo.getUsertel());
+        orderVo.setCost_price(tyyOrdersVo.getPurchaseprice());
+        orderVo.setCost_total_money(tyyOrdersVo.getPurchaseprice()*tyyOrdersVo.getBuynum());
+        if (null != tyyOrdersVo.getDiscountprice() && null != orderVo.getCost_total_money()){
+            orderVo.setOrder_money(orderVo.getCost_total_money()-tyyOrdersVo.getDiscountprice());
+        }
+        orderVo.setRefund_fee(refundFee);
+        orderVo.setPd_refund_money(pdRefundMoney);
+        orderVo.setDiscount_money(tyyOrdersVo.getDiscountprice());
+        orderVo.setPd_discount_money(tyyOrdersVo.getDiscountprice());
+        orderVo.setRefund_money(refundMoney);
+        if (null == tyyOrdersVo.getFieldTicket()){
+            orderVo.setSub_order_type(0);
+        }else {
+            orderVo.setSub_order_type(Integer.parseInt(tyyOrdersVo.getFieldTicket()));
+        }
+        orderVo.setPd_order_money(tyyOrdersVo.getRealprice());
+        orderVo.setArea_code(tyyOrdersVo.getSight_spot_code());
+        orderVo.setOrder_type(1);
+        /*若该id存在则跳过，不存在则新增*/
+        OrderGetReqVo orderGetReqVo = new OrderGetReqVo();
+        orderGetReqVo.setId(orderVo.getId());
+        OrderVo orderVo1 = orderDaoImpl.load(orderGetReqVo,OrderVo.class);
+        if (null == orderVo1){
+            orderDaoImpl.create(orderVo);
+        }
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void saveOrderStepOne(OrderStepOneResVo reqVo) {
+        TyyOrderVo tyyOrderVo = reqVo.getTyyOrderVo();
+        TyyOrderMixVo tyyOrderMixVo = reqVo.getTyyOrderMixVo();
+        List<TyyOrderbackVo> tyyOrderbackVoList = reqVo.getTyyOrderbackVoList();
+        TyyOrderdetailsVo tyyOrderdetailsVo = reqVo.getTyyOrderdetailsVo();
+        TyyTouristVo tyyTouristVo = reqVo.getTyyTouristVo();
+
+        /*pd_order*/
+        if (null != tyyOrderVo || null != tyyOrderMixVo){
+            saveOrderVoStepOne(tyyOrderVo,tyyOrderMixVo,tyyOrderbackVoList);
+        }
+
+        /*pd_order_status*/
+        if (null != tyyOrderVo || null != tyyOrderMixVo){
+            saveOrderStatusVoStepOne(tyyOrderVo,tyyOrderMixVo);
+        }
+
+        /*pd_order_extend*/
+        if (null != tyyOrderVo || null != tyyOrderMixVo){
+            saveOrderExtendVoStepOne(tyyOrderVo,tyyOrderMixVo);
+        }
+
+        /*pd_discount_detail*/
+        if (null != tyyOrderVo || null != tyyOrderMixVo){
+            saveDiscountDetailVoStepOne(tyyOrderVo,tyyOrderMixVo);
+        }
+
+        /*pd_order_ticket_detail*/
+        if ((null != tyyOrderVo || null != tyyOrderMixVo) && null != tyyOrderdetailsVo){
+            saveOrderTicketDetailVoStepOne(tyyOrderVo,tyyOrderMixVo,tyyOrderdetailsVo);
+        }
+
+        /*pd_order_refund*/
+        if (null != tyyOrderbackVoList){
+            saveOrderRefundVoStepOne(tyyOrderbackVoList);
+        }
+
+        /*OrderTouristVo表*/
+        if (null != tyyTouristVo){
+            saveOrderTouristVoStepOne(tyyTouristVo);
+        }
+    }
+
+    private void saveOrderTouristVoStepOne(TyyTouristVo tyyTouristVo) {
+        OrderTouristVo orderTouristVo = new OrderTouristVo();
+        orderTouristVo.setId(StringHelper.getNewID());
+        orderTouristVo.setOrder_id(tyyTouristVo.getOrdersn());
+        orderTouristVo.setName(tyyTouristVo.getName());
+        orderTouristVo.setPhone(tyyTouristVo.getPhone());
+        orderTouristVo.setCredential_type(tyyTouristVo.getCard_type());
+        orderTouristVo.setCredential_number(tyyTouristVo.getIdcard());
+        /*若存在则修改，不存在则添加*/
+        OrderTouristGetReqVo orderTouristGetReqVo = new OrderTouristGetReqVo();
+        orderTouristGetReqVo.setOrder_id(tyyTouristVo.getOrdersn());
+        OrderTouristVo orderTouristVo1 = orderTouristDao.load(orderTouristGetReqVo,OrderTouristVo.class);
+        if (null == orderTouristVo1){
+            orderTouristDao.create(orderTouristVo);
+        }else {
+            orderTouristVo.setId(orderTouristVo1.getId());
+            orderTouristDao.update(orderTouristVo);
+        }
+    }
+
+    private void saveOrderRefundVoStepOne(List<TyyOrderbackVo> tyyOrderbackVoList) {
+        for (TyyOrderbackVo tyyOrderbackVo:tyyOrderbackVoList) {
+            OrderRefundVo orderRefundVo = new OrderRefundVo();
+            orderRefundVo.setId(tyyOrderbackVo.getId());
+            orderRefundVo.setOrder_id(tyyOrderbackVo.getOrdersn());
+            orderRefundVo.setOperator(tyyOrderbackVo.getAcceptanceuser());
+            orderRefundVo.setRefund_status(tyyOrderbackVo.getRefundstatus());
+            orderRefundVo.setRefund_date(tyyOrderbackVo.getRefundtime());
+            orderRefundVo.setRefund_fee(tyyOrderbackVo.getRefundFee());
+            orderRefundVo.setRefund_amount(tyyOrderbackVo.getReceiveMoney());
+            orderRefundVo.setRefund_reason(tyyOrderbackVo.getRefundReason());
+            /*若存在则修改，不存在则添加*/
+            OrderRefundGetReqVo orderRefundGetReqVo = new OrderRefundGetReqVo();
+            orderRefundGetReqVo.setId(tyyOrderbackVo.getId());
+            OrderRefundVo orderRefundVo1 = orderRefundDaoImpl.load(orderRefundGetReqVo,OrderRefundVo.class);
+            if (null == orderRefundVo1){
+                orderRefundDaoImpl.create(orderRefundVo);
+            }else{
+                orderRefundDaoImpl.update(orderRefundVo);
+            }
+        }
+    }
+
+    private void saveOrderTicketDetailVoStepOne(TyyOrderVo tyyOrderVo, TyyOrderMixVo tyyOrderMixVo, TyyOrderdetailsVo tyyOrderdetailsVo) {
+        OrderTicketDetailVo orderTicketDetailVo = new OrderTicketDetailVo();
+        if (null != tyyOrderVo){
+            orderTicketDetailVo.setOrder_id(tyyOrderVo.getId());
+        }else if(null != tyyOrderMixVo){
+            orderTicketDetailVo.setOrder_id(tyyOrderMixVo.getOrdersn());
+        }
+        orderTicketDetailVo.setId(StringHelper.getNewID());
+        orderTicketDetailVo.setVerify_code(tyyOrderdetailsVo.getAuxiliarycode());
+        if (null == tyyOrderdetailsVo.getCodestatus()){
+            orderTicketDetailVo.setTicket_status(0);
+        }else {
+            orderTicketDetailVo.setTicket_status(Integer.parseInt(tyyOrderdetailsVo.getCodestatus()));
+        }
+        if (null != tyyOrderdetailsVo.getCodestatus()){
+            if ("1".equals(tyyOrderdetailsVo.getCodestatus())){
+                orderTicketDetailVo.setTime(tyyOrderdetailsVo.getChecktime());
+            }else if("2".equals(tyyOrderdetailsVo.getCodestatus())){
+                orderTicketDetailVo.setTime(tyyOrderdetailsVo.getRefundtime());
+            }
+        }
+        orderTicketDetailVo.setTicket_code(tyyOrderdetailsVo.getLinkid());
+        orderTicketDetailVo.setCode_url(tyyOrderdetailsVo.getPicUrl());
+        /*若存在则修改，不存在则添加*/
+        OrderTicketDetailGetReqVo orderTicketDetailGetReqVo = new OrderTicketDetailGetReqVo();
+        orderTicketDetailGetReqVo.setOrder_id(orderTicketDetailVo.getOrder_id());
+        OrderTicketDetailVo orderTicketDetailVo1 = orderTicketDetailDao.load(orderTicketDetailGetReqVo,OrderTicketDetailVo.class);
+        if (null == orderTicketDetailVo1){
+            orderTicketDetailDao.create(orderTicketDetailVo);
+        }else {
+            orderTicketDetailVo.setId(orderTicketDetailVo1.getId());
+            orderTicketDetailDao.update(orderTicketDetailVo);
+        }
+    }
+
+    private void saveDiscountDetailVoStepOne(TyyOrderVo tyyOrderVo, TyyOrderMixVo tyyOrderMixVo) {
+        DiscountDetailVo discountDetailVo = new DiscountDetailVo();
+        if (null != tyyOrderVo){
+            discountDetailVo.setOrder_id(tyyOrderVo.getId());
+            discountDetailVo.setDiscount_money(tyyOrderVo.getDiscount_price());
+        }else if(null != tyyOrderMixVo){
+            discountDetailVo.setOrder_id(tyyOrderMixVo.getOrdersn());
+            discountDetailVo.setDiscount_money(tyyOrderMixVo.getDiscountprice());
+        }
+        discountDetailVo.setId(StringHelper.getNewID());
+        /*若存在则修改，不存在则添加*/
+        DiscountDetailGetReqVo discountDetailGetReqVo = new DiscountDetailGetReqVo();
+        discountDetailGetReqVo.setOrder_id(discountDetailVo.getOrder_id());
+        DiscountDetailVo discountDetailVo1 = discountDetailDao.load(discountDetailGetReqVo,DiscountDetailVo.class);
+        if (null == discountDetailVo1){
+            discountDetailDao.create(discountDetailVo);
+        }else {
+            discountDetailVo.setId(discountDetailVo1.getId());
+            discountDetailDao.update(discountDetailVo);
+        }
+    }
+
+    private void saveOrderExtendVoStepOne(TyyOrderVo tyyOrderVo, TyyOrderMixVo tyyOrderMixVo) {
+        if (null != tyyOrderVo){
+            OrderExtendVo orderExtendVo = new OrderExtendVo();
+            orderExtendVo.setId(StringHelper.getNewID());
+            orderExtendVo.setOrder_id(tyyOrderVo.getId());
+            /*若存在则修改，不存在则添加*/
+            OrderExtendGetReqVo orderExtendGetReqVo = new OrderExtendGetReqVo();
+            orderExtendGetReqVo.setOrder_id(tyyOrderVo.getId());
+            OrderExtendVo orderExtendVo1 = orderExtendDaoImpl.load(orderExtendGetReqVo,OrderExtendVo.class);
+            if (null == orderExtendVo1){
+                orderExtendDaoImpl.create(orderExtendVo);
+            }else {
+                orderExtendVo.setId(orderExtendVo1.getId());
+                orderExtendDaoImpl.update(orderExtendVo);
+            }
+
+        }else if(null != tyyOrderMixVo){
+            /*pd_order_extend游玩地址*/
+            OrderExtendVo orderExtendAddress = new OrderExtendVo();
+            orderExtendAddress.setId(StringHelper.getNewID());
+            orderExtendAddress.setOrder_id(tyyOrderMixVo.getOrdersn());
+            orderExtendAddress.setTitle("游玩地址");
+            orderExtendAddress.setContent(tyyOrderMixVo.getPlay_address());
+            /*若存在则修改，不存在则添加*/
+            OrderExtendGetReqVo orderExtendGetReqVo = new OrderExtendGetReqVo();
+            orderExtendGetReqVo.setOrder_id(tyyOrderMixVo.getOrdersn());
+            orderExtendGetReqVo.setTitle(orderExtendAddress.getTitle());
+            OrderExtendVo orderExtendAddress1 = orderExtendDaoImpl.load(orderExtendGetReqVo,OrderExtendVo.class);
+            if (null == orderExtendAddress1){
+                orderExtendDaoImpl.create(orderExtendAddress);
+            }else {
+                orderExtendAddress.setId(orderExtendAddress1.getId());
+                orderExtendDaoImpl.update(orderExtendAddress);
+            }
+            /*pd_order_extend游玩时间*/
+            OrderExtendVo orderExtendDate = new OrderExtendVo();
+            orderExtendAddress.setId(StringHelper.getNewID());
+            orderExtendDate.setOrder_id(tyyOrderMixVo.getOrdersn());
+            orderExtendDate.setTitle("游玩时间");
+            orderExtendDate.setContent(tyyOrderMixVo.getPlay_time());
+            /*若存在则修改，不存在则添加*/
+            OrderExtendGetReqVo orderExtendGetReqVo1 = new OrderExtendGetReqVo();
+            orderExtendGetReqVo.setOrder_id(tyyOrderMixVo.getOrdersn());
+            orderExtendGetReqVo.setTitle(orderExtendDate.getTitle());
+            OrderExtendVo orderExtendDate1 = orderExtendDaoImpl.load(orderExtendGetReqVo1,OrderExtendVo.class);
+            if (null == orderExtendDate1){
+                orderExtendDaoImpl.create(orderExtendDate);
+            }else{
+                orderExtendDate.setId(orderExtendDate1.getId());
+                orderExtendDaoImpl.update(orderExtendDate);
+            }
+        }
+    }
+
+    private void saveOrderStatusVoStepOne(TyyOrderVo tyyOrderVo, TyyOrderMixVo tyyOrderMixVo) {
+        OrderStatusVo orderStatusVo = new OrderStatusVo();
+        if (null != tyyOrderVo){
+            orderStatusVo.setId(tyyOrderVo.getId());
+            orderStatusVo.setAgent_company_id(tyyOrderVo.getSale_company_id());
+            orderStatusVo.setProduct_company_id(tyyOrderVo.getProduct_company_id());
+            orderStatusVo.setOrder_status(tyyOrderVo.getOrder_status());
+            orderStatusVo.setPay_type(tyyOrderVo.getPay_type());
+            orderStatusVo.setPay_third_id(tyyOrderVo.getPay_type_id());
+            orderStatusVo.setPayment_time(tyyOrderVo.getPay_date());
+            if (null != tyyOrderVo.getPay_status()){
+                if (tyyOrderVo.getPay_status() == 0){
+                    orderStatusVo.setPayment_status(0);
+                }else{
+                    orderStatusVo.setPayment_status(1);
+                }
+            }
+            orderStatusVo.setPayment_id(tyyOrderVo.getTongl_third_ordersn());
+            orderStatusVo.setPay_tonglian_id(tyyOrderVo.getTongl_ordersn());
+        }else if(null != tyyOrderMixVo){
+            orderStatusVo.setId(tyyOrderMixVo.getOrdersn());
+            if (null == tyyOrderMixVo.getPaytype()){
+                orderStatusVo.setPay_type(0);
+            }else {
+                orderStatusVo.setPay_type(Integer.parseInt(tyyOrderMixVo.getPaytype()));
+            }
+            orderStatusVo.setPayment_time(tyyOrderMixVo.getPaymenttime());
+            if (null == tyyOrderMixVo.getPaystatus()){
+                orderStatusVo.setPayment_status(0);
+            }else {
+                orderStatusVo.setPayment_status(Integer.parseInt(tyyOrderMixVo.getPaystatus()));
+            }
+            if (null == tyyOrderMixVo.getOrder_status()){
+                orderStatusVo.setOrder_status(0);
+            }else {
+                orderStatusVo.setOrder_status(Integer.parseInt(tyyOrderMixVo.getOrder_status()));
+            }
+            orderStatusVo.setThird_order_id(tyyOrderMixVo.getPiaostorderid());
+            if (null != tyyOrderMixVo.getEmancipated()){
+                if ("N".equals(tyyOrderMixVo.getEmancipated())){
+                    orderStatusVo.setIs_summarize(0);
+                }else{
+                    orderStatusVo.setIs_summarize(1);
+                }
+            }
+            orderStatusVo.setSummarize_time(tyyOrderMixVo.getEmancipated_date());
+            if (null == tyyOrderMixVo.getProfit_checked()){
+                orderStatusVo.setDivide_status(0);
+            }else {
+                orderStatusVo.setDivide_status(Integer.parseInt(tyyOrderMixVo.getProfit_checked()));
+            }
+            orderStatusVo.setDivide_time(tyyOrderMixVo.getProfit_checked_date());
+            orderStatusVo.setAgent_company_id(tyyOrderMixVo.getFxsid());
+            if (null == tyyOrderMixVo.getIsdelete()){
+                orderStatusVo.setIs_delete(0);
+            }else {
+                orderStatusVo.setIs_delete(Integer.parseInt(tyyOrderMixVo.getIsdelete()));
+            }
+            orderStatusVo.setPayment_id(tyyOrderMixVo.getTongl_third_ordersn());
+            orderStatusVo.setPay_tonglian_id(tyyOrderMixVo.getTongl_ordersn());
+            orderStatusVo.setPay_third_id(tyyOrderMixVo.getPay_type_id());
+            orderStatusVo.setProduct_company_id(tyyOrderMixVo.getProduct_company_id());
+        }
+        /*若存在则修改，不存在则添加*/
+        OrderStatusGetReqVo orderStatusGetReqVo = new OrderStatusGetReqVo();
+        orderStatusGetReqVo.setId(orderStatusVo.getId());
+        OrderStatusVo orderStatusVo1 = orderStatusDaoImpl.load(orderStatusGetReqVo,OrderStatusVo.class);
+        if (null == orderStatusVo1){
+            orderStatusDaoImpl.create(orderStatusVo);
+        }else {
+            orderStatusDaoImpl.update(orderStatusVo);
+        }
+    }
+
+    private void saveOrderVoStepOne(TyyOrderVo tyyOrderVo, TyyOrderMixVo tyyOrderMixVo, List<TyyOrderbackVo> tyyOrderbackVoList) {
+        OrderVo orderVo = new OrderVo();
+        if (null != tyyOrderVo){
+            orderVo.setId(tyyOrderVo.getId());
+            orderVo.setPid(tyyOrderVo.getPid());
+            orderVo.setOrder_type(tyyOrderVo.getOrder_type());
+            orderVo.setSub_order_type(tyyOrderVo.getSub_order_type());
+            orderVo.setProduct_name(tyyOrderVo.getProduct_name());
+            orderVo.setPlay_date(tyyOrderVo.getPlay_date());
+            orderVo.setUnit_price(tyyOrderVo.getPrice());
+            orderVo.setOrder_num(tyyOrderVo.getOrder_num());
+            orderVo.setTotal_money(tyyOrderVo.getSale_price());
+            orderVo.setDiscount_money(tyyOrderVo.getDiscount_price());
+            orderVo.setPd_discount_money(tyyOrderVo.getDiscount_price());
+            orderVo.setPd_order_money(tyyOrderVo.getReal_price());
+            orderVo.setCost_price(tyyOrderVo.getSettlement_price());
+            orderVo.setCost_total_money(tyyOrderVo.getCost_price());
+            if (null != orderVo.getCost_total_money() && null != tyyOrderVo.getDiscount_price()){
+                orderVo.setOrder_money(orderVo.getCost_total_money()-tyyOrderVo.getDiscount_price());
+            }
+            orderVo.setOrder_fee(tyyOrderVo.getOrder_poundage_price());
+            orderVo.setRefund_num(tyyOrderVo.getReturn_num());
+            orderVo.setRefund_money(tyyOrderVo.getReturn_money());
+            orderVo.setPd_refund_money(tyyOrderVo.getReturn_money());
+            orderVo.setOrder_time(tyyOrderVo.getCreate_date());
+        }else if(null != tyyOrderMixVo){
+            orderVo.setId(tyyOrderMixVo.getOrdersn());
+            orderVo.setProduct_name(tyyOrderMixVo.getConsignee());
+            orderVo.setMerchant_name(tyyOrderMixVo.getScenicspotname());
+            orderVo.setProduct_code(tyyOrderMixVo.getProductsn());
+            orderVo.setOrder_num(tyyOrderMixVo.getBuynum());
+            orderVo.setUnit_price(tyyOrderMixVo.getPrice());
+            orderVo.setTotal_money(tyyOrderMixVo.getTotal());
+            orderVo.setPlay_date(tyyOrderMixVo.getTraveldate());
+            orderVo.setUser_id(tyyOrderMixVo.getMemberid());
+            orderVo.setTicket_phone(tyyOrderMixVo.getUsertel());
+            orderVo.setOrder_time(tyyOrderMixVo.getOrdertime());
+            orderVo.setCost_price(tyyOrderMixVo.getPurchaseprice());
+            orderVo.setCost_total_money(orderVo.getCost_price()*orderVo.getOrder_num());
+            if (null != orderVo.getCost_total_money() && null != tyyOrderMixVo.getDiscountprice()){
+                orderVo.setOrder_money(orderVo.getCost_total_money()-tyyOrderMixVo.getDiscountprice());
+            }
+            if (null == tyyOrderMixVo.getSub_order_type()){
+                orderVo.setSub_order_type(0);
+            }else {
+                orderVo.setSub_order_type(Integer.parseInt(tyyOrderMixVo.getSub_order_type()));
+            }
+            orderVo.setPd_order_money(tyyOrderMixVo.getRealprice());
+            orderVo.setPd_discount_money(tyyOrderMixVo.getDiscountprice());
+            orderVo.setDiscount_money(tyyOrderMixVo.getDiscountprice());
+            orderVo.setArea_code(tyyOrderMixVo.getSight_spot_code());
+            orderVo.setPid(tyyOrderMixVo.getPid());
+            orderVo.setOrder_type(tyyOrderMixVo.getOrder_type());
+            orderVo.setRefund_num(tyyOrderMixVo.getReturn_num());
+            orderVo.setPd_refund_money(tyyOrderMixVo.getReturn_money());
+            orderVo.setRefund_money(tyyOrderMixVo.getReturn_money());
+            orderVo.setOrder_fee(tyyOrderMixVo.getOrder_poundage_price());
+        }
+        double refundFee = 0d;
+        for (TyyOrderbackVo tyyOrderbackVo:tyyOrderbackVoList) {
+            if (null != tyyOrderbackVo){
+                refundFee += tyyOrderbackVo.getRefundFee();
+            }
+        }
+        orderVo.setRefund_fee(refundFee);
+        /*若存在则修改，不存在则添加*/
+        OrderGetReqVo orderGetReqVo = new OrderGetReqVo();
+        orderGetReqVo.setId(orderVo.getId());
+        OrderVo orderVo1 = orderDaoImpl.load(orderGetReqVo,OrderVo.class);
+        if (null == orderVo1){
+            orderDaoImpl.create(orderVo);
+        }else{
+            orderDaoImpl.update(orderVo);
+        }
+    }
+
+
 }

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

@@ -65,7 +65,7 @@ public class IndexServiceImpl implements IndexService {
     @Override
     public Integer getUserPrecipitation(UserPrecipitationReqVo reqVo) {
         WechatUserGetReqVo getReqVo = new WechatUserGetReqVo();
-        getReqVo.setCompanyId(reqVo.getId());
+        getReqVo.setSourceCompanyId(reqVo.getId());
         List<WechatUserVo> wechatUserVoList = wechatUserDaoImpl.loadList(getReqVo, WechatUserVo.class);
         if (null == wechatUserVoList || wechatUserVoList.isEmpty()){
             return 0;
@@ -119,7 +119,7 @@ public class IndexServiceImpl implements IndexService {
                 ,TimeConstant.DECEMBER_BEGIN
                 ,TimeConstant.YEAR_END};
         WechatUserGetReqVo getReqVo = new WechatUserGetReqVo();
-        getReqVo.setCompanyId(reqVo.getId());
+        getReqVo.setSourceCompanyId(reqVo.getId());
         for (int i = 0; i < monthList.length-1; i++) {
             getReqVo.setStart(monthList[i]);
             getReqVo.setEnd(monthList[i+1]);

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

@@ -196,7 +196,7 @@ public class PangdingPartnerServiceImpl implements PangdingPartnerService {
         resVo.setCompanyId(reqVo.getCompanyId());
         /*今日沉淀量*/
         WechatUserGetReqVo todayGetReqVo = new WechatUserGetReqVo();
-        todayGetReqVo.setCompanyId(reqVo.getCompanyId());
+        todayGetReqVo.setSourceCompanyId(reqVo.getCompanyId());
         todayGetReqVo.setStart(DateHelper.getNow().substring(0,10)+" 00:00:00");
         todayGetReqVo.setEnd(DateHelper.getNow().substring(0,10)+" 23:59:59");
         List<Map> todayList = (List<Map>) wechatUserDaoImpl.getUserNum(todayGetReqVo);
@@ -204,13 +204,13 @@ public class PangdingPartnerServiceImpl implements PangdingPartnerService {
         resVo.setTodayPrecipitation(today);
         /*总沉淀量*/
         WechatUserGetReqVo totalGetReqVo = new WechatUserGetReqVo();
-        totalGetReqVo.setCompanyId(reqVo.getCompanyId());
+        totalGetReqVo.setSourceCompanyId(reqVo.getCompanyId());
         List<Map> totalList = (List<Map>) wechatUserDaoImpl.getUserNum(totalGetReqVo);
         Long total = (Long) totalList.get(0).get("num");
         resVo.setTotalPrecipitation(total);
         /*沉淀用户分页列表*/
         WechatUserGetReqVo userListGetReqVo = new WechatUserGetReqVo();
-        userListGetReqVo.setCompanyId(reqVo.getCompanyId());
+        userListGetReqVo.setSourceCompanyId(reqVo.getCompanyId());
         PageSizeData<WechatUserVo> wechatUserVoList = wechatUserDaoImpl.getUserList(reqVo);
         resVo.setWechatUserVoList(wechatUserVoList);
         return resVo;

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

@@ -23,9 +23,12 @@ 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 org.springframework.web.multipart.commons.CommonsMultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
+import java.io.File;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -552,4 +555,12 @@ public class RegisterServiceImpl implements RegisterService {
         companyBankCardDaoImpl.update(companyBankCardVo);
         return reqVo.getVerifyCode();
     }
+
+    @Override
+    public String fileUpload(CommonsMultipartFile file) throws IOException {
+        String path = "C:/" + DateHelper.getNow() + file.getOriginalFilename();
+        File newFile = new File(path);
+        file.transferTo(newFile);
+        return path;
+    }
 }

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

+package com.pangding.web.authority.vo;
+
+import com.yanzuoguang.dao.TableAnnotation;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/7/7 20:27
+ */
+@TableAnnotation("pd_discount_detail")
+public class DiscountDetailVo {
+    /**
+     * 编号
+     */
+    private String id;
+    /**
+     * 订单编号
+     */
+    private String order_id;
+    /**
+     * 0现金红包，1代金券，2折扣券，3抵扣券
+     */
+    private String discount_method;
+    /**
+     * 抵扣金额
+     */
+    private Double discount_money;
+    /**
+     * 创建时间
+     */
+    private String create_time;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getOrder_id() {
+        return order_id;
+    }
+
+    public void setOrder_id(String order_id) {
+        this.order_id = order_id;
+    }
+
+    public String getDiscount_method() {
+        return discount_method;
+    }
+
+    public void setDiscount_method(String discount_method) {
+        this.discount_method = discount_method;
+    }
+
+    public Double getDiscount_money() {
+        return discount_money;
+    }
+
+    public void setDiscount_money(Double discount_money) {
+        this.discount_money = discount_money;
+    }
+
+    public String getCreate_time() {
+        return create_time;
+    }
+
+    public void setCreate_time(String create_time) {
+        this.create_time = create_time;
+    }
+}

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

+package com.pangding.web.authority.vo;
+
+import com.yanzuoguang.dao.TableAnnotation;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/7/7 20:25
+ */
+@TableAnnotation("pd_order_extend")
+public class OrderExtendVo {
+    /**
+     * 编号
+     */
+    private String id;
+    /**
+     * 订单编号
+     */
+    private String order_id;
+    /**
+     * 产品类型
+     */
+    private String product_type;
+    /**
+     * 标题
+     */
+    private String title;
+    /**
+     * 内容
+     */
+    private String content;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getOrder_id() {
+        return order_id;
+    }
+
+    public void setOrder_id(String order_id) {
+        this.order_id = order_id;
+    }
+
+    public String getProduct_type() {
+        return product_type;
+    }
+
+    public void setProduct_type(String product_type) {
+        this.product_type = product_type;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+}

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

+package com.pangding.web.authority.vo;
+
+import com.yanzuoguang.dao.TableAnnotation;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/7/7 20:21
+ */
+@TableAnnotation("pd_order_refund")
+public class OrderRefundVo {
+    private String id;
+    private String order_id;
+    /**
+     * 退款金额
+     */
+    private Double refund_amount;
+    /**
+     * 退款手续费
+     */
+    private Double refund_fee;
+    private String refund_reason;
+    private String refund_status;
+    private String refund_date;
+    private String operator;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getOrder_id() {
+        return order_id;
+    }
+
+    public void setOrder_id(String order_id) {
+        this.order_id = order_id;
+    }
+
+    public Double getRefund_amount() {
+        return refund_amount;
+    }
+
+    public void setRefund_amount(Double refund_amount) {
+        this.refund_amount = refund_amount;
+    }
+
+    public Double getRefund_fee() {
+        return refund_fee;
+    }
+
+    public void setRefund_fee(Double refund_fee) {
+        this.refund_fee = refund_fee;
+    }
+
+    public String getRefund_reason() {
+        return refund_reason;
+    }
+
+    public void setRefund_reason(String refund_reason) {
+        this.refund_reason = refund_reason;
+    }
+
+    public String getRefund_status() {
+        return refund_status;
+    }
+
+    public void setRefund_status(String refund_status) {
+        this.refund_status = refund_status;
+    }
+
+    public String getRefund_date() {
+        return refund_date;
+    }
+
+    public void setRefund_date(String refund_date) {
+        this.refund_date = refund_date;
+    }
+
+    public String getOperator() {
+        return operator;
+    }
+
+    public void setOperator(String operator) {
+        this.operator = operator;
+    }
+}

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

+package com.pangding.web.authority.vo;
+
+import com.yanzuoguang.dao.TableAnnotation;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/7/10 18:03
+ */
+@TableAnnotation("pd_order_rel")
+public class OrderRelVo {
+    private String id;
+    private String group_ordersn;
+    private String ordersn;
+
+    /**
+     * 商品类型   1 景区  2 酒店  3餐饮  4  特产
+     */
+    private String good_type;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getGroup_ordersn() {
+        return group_ordersn;
+    }
+
+    public void setGroup_ordersn(String group_ordersn) {
+        this.group_ordersn = group_ordersn;
+    }
+
+    public String getOrdersn() {
+        return ordersn;
+    }
+
+    public void setOrdersn(String ordersn) {
+        this.ordersn = ordersn;
+    }
+
+    public String getGood_type() {
+        return good_type;
+    }
+
+    public void setGood_type(String good_type) {
+        this.good_type = good_type;
+    }
+}

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

+package com.pangding.web.authority.vo;
+
+import com.yanzuoguang.dao.TableAnnotation;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/7/7 20:16
+ */
+@TableAnnotation("pd_order_status")
+public class OrderStatusVo {
+    /**
+     * 编号
+     */
+    private String id;
+    /**
+     * 0未支付，1已支付
+     */
+    private Integer payment_status;
+    /**
+     * 支付类型
+     */
+    private Integer pay_type;
+    /**
+     * 支付单号
+     */
+    private String payment_id;
+    /**
+     * 支付时间
+     */
+    private String payment_time;
+    /**
+     * 支付中间id
+     */
+    private String pay_third_id;
+    /**
+     * 支付通联id
+     */
+    private String pay_tonglian_id;
+    /**
+     * 分账商
+     */
+    private String sale_company_id;
+    /**
+     * 分账第三方id
+     */
+    private String third_id;
+    /**
+     * 0未分账，1已分账，2分账失败，3不能分账
+     */
+    private Integer subledge_status;
+    /**
+     * 分账时间
+     */
+    private String subledge_time;
+    /**
+     * 0不可分润，1可分润，2已分润
+     */
+    private Integer divide_status;
+    /**
+     * 分润时间
+     */
+    private String divide_time;
+    /**
+     * 0未支付 1出票中（已支付）2出票成功/预订成功/有房 3出票失败/预订失败/无房 4核销中 5核销完成 6部分退货/退款 7全部退款退货 8取消 9已完成
+     */
+    private Integer order_status;
+    /**
+     * 第三方订单号
+     */
+    private String third_order_id;
+    /**
+     * 0未汇总，1已汇总
+     */
+    private Integer is_summarize;
+    /**
+     * 汇总时间
+     */
+    private String summarize_time;
+    /**
+     * 供应商
+     */
+    private String product_company_id;
+    /**
+     * 接口商
+     */
+    private String interface_company_id;
+    /**
+     * 供应商名称
+     */
+    private String product_company_name;
+    /**
+     * 是否删除 0 未删除 1 已删除
+     */
+    private Integer is_delete;
+
+    private String agent_company_id;
+
+    private String agent_company_name;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getPayment_id() {
+        return payment_id;
+    }
+
+    public void setPayment_id(String payment_id) {
+        this.payment_id = payment_id;
+    }
+
+    public String getPayment_time() {
+        return payment_time;
+    }
+
+    public void setPayment_time(String payment_time) {
+        this.payment_time = payment_time;
+    }
+
+    public String getPay_third_id() {
+        return pay_third_id;
+    }
+
+    public void setPay_third_id(String pay_third_id) {
+        this.pay_third_id = pay_third_id;
+    }
+
+    public String getPay_tonglian_id() {
+        return pay_tonglian_id;
+    }
+
+    public void setPay_tonglian_id(String pay_tonglian_id) {
+        this.pay_tonglian_id = pay_tonglian_id;
+    }
+
+    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 getThird_id() {
+        return third_id;
+    }
+
+    public void setThird_id(String third_id) {
+        this.third_id = third_id;
+    }
+
+    public Integer getSubledge_status() {
+        return subledge_status;
+    }
+
+    public void setSubledge_status(Integer subledge_status) {
+        this.subledge_status = subledge_status;
+    }
+
+    public String getSubledge_time() {
+        return subledge_time;
+    }
+
+    public void setSubledge_time(String subledge_time) {
+        this.subledge_time = subledge_time;
+    }
+
+    public String getDivide_time() {
+        return divide_time;
+    }
+
+    public void setDivide_time(String divide_time) {
+        this.divide_time = divide_time;
+    }
+
+    public String getThird_order_id() {
+        return third_order_id;
+    }
+
+    public void setThird_order_id(String third_order_id) {
+        this.third_order_id = third_order_id;
+    }
+
+    public Integer getIs_summarize() {
+        return is_summarize;
+    }
+
+    public void setIs_summarize(Integer is_summarize) {
+        this.is_summarize = is_summarize;
+    }
+
+    public String getSummarize_time() {
+        return summarize_time;
+    }
+
+    public void setSummarize_time(String summarize_time) {
+        this.summarize_time = summarize_time;
+    }
+
+    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 getInterface_company_id() {
+        return interface_company_id;
+    }
+
+    public void setInterface_company_id(String interface_company_id) {
+        this.interface_company_id = interface_company_id;
+    }
+
+    public String getProduct_company_name() {
+        return product_company_name;
+    }
+
+    public void setProduct_company_name(String product_company_name) {
+        this.product_company_name = product_company_name;
+    }
+
+    public String getAgent_company_id() {
+        return agent_company_id;
+    }
+
+    public void setAgent_company_id(String agent_company_id) {
+        this.agent_company_id = agent_company_id;
+    }
+
+    public String getAgent_company_name() {
+        return agent_company_name;
+    }
+
+    public void setAgent_company_name(String agent_company_name) {
+        this.agent_company_name = agent_company_name;
+    }
+
+    public Integer getPayment_status() {
+        return payment_status;
+    }
+
+    public void setPayment_status(Integer payment_status) {
+        this.payment_status = payment_status;
+    }
+
+    public Integer getPay_type() {
+        return pay_type;
+    }
+
+    public void setPay_type(Integer pay_type) {
+        this.pay_type = pay_type;
+    }
+
+    public Integer getDivide_status() {
+        return divide_status;
+    }
+
+    public void setDivide_status(Integer divide_status) {
+        this.divide_status = divide_status;
+    }
+
+    public Integer getOrder_status() {
+        return order_status;
+    }
+
+    public void setOrder_status(Integer order_status) {
+        this.order_status = order_status;
+    }
+
+    public Integer getIs_delete() {
+        return is_delete;
+    }
+
+    public void setIs_delete(Integer is_delete) {
+        this.is_delete = is_delete;
+    }
+}

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

+package com.pangding.web.authority.vo;
+
+import com.yanzuoguang.dao.TableAnnotation;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/7/7 20:31
+ */
+@TableAnnotation("pd_order_ticket_detail")
+public class OrderTicketDetailVo {
+    /**
+     * 编号
+     */
+    private String id;
+    /**
+     * 订单编号
+     */
+    private String order_id;
+    /**
+     * 验证码
+     */
+    private String verify_code;
+    /**
+     * 验证码图片
+     */
+    private String code_url;
+    /**
+     * 取票码
+     */
+    private String ticket_code;
+    /**
+     * 0未使用，1已核销，2退票，3过期
+     */
+    private Integer ticket_status;
+    /**
+     * 时间
+     */
+    private String time;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getOrder_id() {
+        return order_id;
+    }
+
+    public void setOrder_id(String order_id) {
+        this.order_id = order_id;
+    }
+
+    public String getVerify_code() {
+        return verify_code;
+    }
+
+    public void setVerify_code(String verify_code) {
+        this.verify_code = verify_code;
+    }
+
+    public String getCode_url() {
+        return code_url;
+    }
+
+    public void setCode_url(String code_url) {
+        this.code_url = code_url;
+    }
+
+    public String getTicket_code() {
+        return ticket_code;
+    }
+
+    public void setTicket_code(String ticket_code) {
+        this.ticket_code = ticket_code;
+    }
+
+    public Integer getTicket_status() {
+        return ticket_status;
+    }
+
+    public void setTicket_status(Integer ticket_status) {
+        this.ticket_status = ticket_status;
+    }
+
+    public String getTime() {
+        return time;
+    }
+
+    public void setTime(String time) {
+        this.time = time;
+    }
+}

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

+package com.pangding.web.authority.vo;
+
+import com.yanzuoguang.dao.TableAnnotation;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/7/7 20:33
+ */
+@TableAnnotation("pd_order_tourist")
+public class OrderTouristVo {
+    private String id;
+    private String order_id;
+    private String name;
+    private String credential_number;
+    private String credential_type;
+    private String phone;
+    private Integer category;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getOrder_id() {
+        return order_id;
+    }
+
+    public void setOrder_id(String order_id) {
+        this.order_id = order_id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getCredential_number() {
+        return credential_number;
+    }
+
+    public void setCredential_number(String credential_number) {
+        this.credential_number = credential_number;
+    }
+
+    public String getCredential_type() {
+        return credential_type;
+    }
+
+    public void setCredential_type(String credential_type) {
+        this.credential_type = credential_type;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public Integer getCategory() {
+        return category;
+    }
+
+    public void setCategory(Integer category) {
+        this.category = category;
+    }
+}

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

+package com.pangding.web.authority.vo;
+
+import com.yanzuoguang.dao.TableAnnotation;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/7/7 20:11
+ */
+@TableAnnotation("pd_order")
+public class OrderVo {
+    /**
+     * 编号
+     */
+    private String id;
+    /**
+     * 父订单编号
+     */
+    private String pid;
+    /**
+     * 单价
+     */
+    private Double unit_price;
+    /**
+     * 成本单价
+     */
+    private Double cost_price;
+    /**
+     * 数量
+     */
+    private Integer order_num;
+    /**
+     * 退货数量
+     */
+    private Integer refund_num;
+    /**
+     * 总价
+     */
+    private Double total_money;
+    /**
+     * 胖丁抵扣金额
+     */
+    private Double pd_discount_money;
+    /**
+     * 胖丁实际支付
+     */
+    private Double pd_order_money;
+    /**
+     * 胖丁退款金额
+     */
+    private Double pd_refund_money;
+    /**
+     * 成本总价
+     */
+    private Double cost_total_money;
+    /**
+     * 商家抵扣金额
+     */
+    private Double discount_money;
+    /**
+     * 商户实际支付
+     */
+    private Double order_money;
+    /**
+     * 订单手续费
+     */
+    private Double order_fee;
+    /**
+     * 商家退款金额
+     */
+    private Double refund_money;
+    /**
+     * 退款手续费
+     */
+    private Double refund_fee;
+    /**
+     * 0其他，1景区，2酒店，3餐饮，4特产，5运营车，10组合订单
+     */
+    private Integer order_type;
+    /**
+     * 子订单类型
+     */
+    private Integer sub_order_type;
+    /**
+     * 订单时间
+     */
+    private String order_time;
+    /**
+     * 产品id
+     */
+    private String product_code;
+    /**
+     * 产品名称
+     */
+    private String product_name;
+    /**
+     * 游玩时间
+     */
+    private String play_date;
+    /**
+     * 用户id
+     */
+    private String user_id;
+    /**
+     * 商户id
+     */
+    private String merchant_id;
+    /**
+     * 商户名称
+     */
+    private String merchant_name;
+    /**
+     * 手机号
+     */
+    private String ticket_phone;
+
+    /**
+     * 景点编号
+     */
+    private String area_code;
+
+    public String getArea_code() {
+        return area_code;
+    }
+
+    public void setArea_code(String area_code) {
+        this.area_code = area_code;
+    }
+
+    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 Double getUnit_price() {
+        return unit_price;
+    }
+
+    public void setUnit_price(Double unit_price) {
+        this.unit_price = unit_price;
+    }
+
+    public Double getCost_price() {
+        return cost_price;
+    }
+
+    public void setCost_price(Double cost_price) {
+        this.cost_price = cost_price;
+    }
+
+    public Integer getOrder_num() {
+        return order_num;
+    }
+
+    public void setOrder_num(Integer order_num) {
+        this.order_num = order_num;
+    }
+
+    public Integer getRefund_num() {
+        return refund_num;
+    }
+
+    public void setRefund_num(Integer refund_num) {
+        this.refund_num = refund_num;
+    }
+
+    public Double getTotal_money() {
+        return total_money;
+    }
+
+    public void setTotal_money(Double total_money) {
+        this.total_money = total_money;
+    }
+
+    public Double getPd_discount_money() {
+        return pd_discount_money;
+    }
+
+    public void setPd_discount_money(Double pd_discount_money) {
+        this.pd_discount_money = pd_discount_money;
+    }
+
+    public Double getPd_order_money() {
+        return pd_order_money;
+    }
+
+    public void setPd_order_money(Double pd_order_money) {
+        this.pd_order_money = pd_order_money;
+    }
+
+    public Double getPd_refund_money() {
+        return pd_refund_money;
+    }
+
+    public void setPd_refund_money(Double pd_refund_money) {
+        this.pd_refund_money = pd_refund_money;
+    }
+
+    public Double getCost_total_money() {
+        return cost_total_money;
+    }
+
+    public void setCost_total_money(Double cost_total_money) {
+        this.cost_total_money = cost_total_money;
+    }
+
+    public Double getDiscount_money() {
+        return discount_money;
+    }
+
+    public void setDiscount_money(Double discount_money) {
+        this.discount_money = discount_money;
+    }
+
+    public Double getOrder_money() {
+        return order_money;
+    }
+
+    public void setOrder_money(Double order_money) {
+        this.order_money = order_money;
+    }
+
+    public Double getOrder_fee() {
+        return order_fee;
+    }
+
+    public void setOrder_fee(Double order_fee) {
+        this.order_fee = order_fee;
+    }
+
+    public Double getRefund_money() {
+        return refund_money;
+    }
+
+    public void setRefund_money(Double refund_money) {
+        this.refund_money = refund_money;
+    }
+
+    public Double getRefund_fee() {
+        return refund_fee;
+    }
+
+    public void setRefund_fee(Double refund_fee) {
+        this.refund_fee = refund_fee;
+    }
+
+    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 getOrder_time() {
+        return order_time;
+    }
+
+    public void setOrder_time(String order_time) {
+        this.order_time = order_time;
+    }
+
+    public String getProduct_code() {
+        return product_code;
+    }
+
+    public void setProduct_code(String product_code) {
+        this.product_code = product_code;
+    }
+
+    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 String getUser_id() {
+        return user_id;
+    }
+
+    public void setUser_id(String user_id) {
+        this.user_id = user_id;
+    }
+
+    public String getMerchant_id() {
+        return merchant_id;
+    }
+
+    public void setMerchant_id(String merchant_id) {
+        this.merchant_id = merchant_id;
+    }
+
+    public String getMerchant_name() {
+        return merchant_name;
+    }
+
+    public void setMerchant_name(String merchant_name) {
+        this.merchant_name = merchant_name;
+    }
+
+    public String getTicket_phone() {
+        return ticket_phone;
+    }
+
+    public void setTicket_phone(String ticket_phone) {
+        this.ticket_phone = ticket_phone;
+    }
+}

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 String order_status;
+    private String piaostorderid;
+    private String memberid;
+    private String enterpriseid;
+    private String usertel;
+    private String ordertime;
+    private Double purchaseprice;
+    private String 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 String getOrder_status() {
+        return order_status;
+    }
+
+    public void setOrder_status(String 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 String getSub_order_type() {
+        return sub_order_type;
+    }
+
+    public void setSub_order_type(String 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 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 String getCreate_date() {
+        return create_date;
+    }
+
+    public void setCreate_date(String create_date) {
+        this.create_date = create_date;
+    }
+
+    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;
+    }
+
+    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 Integer getOrder_status() {
+        return order_status;
+    }
+
+    public void setOrder_status(Integer order_status) {
+        this.order_status = order_status;
+    }
+
+    public Integer getPay_type() {
+        return pay_type;
+    }
+
+    public void setPay_type(Integer pay_type) {
+        this.pay_type = pay_type;
+    }
+}

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

+package com.pangding.web.authority.vo;
+
+import com.yanzuoguang.dao.TableAnnotation;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/7/7 20:05
+ */
+@TableAnnotation("t_orderback")
+public class TyyOrderbackVo {
+    private String id;
+
+    private String uid;
+    /**
+     * 订单中用户名称
+     */
+    private String uname;
+    /**
+     * 退票申请时间
+     */
+    private String applytime;
+    /**
+     * 辅助码
+     */
+    private String auxiliarycode;
+    /**
+     * 订单编号，与票速通一致
+     */
+    private String ordersn;
+    /**
+     * 退票数量，默认1张
+     */
+    private Integer refundnum;
+    /**
+     * 票速通退票审核码
+     */
+    private String auditnum;
+    /**
+     * 票速通退票审核状态（0.处理中，1成功 2.失败）
+     */
+    private String status;
+    /**
+     * 备注
+     */
+    private String remarks;
+    /**
+     * 微信商户退款单号/银联商户退款单号
+     */
+    private String refundno;
+    /**
+     * 银联退款流量号queryId/微信退款单号refund_id
+     */
+    private String queryid;
+    /**
+     * 受理状态(0:受理未通过   1:退货/退款已受理; 0：退货/退款确认中)
+     */
+    private String acceptancestate;
+    /**
+     * 受理人
+     */
+    private String acceptanceuser;
+    /**
+     * 备注
+     */
+    private String acceptancedesc;
+    /**
+     * 受理时间
+     */
+    private String acceptancetime;
+    /**
+     * 审核状态(1:通过; -1未通过; 0：未审核)
+     */
+    private String checkstate;
+    /**
+     * 审核人
+     */
+    private String checkuser;
+    /**
+     * 审核时间
+     */
+    private String checktime;
+    /**
+     * 审核说明
+     */
+    private String checkdesc;
+    /**
+     * 是否退款(1:已退款; 0：未退款,2退款中 3.退款失败)
+     */
+    private String refundstatus;
+    /**
+     * 退款说明
+     */
+    private String refunddesc;
+    /**
+     * 退款人
+     */
+    private String refunduser;
+    /**
+     * 退款时间
+     */
+    private String refundtime;
+    /**
+     * 景区退款手续费,包含在退款金额中
+     */
+    private Double refundPoundage;
+    /**
+     * 平台退款金额，包含在退款金额中，会自动计算，计算完成时会更改订单状态
+     */
+    private Double refundFee;
+    /**
+     * 退款金额
+     */
+    private Double receiveMoney;
+    /**
+     * 退款理由，
+     */
+    private String refundReason;
+    /**
+     * 商家退款成本
+     */
+    private Double refundMoney;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getUid() {
+        return uid;
+    }
+
+    public void setUid(String uid) {
+        this.uid = uid;
+    }
+
+    public String getUname() {
+        return uname;
+    }
+
+    public void setUname(String uname) {
+        this.uname = uname;
+    }
+
+    public String getApplytime() {
+        return applytime;
+    }
+
+    public void setApplytime(String applytime) {
+        this.applytime = applytime;
+    }
+
+    public String getAuxiliarycode() {
+        return auxiliarycode;
+    }
+
+    public void setAuxiliarycode(String auxiliarycode) {
+        this.auxiliarycode = auxiliarycode;
+    }
+
+    public String getOrdersn() {
+        return ordersn;
+    }
+
+    public void setOrdersn(String ordersn) {
+        this.ordersn = ordersn;
+    }
+
+    public Integer getRefundnum() {
+        return refundnum;
+    }
+
+    public void setRefundnum(Integer refundnum) {
+        this.refundnum = refundnum;
+    }
+
+    public String getAuditnum() {
+        return auditnum;
+    }
+
+    public void setAuditnum(String auditnum) {
+        this.auditnum = auditnum;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getRemarks() {
+        return remarks;
+    }
+
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+
+    public String getRefundno() {
+        return refundno;
+    }
+
+    public void setRefundno(String refundno) {
+        this.refundno = refundno;
+    }
+
+    public String getQueryid() {
+        return queryid;
+    }
+
+    public void setQueryid(String queryid) {
+        this.queryid = queryid;
+    }
+
+    public String getAcceptancestate() {
+        return acceptancestate;
+    }
+
+    public void setAcceptancestate(String acceptancestate) {
+        this.acceptancestate = acceptancestate;
+    }
+
+    public String getAcceptanceuser() {
+        return acceptanceuser;
+    }
+
+    public void setAcceptanceuser(String acceptanceuser) {
+        this.acceptanceuser = acceptanceuser;
+    }
+
+    public String getAcceptancedesc() {
+        return acceptancedesc;
+    }
+
+    public void setAcceptancedesc(String acceptancedesc) {
+        this.acceptancedesc = acceptancedesc;
+    }
+
+    public String getAcceptancetime() {
+        return acceptancetime;
+    }
+
+    public void setAcceptancetime(String acceptancetime) {
+        this.acceptancetime = acceptancetime;
+    }
+
+    public String getCheckstate() {
+        return checkstate;
+    }
+
+    public void setCheckstate(String checkstate) {
+        this.checkstate = checkstate;
+    }
+
+    public String getCheckuser() {
+        return checkuser;
+    }
+
+    public void setCheckuser(String checkuser) {
+        this.checkuser = checkuser;
+    }
+
+    public String getChecktime() {
+        return checktime;
+    }
+
+    public void setChecktime(String checktime) {
+        this.checktime = checktime;
+    }
+
+    public String getCheckdesc() {
+        return checkdesc;
+    }
+
+    public void setCheckdesc(String checkdesc) {
+        this.checkdesc = checkdesc;
+    }
+
+    public String getRefundstatus() {
+        return refundstatus;
+    }
+
+    public void setRefundstatus(String refundstatus) {
+        this.refundstatus = refundstatus;
+    }
+
+    public String getRefunddesc() {
+        return refunddesc;
+    }
+
+    public void setRefunddesc(String refunddesc) {
+        this.refunddesc = refunddesc;
+    }
+
+    public String getRefunduser() {
+        return refunduser;
+    }
+
+    public void setRefunduser(String refunduser) {
+        this.refunduser = refunduser;
+    }
+
+    public String getRefundtime() {
+        return refundtime;
+    }
+
+    public void setRefundtime(String refundtime) {
+        this.refundtime = refundtime;
+    }
+
+    public Double getRefundPoundage() {
+        return refundPoundage;
+    }
+
+    public void setRefundPoundage(Double refundPoundage) {
+        this.refundPoundage = refundPoundage;
+    }
+
+    public Double getRefundFee() {
+        return refundFee;
+    }
+
+    public void setRefundFee(Double refundFee) {
+        this.refundFee = refundFee;
+    }
+
+    public Double getReceiveMoney() {
+        return receiveMoney;
+    }
+
+    public void setReceiveMoney(Double receiveMoney) {
+        this.receiveMoney = receiveMoney;
+    }
+
+    public String getRefundReason() {
+        return refundReason;
+    }
+
+    public void setRefundReason(String refundReason) {
+        this.refundReason = refundReason;
+    }
+
+    public Double getRefundMoney() {
+        return refundMoney;
+    }
+
+    public void setRefundMoney(Double refundMoney) {
+        this.refundMoney = refundMoney;
+    }
+}

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

+package com.pangding.web.authority.vo;
+
+import com.yanzuoguang.dao.TableAnnotation;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/7/7 20:02
+ */
+@TableAnnotation("t_orderdetails")
+public class TyyOrderdetailsVo {
+    private String id;
+    /**
+     * 订单编号，与票速通一致
+     */
+    private String ordersn;
+    /**
+     * 辅助码
+     */
+    private String auxiliarycode;
+    /**
+     * 景区名称
+     */
+    private String scenicspotname;
+    /**
+     * 景区产品名称
+     */
+    private String productname;
+    /**
+     * 验票时间
+     */
+    private String checktime;
+    /**
+     * 退票退款时间
+     */
+    private String refundtime;
+    /**
+     * 使用状态 0:未使用 1：已使用 2：已退
+     */
+    private String codestatus;
+    /**
+     * 票速通返回的linkid
+     */
+    private String linkid;
+    /**
+     * 去哪儿二维码图片
+     */
+    private String picUrl;
+    /**
+     * 是否为去哪儿码
+     */
+    private String isQunarCode;
+    /**
+     * 是否评论 0,未评论 1,已评论
+     */
+    private String iscomment;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getOrdersn() {
+        return ordersn;
+    }
+
+    public void setOrdersn(String ordersn) {
+        this.ordersn = ordersn;
+    }
+
+    public String getAuxiliarycode() {
+        return auxiliarycode;
+    }
+
+    public void setAuxiliarycode(String auxiliarycode) {
+        this.auxiliarycode = auxiliarycode;
+    }
+
+    public String getScenicspotname() {
+        return scenicspotname;
+    }
+
+    public void setScenicspotname(String scenicspotname) {
+        this.scenicspotname = scenicspotname;
+    }
+
+    public String getProductname() {
+        return productname;
+    }
+
+    public void setProductname(String productname) {
+        this.productname = productname;
+    }
+
+    public String getChecktime() {
+        return checktime;
+    }
+
+    public void setChecktime(String checktime) {
+        this.checktime = checktime;
+    }
+
+    public String getRefundtime() {
+        return refundtime;
+    }
+
+    public void setRefundtime(String refundtime) {
+        this.refundtime = refundtime;
+    }
+
+    public String getCodestatus() {
+        return codestatus;
+    }
+
+    public void setCodestatus(String codestatus) {
+        this.codestatus = codestatus;
+    }
+
+    public String getLinkid() {
+        return linkid;
+    }
+
+    public void setLinkid(String linkid) {
+        this.linkid = linkid;
+    }
+
+    public String getPicUrl() {
+        return picUrl;
+    }
+
+    public void setPicUrl(String picUrl) {
+        this.picUrl = picUrl;
+    }
+
+    public String getIsQunarCode() {
+        return isQunarCode;
+    }
+
+    public void setIsQunarCode(String isQunarCode) {
+        this.isQunarCode = isQunarCode;
+    }
+
+    public String getIscomment() {
+        return iscomment;
+    }
+
+    public void setIscomment(String iscomment) {
+        this.iscomment = iscomment;
+    }
+}
+

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

+package com.pangding.web.authority.vo;
+
+import com.yanzuoguang.dao.TableAnnotation;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/7/7 19:51
+ */
+@TableAnnotation("t_orders")
+public class TyyOrdersVo {
+    /**
+     * 单订编号，与票速通订单编号一致
+     */
+    private String id;
+    /**
+     * 景区产品名称
+     */
+    private String ordersn;
+    /**
+     * 景区名称
+     */
+    private String consignee;
+    /**
+     * 票速通对应产品编号
+     */
+    private String scenicspotname;
+    /**
+     * 产品ID
+     */
+    private String productsn;
+    /**
+     * 动活套餐ID,多个用逗号隔开
+     */
+    private String goodid;
+    /**
+     * 订单类型,散客或团购
+     */
+    private String packageids;
+    /**
+     * 购买数量
+     */
+    private String phoneortel;
+    /**
+     * 单价
+     */
+    private Integer buynum;
+    /**
+     * 合计金额
+     */
+    private Double price;
+    /**
+     * 游玩日期
+     */
+    private Double total;
+    /**
+     * 支付类型-默认微信支付
+     */
+    private String traveldate;
+    /**
+     * 支付时间
+     */
+    private String paytype;
+    /**
+     * 支付状态0:未支付；1:已支付
+     */
+    private String paymenttime;
+    /**
+     * 银联支付通知交易流水号queryId/微信支付通知订单号transaction_id
+     */
+    private String paystatus;
+    /**
+     * 备注
+     */
+    private String queryid;
+    /**
+     * 订单状态[票速通订单状态 1：成功 2：人工确认 3：未支付]
+     */
+    private String remarks;
+    /**
+     * 票速通订单编号
+     */
+    private String status;
+    /**
+     * 客户信息--OPENID
+     */
+    private String piaostorderid;
+    /**
+     * 景区（商家）ID
+     */
+    private String memberid;
+    /**
+     * 用户名称
+     */
+    private String enterpriseid;
+    /**
+     * 手机号码
+     */
+    private String usercontact;
+    /**
+     * 产品采购价
+     */
+    private String usertel;
+    /**
+     * 是否扎帐
+     */
+    private String ordertime;
+    /**
+     * 扎帐日期
+     */
+    private Double purchaseprice;
+    /**
+     * 抵扣金额
+     */
+    private String checked;
+    /**
+     * 用户身份证号
+     */
+    private String checked_date;
+    /**
+     * 手机所属地
+     */
+    private Double youbi;
+    /**
+     * 是否被统计 1为统计
+     */
+    private String idcard;
+    /**
+     * 是否统计分销商 1为统计
+     */
+    private String tel_province;
+    /**
+     * 是否现场购票订单  0 不是  1 是
+     */
+    private Integer is_tongji;
+    /**
+     * 使用截止日期
+     */
+    private Integer is_tongji_fxs;
+    /**
+     * 退票截止日期
+     */
+    private String fieldTicket;
+    /**
+     * 支持退票，0表示不支持退票，1表示支持退票，默认0
+     */
+    private String useTimeRangeEnd;
+    /**
+     * 退款手续费收取类型，0按订单，1按张数
+     */
+    private String refundRangeEnd;
+    /**
+     * 退款手续费（单位是元）
+     */
+    private String canRefund;
+    /**
+     * 是否能重发码
+     */
+    private String refundPoundageType;
+    /**
+     * 网络购票，已进行汇总
+     */
+    private Double refundPoundage;
+    /**
+     * 网络购票汇总日期
+     */
+    private String isCanResend;
+    /**
+     * 产品场次
+     */
+    private String emancipated;
+    /**
+     * 是否分润
+     */
+    private String emancipated_date;
+    /**
+     * 分润时间
+     */
+    private String changci;
+    /**
+     * 景区分销商ID
+     */
+    private String profit_checked;
+    /**
+     * 是否是旧版分润数据，0就是新版，1是旧版
+     */
+    private String profit_checked_date;
+    /**
+     * 是否删除  0 不删除  1 已删除
+     */
+    private String fxsid;
+    /**
+     * 实际收款
+     */
+    private Integer is_old;
+    /**
+     * 优惠金额
+     */
+    private String isdelete;
+    /**
+     * 从哪个渠道买的票
+     */
+    private Double realprice;
+    /**
+     * 收货地址
+     */
+    private Double discountprice;
+    /**
+     * 景点编号
+     */
+    private String qrcodesrc;
+    /**
+     * 是否补票  0 否 1是
+     */
+    private String address;
+    /**
+     * 是否取号  0  不取号  1 取号
+     */
+    private String sight_spot_code;
+    /**
+     * 通联状态  0  未处理   1 已代付， 2已退款
+     */
+    private String isBupiao;
+
+    private String email;
+
+    private String play_address;
+
+    private String play_time;
+
+    private String is_fetch;
+
+    private String tongl_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 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 String getGoodid() {
+        return goodid;
+    }
+
+    public void setGoodid(String goodid) {
+        this.goodid = goodid;
+    }
+
+    public String getPackageids() {
+        return packageids;
+    }
+
+    public void setPackageids(String packageids) {
+        this.packageids = packageids;
+    }
+
+    public String getPhoneortel() {
+        return phoneortel;
+    }
+
+    public void setPhoneortel(String phoneortel) {
+        this.phoneortel = phoneortel;
+    }
+
+    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 String getQueryid() {
+        return queryid;
+    }
+
+    public void setQueryid(String queryid) {
+        this.queryid = queryid;
+    }
+
+    public String getRemarks() {
+        return remarks;
+    }
+
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = 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 getUsercontact() {
+        return usercontact;
+    }
+
+    public void setUsercontact(String usercontact) {
+        this.usercontact = usercontact;
+    }
+
+    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 String getChecked() {
+        return checked;
+    }
+
+    public void setChecked(String checked) {
+        this.checked = checked;
+    }
+
+    public String getChecked_date() {
+        return checked_date;
+    }
+
+    public void setChecked_date(String checked_date) {
+        this.checked_date = checked_date;
+    }
+
+    public Double getYoubi() {
+        return youbi;
+    }
+
+    public void setYoubi(Double youbi) {
+        this.youbi = youbi;
+    }
+
+    public String getIdcard() {
+        return idcard;
+    }
+
+    public void setIdcard(String idcard) {
+        this.idcard = idcard;
+    }
+
+    public String getTel_province() {
+        return tel_province;
+    }
+
+    public void setTel_province(String tel_province) {
+        this.tel_province = tel_province;
+    }
+
+    public Integer getIs_tongji() {
+        return is_tongji;
+    }
+
+    public void setIs_tongji(Integer is_tongji) {
+        this.is_tongji = is_tongji;
+    }
+
+    public Integer getIs_tongji_fxs() {
+        return is_tongji_fxs;
+    }
+
+    public void setIs_tongji_fxs(Integer is_tongji_fxs) {
+        this.is_tongji_fxs = is_tongji_fxs;
+    }
+
+    public String getFieldTicket() {
+        return fieldTicket;
+    }
+
+    public void setFieldTicket(String fieldTicket) {
+        this.fieldTicket = fieldTicket;
+    }
+
+    public String getUseTimeRangeEnd() {
+        return useTimeRangeEnd;
+    }
+
+    public void setUseTimeRangeEnd(String useTimeRangeEnd) {
+        this.useTimeRangeEnd = useTimeRangeEnd;
+    }
+
+    public String getRefundRangeEnd() {
+        return refundRangeEnd;
+    }
+
+    public void setRefundRangeEnd(String refundRangeEnd) {
+        this.refundRangeEnd = refundRangeEnd;
+    }
+
+    public String getCanRefund() {
+        return canRefund;
+    }
+
+    public void setCanRefund(String canRefund) {
+        this.canRefund = canRefund;
+    }
+
+    public String getRefundPoundageType() {
+        return refundPoundageType;
+    }
+
+    public void setRefundPoundageType(String refundPoundageType) {
+        this.refundPoundageType = refundPoundageType;
+    }
+
+    public Double getRefundPoundage() {
+        return refundPoundage;
+    }
+
+    public void setRefundPoundage(Double refundPoundage) {
+        this.refundPoundage = refundPoundage;
+    }
+
+    public String getIsCanResend() {
+        return isCanResend;
+    }
+
+    public void setIsCanResend(String isCanResend) {
+        this.isCanResend = isCanResend;
+    }
+
+    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 getChangci() {
+        return changci;
+    }
+
+    public void setChangci(String changci) {
+        this.changci = changci;
+    }
+
+    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 Integer getIs_old() {
+        return is_old;
+    }
+
+    public void setIs_old(Integer is_old) {
+        this.is_old = is_old;
+    }
+
+    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 getQrcodesrc() {
+        return qrcodesrc;
+    }
+
+    public void setQrcodesrc(String qrcodesrc) {
+        this.qrcodesrc = qrcodesrc;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    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 getIsBupiao() {
+        return isBupiao;
+    }
+
+    public void setIsBupiao(String isBupiao) {
+        this.isBupiao = isBupiao;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    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 getIs_fetch() {
+        return is_fetch;
+    }
+
+    public void setIs_fetch(String is_fetch) {
+        this.is_fetch = is_fetch;
+    }
+
+    public String getTongl_status() {
+        return tongl_status;
+    }
+
+    public void setTongl_status(String tongl_status) {
+        this.tongl_status = tongl_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/TyyTouristVo.java

+package com.pangding.web.authority.vo;
+
+import com.yanzuoguang.dao.TableAnnotation;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/7/8 16:34
+ */
+@TableAnnotation("pd_tourist")
+public class TyyTouristVo {
+    private String id;
+
+    private String ordersn;
+
+    private String name;
+
+    private String phone;
+
+    private String card_type;
+
+    private String idcard;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getOrdersn() {
+        return ordersn;
+    }
+
+    public void setOrdersn(String ordersn) {
+        this.ordersn = ordersn;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getCard_type() {
+        return card_type;
+    }
+
+    public void setCard_type(String card_type) {
+        this.card_type = card_type;
+    }
+
+    public String getIdcard() {
+        return idcard;
+    }
+
+    public void setIdcard(String idcard) {
+        this.idcard = idcard;
+    }
+}

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

@@ -12,32 +12,30 @@ import java.math.BigDecimal;
  * @create 2019/5/29 16:25
  */
 @TableAnnotation("pd_wechat_user")
-public class WechatUserVo extends BaseVo implements InitDao {
+public class WechatUserVo extends BaseVo {
     private String id;
 
-    private String nickname;
-
-    private Integer gender;
-
     private String unionid;
 
     private String openid;
 
-    @TableAnnotation("company_id")
-    private String companyId;
+    private String nickname;
 
-    private String integral;
+    private Integer gender;
 
-    private BigDecimal cash;
+    private String age;
 
     @TableAnnotation("head_portrait")
     private String headPortrait;
 
     private String address;
 
-    private String status;
+    private String integral;
+
+    private BigDecimal cash;
 
-    private String age;
+    @TableAnnotation("subscribe_status")
+    private Integer subscribeStatus;
 
     @TableAnnotation("subscribe_date")
     private String subcribeDate;
@@ -45,6 +43,23 @@ public class WechatUserVo extends BaseVo implements InitDao {
     @TableAnnotation("unsubscribe_date")
     private String unSubcribeDate;
 
+    @TableAnnotation("create_date")
+    private String createDate;
+
+    @TableAnnotation("source_company_id")
+    private String sourceCompanyId;
+
+    @TableAnnotation("from_company_id")
+    private String fromCompanyId;
+
+    @TableAnnotation("from_company_pid")
+    private String fromCompanyPid;
+
+    private Integer level;
+
+    @TableAnnotation("subscribe_scene")
+    private String subscribeScene;
+
     public String getId() {
         return id;
     }
@@ -85,14 +100,6 @@ public class WechatUserVo extends BaseVo implements InitDao {
         this.openid = openid;
     }
 
-    public String getCompanyId() {
-        return companyId;
-    }
-
-    public void setCompanyId(String companyId) {
-        this.companyId = companyId;
-    }
-
     public String getIntegral() {
         return integral;
     }
@@ -125,14 +132,6 @@ public class WechatUserVo extends BaseVo implements InitDao {
         this.address = address;
     }
 
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
     public String getAge() {
         return age;
     }
@@ -157,8 +156,59 @@ public class WechatUserVo extends BaseVo implements InitDao {
         this.unSubcribeDate = unSubcribeDate;
     }
 
-    @Override
-    public void init() {
+    public Integer getSubscribeStatus() {
+        return subscribeStatus;
+    }
+
+    public void setSubscribeStatus(Integer subscribeStatus) {
+        this.subscribeStatus = subscribeStatus;
+    }
+
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+    public String getSourceCompanyId() {
+        return sourceCompanyId;
+    }
+
+    public void setSourceCompanyId(String sourceCompanyId) {
+        this.sourceCompanyId = sourceCompanyId;
+    }
+
+    public String getFromCompanyId() {
+        return fromCompanyId;
+    }
+
+    public void setFromCompanyId(String fromCompanyId) {
+        this.fromCompanyId = fromCompanyId;
+    }
+
+    public String getFromCompanyPid() {
+        return fromCompanyPid;
+    }
+
+    public void setFromCompanyPid(String fromCompanyPid) {
+        this.fromCompanyPid = fromCompanyPid;
+    }
+
+    public Integer getLevel() {
+        return level;
+    }
+
+    public void setLevel(Integer level) {
+        this.level = level;
+    }
+
+    public String getSubscribeScene() {
+        return subscribeScene;
+    }
 
+    public void setSubscribeScene(String subscribeScene) {
+        this.subscribeScene = subscribeScene;
     }
 }

src/main/java/com/pangding/web/authority/vo/reqvo/DiscountDetailGetReqVo.java

+package com.pangding.web.authority.vo.reqvo;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/7/8 17:00
+ */
+public class DiscountDetailGetReqVo {
+    private String order_id;
+
+    public String getOrder_id() {
+        return order_id;
+    }
+
+    public void setOrder_id(String order_id) {
+        this.order_id = order_id;
+    }
+}

src/main/java/com/pangding/web/authority/vo/reqvo/OrderExtendGetReqVo.java

+package com.pangding.web.authority.vo.reqvo;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/7/7 21:38
+ */
+public class OrderExtendGetReqVo {
+    private String order_id;
+
+    private String title;
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getOrder_id() {
+        return order_id;
+    }
+
+    public void setOrder_id(String order_id) {
+        this.order_id = order_id;
+    }
+}

src/main/java/com/pangding/web/authority/vo/reqvo/OrderGetReqVo.java

+package com.pangding.web.authority.vo.reqvo;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/7/7 21:33
+ */
+public class OrderGetReqVo {
+    private String id;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+}

src/main/java/com/pangding/web/authority/vo/reqvo/OrderRefundGetReqVo.java

+package com.pangding.web.authority.vo.reqvo;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/7/7 21:47
+ */
+public class OrderRefundGetReqVo {
+    private String id;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+}

src/main/java/com/pangding/web/authority/vo/reqvo/OrderStatusGetReqVo.java

+package com.pangding.web.authority.vo.reqvo;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/7/7 22:05
+ */
+public class OrderStatusGetReqVo {
+    private String id;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+}

src/main/java/com/pangding/web/authority/vo/reqvo/OrderTicketDetailGetReqVo.java

+package com.pangding.web.authority.vo.reqvo;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/7/7 22:14
+ */
+public class OrderTicketDetailGetReqVo {
+    private String order_id;
+
+    public String getOrder_id() {
+        return order_id;
+    }
+
+    public void setOrder_id(String order_id) {
+        this.order_id = order_id;
+    }
+}

src/main/java/com/pangding/web/authority/vo/reqvo/OrderTouristGetReqVo.java

+package com.pangding.web.authority.vo.reqvo;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/7/8 16:47
+ */
+public class OrderTouristGetReqVo {
+    private String order_id;
+
+    public String getOrder_id() {
+        return order_id;
+    }
+
+    public void setOrder_id(String order_id) {
+        this.order_id = order_id;
+    }
+}

src/main/java/com/pangding/web/authority/vo/reqvo/WechatUserGetReqVo.java

@@ -7,7 +7,7 @@ package com.pangding.web.authority.vo.reqvo;
 public class WechatUserGetReqVo {
     private String reqId;
 
-    private String companyId;
+    private String sourceCompanyId;
 
     private String start;
 
@@ -37,11 +37,11 @@ public class WechatUserGetReqVo {
         this.reqId = reqId;
     }
 
-    public String getCompanyId() {
-        return companyId;
+    public String getSourceCompanyId() {
+        return sourceCompanyId;
     }
 
-    public void setCompanyId(String companyId) {
-        this.companyId = companyId;
+    public void setSourceCompanyId(String sourceCompanyId) {
+        this.sourceCompanyId = sourceCompanyId;
     }
 }

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/OrderStepThreeResVo.java

+package com.pangding.web.authority.vo.resvo;
+
+import com.pangding.web.authority.vo.*;
+
+import java.util.List;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/7/7 20:40
+ */
+public class OrderStepThreeResVo {
+    private String reqId;
+
+    private TyyOrdersVo tyyOrdersVo;
+
+    private List<TyyOrderbackVo> tyyOrderbackVoList;
+
+    private TyyOrderdetailsVo tyyOrderdetailsVo;
+
+    private TyyTouristVo tyyTouristVo;
+
+    private OrderRelVo orderRelVo;
+
+    public OrderRelVo getOrderRelVo() {
+        return orderRelVo;
+    }
+
+    public void setOrderRelVo(OrderRelVo orderRelVo) {
+        this.orderRelVo = orderRelVo;
+    }
+
+    public TyyTouristVo getTyyTouristVo() {
+        return tyyTouristVo;
+    }
+
+    public void setTyyTouristVo(TyyTouristVo tyyTouristVo) {
+        this.tyyTouristVo = tyyTouristVo;
+    }
+
+    public String getReqId() {
+        return reqId;
+    }
+
+    public void setReqId(String reqId) {
+        this.reqId = reqId;
+    }
+
+    public TyyOrdersVo getTyyOrdersVo() {
+        return tyyOrdersVo;
+    }
+
+    public void setTyyOrdersVo(TyyOrdersVo tyyOrdersVo) {
+        this.tyyOrdersVo = tyyOrdersVo;
+    }
+
+    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;
+    }
+}