Skip to content

T
tcm-system
Commit 85a1e5fb authored by tangf's avatar tangf
Browse files
Options

修改实体

parent 9e6c56e5
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1019 additions and 4239 deletions
src/main/java/com/pangding/web/authority/controller/AuthorityController.java
View file @ 85a1e5fb
......@@ -2,12 +2,11 @@ package com.pangding.web.authority.controller;
import com.pangding.web.authority.service.AuthorityService;
import com.pangding.web.authority.vo.AuthorityVo;
import com.pangding.web.authority.vo.reqvo.*;
import com.pangding.web.authority.vo.resvo.AuthorityListByLevelResVo;
import com.pangding.web.authority.vo.resvo.AuthorityListResVo;
import com.pangding.web.authority.vo.resvo.AuthorityResVo;
import com.pangding.web.authority.vo.resvo.WebAuthorityResVo;
import com.pangding.web.vo.system.pd.authority.AuthorityVo;
import com.yanzuoguang.util.helper.CheckerHelper;
import com.yanzuoguang.util.vo.PageSizeData;
import com.yanzuoguang.util.vo.ResponseResult;
......@@ -123,6 +122,11 @@ public class AuthorityController {
return new ResponseResult();
}
/**
* 根据公司id找到公司的权限
* @param reqVo
* @return
*/
@RequestMapping(value = "/companyAuthority", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public ResponseResult companyAuthority(@RequestBody CompanyAuthorityReqVo reqVo){
CheckerHelper.newInstance()
......
src/main/java/com/pangding/web/authority/controller/CompanyManagementController.java
View file @ 85a1e5fb
package com.pangding.web.authority.controller;
import com.pangding.web.authority.service.CompanyService;
import com.pangding.web.authority.vo.CompanyBankCardVo;
import com.pangding.web.authority.vo.CompanyVo;
import com.pangding.web.authority.vo.reqvo.*;
import com.pangding.web.authority.vo.resvo.CompanyResVo;
import com.pangding.web.authority.vo.resvo.SaveCompanyResVo;
import com.pangding.web.vo.system.pd.company.CompanyBankCardVo;
import com.pangding.web.vo.system.pd.company.CompanyVo;
import com.pangding.web.vo.system.req.company.CompanyBankCardReqVo;
import com.yanzuoguang.util.helper.CheckerHelper;
import com.yanzuoguang.util.vo.PageSizeData;
import com.yanzuoguang.util.vo.ResponseResult;
......@@ -117,12 +118,12 @@ public class CompanyManagementController {
* @return 银行卡表主键
*/
@RequestMapping(value = "/saveBank", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public ResponseResult<String> saveBank(@RequestBody CompanyBankCardVo reqVo){
public ResponseResult<String> saveBank(@RequestBody CompanyBankCardReqVo reqVo){
checkBank(reqVo);
return ResponseResult.result(companyServiceImpl.saveBank(reqVo));
}
private void checkBank(CompanyBankCardVo reqVo){
private void checkBank(CompanyBankCardReqVo reqVo){
CheckerHelper.newInstance()
.notBlankCheck("bankCardCode",reqVo.getBankCardCode())
.notNumberCheck("bankCardCode",reqVo.getBankCardCode())
......
src/main/java/com/pangding/web/authority/controller/ComputerRegisterController.java
View file @ 85a1e5fb
......@@ -4,10 +4,9 @@ import com.pangding.web.authority.service.CompanyService;
import com.pangding.web.authority.vo.reqvo.*;
import com.pangding.web.authority.service.RegisterService;
import com.pangding.web.authority.service.UserService;
import com.pangding.web.authority.vo.CompanyVo;
import com.pangding.web.authority.vo.resvo.SaveCompanyResVo;
import com.pangding.web.vo.system.pd.company.CompanyVo;
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;
......
src/main/java/com/pangding/web/authority/controller/DataController.java
View file @ 85a1e5fb
......@@ -3,8 +3,6 @@ package com.pangding.web.authority.controller;
import com.pangding.web.authority.service.DataService;
import com.pangding.web.authority.vo.reqvo.DataSynReqVo;
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;
......@@ -29,21 +27,21 @@ public class DataController {
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();
}
@PostMapping(value = "/dataSyn",produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public ResponseResult dataSyn(@RequestBody DataSynReqVo reqVo){
dataServiceImpl.dataSyn(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();
// }
//
// @PostMapping(value = "/dataSyn",produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
// public ResponseResult dataSyn(@RequestBody DataSynReqVo reqVo){
// dataServiceImpl.dataSyn(reqVo);
// return new ResponseResult();
// }
}
src/main/java/com/pangding/web/authority/controller/MobileRegisterController.java
View file @ 85a1e5fb
......@@ -2,8 +2,8 @@ package com.pangding.web.authority.controller;
import com.pangding.web.authority.vo.reqvo.*;
import com.pangding.web.authority.service.RegisterService;
import com.pangding.web.authority.vo.CompanyVo;
import com.pangding.web.authority.vo.resvo.SaveCompanyResVo;
import com.pangding.web.vo.system.pd.company.CompanyVo;
import com.yanzuoguang.util.helper.CheckerHelper;
import com.yanzuoguang.util.vo.ResponseResult;
import org.springframework.beans.factory.annotation.Autowired;
......
src/main/java/com/pangding/web/authority/controller/PangdingManagementController.java
View file @ 85a1e5fb
package com.pangding.web.authority.controller;
import com.pangding.web.authority.service.CompanyService;
import com.pangding.web.authority.vo.CompanyBankCardVo;
import com.pangding.web.authority.vo.CompanyVo;
import com.pangding.web.authority.vo.reqvo.*;
import com.pangding.web.authority.vo.resvo.CompanyResVo;
import com.pangding.web.authority.vo.resvo.GetCompanyDivideResVo;
import com.pangding.web.authority.vo.resvo.GetCompanyResVo;
import com.pangding.web.authority.vo.resvo.SaveCompanyResVo;
import com.pangding.web.vo.system.pd.company.CompanyBankCardVo;
import com.pangding.web.vo.system.pd.company.CompanyVo;
import com.pangding.web.vo.system.req.company.CompanyBankCardReqVo;
import com.pangding.web.vo.system.req.company.CompanyMoneyUpdateReqVo;
import com.yanzuoguang.util.helper.CheckerHelper;
import com.yanzuoguang.util.vo.PageSizeData;
......@@ -142,12 +143,12 @@ public class PangdingManagementController {
* @return 银行卡表主键
*/
@RequestMapping(value = "/saveBank", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public ResponseResult<String> saveBank(@RequestBody CompanyBankCardVo reqVo){
public ResponseResult<String> saveBank(@RequestBody CompanyBankCardReqVo reqVo){
checkBank(reqVo);
return ResponseResult.result(companyServiceImpl.saveBank(reqVo));
}
private void checkBank(CompanyBankCardVo reqVo){
private void checkBank(CompanyBankCardReqVo reqVo){
CheckerHelper.newInstance()
.notBlankCheck("bankCardCode",reqVo.getBankCardCode())
.notNumberCheck("bankCardCode",reqVo.getBankCardCode())
......
src/main/java/com/pangding/web/authority/controller/PangdingPartnerController.java
View file @ 85a1e5fb
package com.pangding.web.authority.controller;
import com.pangding.web.authority.service.PangdingPartnerService;
import com.pangding.web.authority.vo.CompanyBankCardVo;
import com.pangding.web.authority.vo.reqvo.*;
import com.pangding.web.authority.vo.resvo.*;
import com.pangding.web.vo.system.pd.company.CompanyBankCardVo;
import com.pangding.web.vo.system.req.company.CompanyBankCardReqVo;
import com.yanzuoguang.util.helper.CheckerHelper;
import com.yanzuoguang.util.vo.ResponseResult;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -71,12 +72,12 @@ public class PangdingPartnerController {
* @return 银行卡表主键
*/
@PostMapping(value = "/saveBank",produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public ResponseResult<String> saveBank(@RequestBody CompanyBankCardVo reqVo){
public ResponseResult<String> saveBank(@RequestBody CompanyBankCardReqVo reqVo){
checkBank(reqVo);
return ResponseResult.result(pangdingPartnerServiceImpl.saveBank(reqVo));
}
private void checkBank(CompanyBankCardVo reqVo){
private void checkBank(CompanyBankCardReqVo reqVo){
CheckerHelper.newInstance()
.notBlankCheck("bankCardCode",reqVo.getBankCardCode())
.notNumberCheck("bankCardCode",reqVo.getBankCardCode())
......
src/main/java/com/pangding/web/authority/dao/AuthorityDao.java
View file @ 85a1e5fb
package com.pangding.web.authority.dao;
import com.pangding.web.authority.vo.AuthorityVo;
import com.pangding.web.authority.vo.reqvo.*;
import com.pangding.web.vo.system.pd.authority.AuthorityVo;
import com.yanzuoguang.dao.BaseDao;
import com.yanzuoguang.util.vo.PageSizeData;
......
src/main/java/com/pangding/web/authority/dao/CompanyBankCardDao.java
View file @ 85a1e5fb
package com.pangding.web.authority.dao;
import com.pangding.web.authority.vo.CompanyBankCardVo;
import com.pangding.web.authority.vo.reqvo.BankCardListReqVo;
import com.pangding.web.authority.vo.reqvo.CompanyBankCardSetNotDefaultReqVo;
import com.pangding.web.vo.system.pd.company.CompanyBankCardVo;
import com.yanzuoguang.dao.BaseDao;
import com.yanzuoguang.util.vo.PageSizeData;
......
src/main/java/com/pangding/web/authority/dao/CompanyDao.java
View file @ 85a1e5fb
package com.pangding.web.authority.dao;
import com.pangding.web.authority.vo.CompanyVo;
import com.pangding.web.authority.vo.reqvo.ListCompanyReqVo;
import com.pangding.web.vo.system.pd.company.CompanyVo;
import com.yanzuoguang.dao.BaseDao;
import com.yanzuoguang.util.vo.PageSizeData;
......
src/main/java/com/pangding/web/authority/dao/CompanyMsgDao.java
View file @ 85a1e5fb
package com.pangding.web.authority.dao;
import com.pangding.web.authority.vo.CompanyMsgVo;
import com.pangding.web.authority.vo.reqvo.CompanyMsgReqVo;
import com.pangding.web.authority.vo.resvo.GetCompanyMsgResVo;
import com.yanzuoguang.dao.BaseDao;
......
src/main/java/com/pangding/web/authority/dao/DiscountDetailDao.java deleted 100644 → 0
View file @ 9e6c56e5
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 deleted 100644 → 0
View file @ 9e6c56e5
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 deleted 100644 → 0
View file @ 9e6c56e5
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 deleted 100644 → 0
View file @ 9e6c56e5
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 deleted 100644 → 0
View file @ 9e6c56e5
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 deleted 100644 → 0
View file @ 9e6c56e5
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 deleted 100644 → 0
View file @ 9e6c56e5
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/RoleDao.java
View file @ 85a1e5fb
package com.pangding.web.authority.dao;
import com.pangding.web.authority.vo.reqvo.GetEmptyRolesReqVo;
import com.pangding.web.authority.vo.reqvo.ListRoleReqVo;
import com.pangding.web.authority.vo.reqvo.RoleGetReqVo;
import com.pangding.web.authority.vo.RoleVo;
import com.pangding.web.vo.system.pd.authority.RoleVo;
import com.yanzuoguang.dao.BaseDao;
import com.yanzuoguang.util.vo.PageSizeData;
import java.util.List;
......
src/main/java/com/pangding/web/authority/dao/impl/AuthorityDaoImpl.java
View file @ 85a1e5fb
package com.pangding.web.authority.dao.impl;
import com.pangding.web.authority.dao.AuthorityDao;
import com.pangding.web.authority.vo.AuthorityVo;
import com.pangding.web.authority.vo.reqvo.*;
import com.pangding.web.vo.system.pd.authority.AuthorityVo;
import com.yanzuoguang.dao.impl.BaseDaoImpl;
import com.yanzuoguang.util.vo.PageSizeData;
import org.springframework.stereotype.Component;
......
src/main/java/com/pangding/web/authority/dao/impl/CompanyBankCardDaoImpl.java
View file @ 85a1e5fb
package com.pangding.web.authority.dao.impl;
import com.pangding.web.authority.dao.CompanyBankCardDao;
import com.pangding.web.authority.vo.CompanyBankCardVo;
import com.pangding.web.authority.vo.reqvo.BankCardListReqVo;
import com.pangding.web.authority.vo.reqvo.CompanyBankCardSetNotDefaultReqVo;
import com.pangding.web.vo.system.pd.company.CompanyBankCardVo;
import com.yanzuoguang.dao.impl.BaseDaoImpl;
import com.yanzuoguang.util.vo.PageSizeData;
import org.springframework.stereotype.Component;
......
src/main/java/com/pangding/web/authority/dao/impl/CompanyDaoImpl.java
View file @ 85a1e5fb
package com.pangding.web.authority.dao.impl;
import com.pangding.web.authority.dao.CompanyDao;
import com.pangding.web.authority.vo.CompanyVo;
import com.pangding.web.authority.vo.reqvo.ListCompanyReqVo;
import com.pangding.web.vo.system.pd.company.CompanyVo;
import com.yanzuoguang.dao.impl.BaseDaoImpl;
import com.yanzuoguang.util.vo.PageSizeData;
import org.springframework.stereotype.Component;
......
src/main/java/com/pangding/web/authority/dao/impl/CompanyDivideRuleDaoImpl.java
View file @ 85a1e5fb
package com.pangding.web.authority.dao.impl;
import com.pangding.web.authority.dao.CompanyDivideRuleDao;
import com.pangding.web.authority.vo.CompanyDivideRuleVo;
import com.pangding.web.authority.vo.reqvo.GetCompanyReqVo;
import com.pangding.web.authority.vo.resvo.GetCompanyDivideResVo;
import com.pangding.web.vo.system.pd.company.CompanyDivideRuleVo;
import com.yanzuoguang.dao.impl.BaseDaoImpl;
import org.springframework.stereotype.Component;
......
src/main/java/com/pangding/web/authority/dao/impl/CompanyExtendDaoImpl.java
View file @ 85a1e5fb
package com.pangding.web.authority.dao.impl;
import com.pangding.web.authority.dao.CompanyExtendDao;
import com.pangding.web.authority.vo.CompanyExtendVo;
import com.pangding.web.vo.system.pd.company.CompanyExtendVo;
import com.yanzuoguang.dao.impl.BaseDaoImpl;
import org.springframework.stereotype.Component;
......
src/main/java/com/pangding/web/authority/dao/impl/CompanyMoneyDetailDaoImpl.java
View file @ 85a1e5fb
package com.pangding.web.authority.dao.impl;
import com.pangding.web.authority.dao.CompanyMoneyDetailDao;
import com.pangding.web.authority.vo.CompanyMoneyDateilVo;
import com.pangding.web.vo.system.pd.company.CompanyMoneyDetailVo;
import com.yanzuoguang.dao.impl.BaseDaoImpl;
import org.springframework.stereotype.Component;
......@@ -10,6 +10,6 @@ public class CompanyMoneyDetailDaoImpl extends BaseDaoImpl implements CompanyMon
@Override
protected void init() {
register(CompanyMoneyDateilVo.class);
register(CompanyMoneyDetailVo.class);
}
}
src/main/java/com/pangding/web/authority/dao/impl/CompanyMsgDaoImpl.java
View file @ 85a1e5fb
package com.pangding.web.authority.dao.impl;
import com.pangding.web.authority.dao.CompanyMsgDao;
import com.pangding.web.authority.vo.CompanyMsgVo;
import com.pangding.web.authority.vo.reqvo.CompanyMsgReqVo;
import com.pangding.web.authority.vo.resvo.GetCompanyMsgResVo;
import com.pangding.web.vo.system.pd.CompanyMsgVo;
import com.yanzuoguang.dao.impl.BaseDaoImpl;
import org.springframework.stereotype.Component;
......
src/main/java/com/pangding/web/authority/dao/impl/DiscountDetailDaoImpl.java deleted 100644 → 0
View file @ 9e6c56e5
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 deleted 100644 → 0
View file @ 9e6c56e5
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 deleted 100644 → 0
View file @ 9e6c56e5
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 deleted 100644 → 0
View file @ 9e6c56e5
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 deleted 100644 → 0
View file @ 9e6c56e5
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 deleted 100644 → 0
View file @ 9e6c56e5
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 deleted 100644 → 0
View file @ 9e6c56e5
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/RoleAuthorityDaoImpl.java
View file @ 85a1e5fb
package com.pangding.web.authority.dao.impl;
import com.pangding.web.authority.dao.RoleAuthorityDao;
import com.pangding.web.authority.vo.reqvo.RoleAuthorityGetReqVo;
import com.pangding.web.authority.vo.RoleAuthorityVo;
import com.pangding.web.vo.system.pd.authority.RoleAuthorityVo;
import com.yanzuoguang.dao.DaoConst;
import com.yanzuoguang.dao.impl.BaseDaoImpl;
import org.springframework.stereotype.Component;
import java.util.List;
/**
* @author zhangjinyao
*/
......
src/main/java/com/pangding/web/authority/dao/impl/RoleDaoImpl.java
View file @ 85a1e5fb
......@@ -2,11 +2,9 @@ package com.pangding.web.authority.dao.impl;
import com.pangding.web.authority.dao.RoleDao;
import com.pangding.web.authority.vo.reqvo.GetEmptyRolesReqVo;
import com.pangding.web.authority.vo.reqvo.ListRoleReqVo;
import com.pangding.web.authority.vo.reqvo.RoleGetReqVo;
import com.pangding.web.authority.vo.RoleVo;
import com.pangding.web.vo.system.pd.authority.RoleVo;
import com.yanzuoguang.dao.impl.BaseDaoImpl;
import com.yanzuoguang.util.vo.PageSizeData;
import org.springframework.stereotype.Component;
import java.util.List;
......
src/main/java/com/pangding/web/authority/feign/StoreFeign.java
View file @ 85a1e5fb
package com.pangding.web.authority.feign;
import com.pangding.web.authority.vo.Merchant;
import com.pangding.web.authority.vo.reqvo.CompanyScenicInfoReqVo;
import com.pangding.web.authority.vo.reqvo.MerchantCreateReqVo;
import com.pangding.web.vo.product.pd.merchant.MerchantVo;
import com.yanzuoguang.util.vo.ResponseResult;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.RequestBody;
......@@ -30,5 +30,5 @@ public interface StoreFeign {
* @return
*/
@RequestMapping("/getCompanyScenicInfo")
ResponseResult<Merchant> getCompanyScenicInfo(@RequestBody CompanyScenicInfoReqVo req);
ResponseResult<MerchantVo> getCompanyScenicInfo(@RequestBody CompanyScenicInfoReqVo req);
}
src/main/java/com/pangding/web/authority/service/AuthorityService.java
View file @ 85a1e5fb
package com.pangding.web.authority.service;
import com.pangding.web.authority.vo.AuthorityVo;
import com.pangding.web.authority.vo.reqvo.*;
import com.pangding.web.authority.vo.resvo.AuthorityListByLevelResVo;
import com.pangding.web.authority.vo.resvo.AuthorityListResVo;
import com.pangding.web.authority.vo.resvo.AuthorityResVo;
import com.pangding.web.authority.vo.resvo.WebAuthorityResVo;
import com.pangding.web.vo.system.pd.authority.AuthorityVo;
import com.yanzuoguang.util.vo.PageSizeData;
import java.util.List;
......
src/main/java/com/pangding/web/authority/service/CompanyService.java
View file @ 85a1e5fb
package com.pangding.web.authority.service;
import com.pangding.web.authority.vo.CompanyBankCardVo;
import com.pangding.web.authority.vo.CompanyVo;
import com.pangding.web.authority.vo.reqvo.*;
import com.pangding.web.authority.vo.resvo.*;
import com.pangding.web.vo.system.pd.company.CompanyBankCardVo;
import com.pangding.web.vo.system.pd.company.CompanyVo;
import com.pangding.web.vo.system.req.company.CompanyMoneyUpdateReqVo;
import com.pangding.web.vo.system.res.company.FindCompanyBalanceResVo;
import com.yanzuoguang.util.vo.PageSizeData;
......
src/main/java/com/pangding/web/authority/service/DataService.java
View file @ 85a1e5fb
package com.pangding.web.authority.service;
import com.pangding.web.authority.vo.reqvo.DataSynReqVo;
import com.pangding.web.authority.vo.resvo.FindResVo;
import com.pangding.web.authority.vo.resvo.OrderStepOneResVo;
import com.pangding.web.authority.vo.resvo.OrderStepThreeResVo;
/**
......@@ -13,9 +10,9 @@ import com.pangding.web.authority.vo.resvo.OrderStepThreeResVo;
public interface DataService {
void save(FindResVo reqVo);
void saveOrderStepThree(OrderStepThreeResVo reqVo);
void saveOrderStepOne(OrderStepOneResVo reqVo);
void dataSyn(DataSynReqVo reqVo);
// void saveOrderStepThree(OrderStepThreeResVo reqVo);
//
// void saveOrderStepOne(OrderStepOneResVo reqVo);
//
// void dataSyn(DataSynReqVo reqVo);
}
src/main/java/com/pangding/web/authority/service/PangdingPartnerService.java
View file @ 85a1e5fb
package com.pangding.web.authority.service;
import com.pangding.web.authority.vo.CompanyBankCardVo;
import com.pangding.web.authority.vo.reqvo.*;
import com.pangding.web.authority.vo.resvo.*;
import com.pangding.web.vo.system.pd.company.CompanyBankCardVo;
import java.util.List;
......
src/main/java/com/pangding/web/authority/service/RegisterService.java
View file @ 85a1e5fb
package com.pangding.web.authority.service;
import com.pangding.web.authority.vo.CompanyExtendVo;
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 com.pangding.web.vo.system.pd.company.CompanyExtendVo;
import com.pangding.web.vo.system.pd.company.CompanyVo;
import com.pangding.web.vo.system.req.LoginReqVo;
import org.springframework.web.multipart.commons.CommonsMultipartFile;
......
src/main/java/com/pangding/web/authority/service/RoleService.java
View file @ 85a1e5fb
package com.pangding.web.authority.service;
import com.pangding.web.authority.vo.AuthorityVo;
import com.pangding.web.authority.vo.UserVo;
import com.pangding.web.authority.vo.reqvo.AddReqVo;
import com.pangding.web.authority.vo.reqvo.CountByRoleReqVo;
import com.pangding.web.authority.vo.reqvo.ListRoleReqVo;
import com.pangding.web.authority.vo.reqvo.WebRoleReqVo;
import com.pangding.web.authority.vo.RoleVo;
import com.pangding.web.authority.vo.resvo.WebRoleResVo;
import com.pangding.web.vo.system.pd.authority.AuthorityVo;
import com.pangding.web.vo.system.pd.authority.RoleVo;
import com.yanzuoguang.util.vo.PageSizeData;
import java.util.List;
......
src/main/java/com/pangding/web/authority/service/UserService.java
View file @ 85a1e5fb
......@@ -3,6 +3,7 @@ package com.pangding.web.authority.service;
import com.pangding.web.authority.vo.reqvo.*;
import com.pangding.web.authority.vo.*;
import com.pangding.web.authority.vo.resvo.WebUserResVo;
import com.pangding.web.vo.system.pd.authority.RoleVo;
import com.yanzuoguang.util.vo.PageSizeData;
import java.util.List;
......
src/main/java/com/pangding/web/authority/service/impl/AuthorityServiceImpl.java
View file @ 85a1e5fb
......@@ -9,6 +9,9 @@ import com.pangding.web.authority.vo.resvo.AuthorityListByLevelResVo;
import com.pangding.web.authority.vo.resvo.AuthorityListResVo;
import com.pangding.web.authority.vo.resvo.AuthorityResVo;
import com.pangding.web.authority.vo.resvo.WebAuthorityResVo;
import com.pangding.web.vo.system.pd.authority.AuthorityVo;
import com.pangding.web.vo.system.pd.authority.RoleAuthorityVo;
import com.pangding.web.vo.system.pd.authority.RoleVo;
import com.pangding.web.vo.system.res.authority.RoleAuthorityLoadResVo;
import com.yanzuoguang.util.base.ObjectHelper;
import com.yanzuoguang.util.exception.CodeException;
......
src/main/java/com/pangding/web/authority/service/impl/FinanceServiceImpl.java
View file @ 85a1e5fb
......@@ -3,11 +3,11 @@ package com.pangding.web.authority.service.impl;
import com.pangding.web.authority.dao.CompanyBankCardDao;
import com.pangding.web.authority.dao.CompanyExtendDao;
import com.pangding.web.authority.service.FinanceService;
import com.pangding.web.authority.vo.CompanyBankCardVo;
import com.pangding.web.authority.vo.CompanyExtendVo;
import com.pangding.web.authority.vo.reqvo.CompanyExtendGetReqVo;
import com.pangding.web.authority.vo.reqvo.WithdrawalReqVo;
import com.pangding.web.authority.vo.resvo.WithdrawalResVo;
import com.pangding.web.vo.system.pd.company.CompanyBankCardVo;
import com.pangding.web.vo.system.pd.company.CompanyExtendVo;
import com.yanzuoguang.util.exception.CodeException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......
src/main/java/com/pangding/web/authority/service/impl/IndexServiceImpl.java
View file @ 85a1e5fb
......@@ -4,16 +4,14 @@ import com.pangding.web.authority.dao.CompanyExtendDao;
import com.pangding.web.authority.dao.WechatUserDao;
import com.pangding.web.authority.service.IndexService;
import com.pangding.web.authority.util.TimeConstant;
import com.pangding.web.authority.vo.CompanyExtendVo;
import com.pangding.web.authority.vo.WechatUserVo;
import com.pangding.web.authority.vo.reqvo.*;
import com.pangding.web.vo.system.pd.company.CompanyExtendVo;
import com.yanzuoguang.util.exception.CodeException;
import com.yanzuoguang.util.helper.DateHelper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.sql.Timestamp;
import java.util.*;
/**
......
src/main/java/com/pangding/web/authority/service/impl/PangdingPartnerServiceImpl.java
View file @ 85a1e5fb
......@@ -9,6 +9,9 @@ import com.pangding.web.authority.util.ShareCodeUtil;
import com.pangding.web.authority.vo.*;
import com.pangding.web.authority.vo.reqvo.*;
import com.pangding.web.authority.vo.resvo.*;
import com.pangding.web.vo.system.pd.company.CompanyBankCardVo;
import com.pangding.web.vo.system.pd.company.CompanyExtendVo;
import com.pangding.web.vo.system.pd.company.CompanyVo;
import com.yanzuoguang.util.exception.CodeException;
import com.yanzuoguang.util.helper.DateHelper;
import com.yanzuoguang.util.vo.PageSizeData;
......@@ -95,7 +98,7 @@ public class PangdingPartnerServiceImpl implements PangdingPartnerService {
if (null == companyBankCardVoList || companyBankCardVoList.isEmpty()){
throw new CodeException("该公司暂无银行卡");
}
Collections.sort(companyBankCardVoList);
// Collections.sort(companyBankCardVoList);
return companyBankCardVoList;
}
......@@ -170,7 +173,7 @@ public class PangdingPartnerServiceImpl implements PangdingPartnerService {
List<CompanyBankCardVo> companyBankCardVoList = companyBankCardDaoImpl.loadList(companyBankCardGetReqVo,CompanyBankCardVo.class);
if (null != companyBankCardVoList && !companyBankCardVoList.isEmpty()){
Collections.sort(companyBankCardVoList);
// Collections.sort(companyBankCardVoList);
resVo.setCompanyBankCardVoList(companyBankCardVoList);
}
return resVo;
......
src/main/java/com/pangding/web/authority/service/impl/RegisterServiceImpl.java
View file @ 85a1e5fb
......@@ -12,7 +12,12 @@ import com.pangding.web.authority.vo.resvo.AuthorityListByLevelResVo;
import com.pangding.web.authority.vo.resvo.LoginCompanyResVo;
import com.pangding.web.authority.vo.resvo.SaveCompanyResVo;
import com.pangding.web.util.RSAUtils;
import com.pangding.web.vo.product.pd.merchant.MerchantVo;
import com.pangding.web.vo.system.pd.LoginTokenVo;
import com.pangding.web.vo.system.pd.authority.AuthorityVo;
import com.pangding.web.vo.system.pd.company.CompanyBankCardVo;
import com.pangding.web.vo.system.pd.company.CompanyExtendVo;
import com.pangding.web.vo.system.pd.company.CompanyVo;
import com.pangding.web.vo.system.req.LoginReqVo;
import com.yanzuoguang.token.TokenHelper;
import com.yanzuoguang.util.base.ObjectHelper;
......@@ -280,7 +285,7 @@ public class RegisterServiceImpl implements RegisterService {
CompanyBankCardVo companyBankCardVo = new CompanyBankCardVo();
ObjectHelper.writeWithFrom(companyBankCardVo,bankList.get(0));
companyBankCardVo.setIsDefault(CompanyBankCardConstant.IS_DEFAULT);
companyBankCardVo.setPhone(reqVo.getContactPhone());
companyBankCardVo.setReservedPhone(reqVo.getContactPhone());
companyBankCardVo.setType(reqVo.getCompanyType());
companyBankCardVo.setName(reqVo.getContactName());
companyBankCardVo.setIdCard(reqVo.getContactCode());
......@@ -456,7 +461,7 @@ public class RegisterServiceImpl implements RegisterService {
}catch (Exception e){
resVo.setMerchant(null);
}
Merchant merchant = (Merchant) result.getData();
MerchantVo merchant = (MerchantVo) result.getData();
resVo.setMerchant(merchant);
/*获取用户权限列表*/
......@@ -526,7 +531,7 @@ public class RegisterServiceImpl implements RegisterService {
return resVo;
}
public List<AuthorityListByLevelResVo> getChildList(AuthorityVo authorityVo,List<String> authorityIds){
public List<AuthorityListByLevelResVo> getChildList(AuthorityVo authorityVo, List<String> authorityIds){
List<AuthorityListByLevelResVo> resVoList = new ArrayList<>();
for (int i = 0;i<authorityIds.size();i++) {
AuthorityGetReqVo authorityGetReqVo = new AuthorityGetReqVo();
......@@ -549,7 +554,7 @@ public class RegisterServiceImpl implements RegisterService {
}
}
Collections.sort(resVoList);
// Collections.sort(resVoList);
return resVoList;
}
......@@ -657,7 +662,7 @@ public class RegisterServiceImpl implements RegisterService {
companyBankCardVo.setCompanyId(resCompanyReqVo.getId());
companyBankCardVo.setName(resCompanyReqVo.getContactName());
companyBankCardVo.setIdCard(resCompanyReqVo.getContactCode());
companyBankCardVo.setPhone(resCompanyReqVo.getContactPhone());
companyBankCardVo.setReservedPhone(resCompanyReqVo.getContactPhone());
CompanyBankCardGetReqVo companyBankCardGetReqVo1 = new CompanyBankCardGetReqVo();
companyBankCardGetReqVo1.setBankCardCode(bankList.get(0).getBankCardCode());
CompanyBankCardVo companyBankCardVo2 = companyBankCardDaoImpl.load(companyBankCardGetReqVo1,CompanyBankCardVo.class);
......
src/main/java/com/pangding/web/authority/service/impl/RoleServiceImpl.java
View file @ 85a1e5fb
......@@ -6,6 +6,9 @@ import com.pangding.web.authority.vo.reqvo.*;
import com.pangding.web.authority.service.RoleService;
import com.pangding.web.authority.vo.*;
import com.pangding.web.authority.vo.resvo.WebRoleResVo;
import com.pangding.web.vo.system.pd.authority.AuthorityVo;
import com.pangding.web.vo.system.pd.authority.RoleAuthorityVo;
import com.pangding.web.vo.system.pd.authority.RoleVo;
import com.yanzuoguang.util.base.ObjectHelper;
import com.yanzuoguang.util.exception.CodeException;
import com.yanzuoguang.util.helper.StringHelper;
......
src/main/java/com/pangding/web/authority/service/impl/UserServiceImpl.java
View file @ 85a1e5fb
......@@ -9,6 +9,7 @@ import com.pangding.web.authority.service.UserService;
import com.pangding.web.authority.vo.*;
import com.pangding.web.authority.vo.resvo.WebUserResVo;
import com.pangding.web.util.RSAUtils;
import com.pangding.web.vo.system.pd.authority.RoleVo;
import com.yanzuoguang.util.base.ObjectHelper;
import com.yanzuoguang.util.exception.CodeException;
import com.yanzuoguang.util.helper.StringHelper;
......
src/main/java/com/pangding/web/authority/vo/AuthorityVo.java deleted 100644 → 0
View file @ 9e6c56e5
package com.pangding.web.authority.vo;
import com.yanzuoguang.dao.TableAnnotation;
import com.yanzuoguang.util.helper.DateHelper;
import com.yanzuoguang.util.helper.StringHelper;
import com.yanzuoguang.util.vo.BaseVo;
import com.yanzuoguang.util.vo.InitDao;
import java.io.Serializable;
import java.sql.Timestamp;
/**
* 权限表
* @author zhangjinyao
*/
@TableAnnotation("pd_authority")
public class AuthorityVo extends BaseVo implements InitDao,Comparable<AuthorityVo> {
private String id;
private String pid;
private String name;
private int type;
private String alias;
private String url;
@TableAnnotation("open_mode")
private int openMode;
private String remark;
@TableAnnotation("create_time")
private String createTime;
private Integer sort;
private Integer attribute;
public Integer getAttribute() {
return attribute;
}
public void setAttribute(Integer attribute) {
this.attribute = attribute;
}
public Integer getSort() {
return sort;
}
public void setSort(Integer sort) {
this.sort = sort;
}
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 getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public int getType() {
return type;
}
public void setType(int type) {
this.type = type;
}
public String getAlias() {
return alias;
}
public void setAlias(String alias) {
this.alias = alias;
}
public String getUrl() {
return url;
}
public void setUrl(String url) {
this.url = url;
}
public int getOpenMode() {
return openMode;
}
public void setOpenMode(int openMode) {
this.openMode = openMode;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public String getCreateTime() {
return createTime;
}
public void setCreateTime(String createTime) {
this.createTime = createTime;
}
@Override
public void init() {
this.createTime = StringHelper.getFirst(this.createTime, DateHelper.getNow());
}
@Override
public int compareTo(AuthorityVo authorityVo) {
return this.sort - authorityVo.getSort();
}
}
src/main/java/com/pangding/web/authority/vo/CompanyBankCardVo.java deleted 100644 → 0
View file @ 9e6c56e5
package com.pangding.web.authority.vo;
import com.yanzuoguang.dao.TableAnnotation;
import com.yanzuoguang.util.vo.BaseVo;
import java.io.Serializable;
/**
* @Author zhangjinyao
* @create 2019/5/16 14:17
*/
@TableAnnotation("pd_company_bank_card")
public class CompanyBankCardVo extends BaseVo implements Comparable<CompanyBankCardVo>{
private String id;
@TableAnnotation("bank_card_code")
private String bankCardCode;
@TableAnnotation("bank_name")
private String bankName;
@TableAnnotation("bank_address")
private String bankAddress;
@TableAnnotation("bank_code")
private String bankCode;
private Integer type;
@TableAnnotation("company_id")
private String companyId;
private String name;
@TableAnnotation("ID_card")
private String idCard;
@TableAnnotation("reserved_phone")
private String phone;
private Integer status;
@TableAnnotation("binding_code")
private String bindingCode;
@TableAnnotation("binding_time")
private String bindingTime;
@TableAnnotation("is_default")
private Integer isDefault;
public String getPhone() {
return phone;
}
public void setPhone(String phone) {
this.phone = phone;
}
public Integer getIsDefault() {
return isDefault;
}
public void setIsDefault(Integer isDefault) {
this.isDefault = isDefault;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getBankCardCode() {
return bankCardCode;
}
public void setBankCardCode(String bankCardCode) {
this.bankCardCode = bankCardCode;
}
public String getBankName() {
return bankName;
}
public void setBankName(String bankName) {
this.bankName = bankName;
}
public String getBankAddress() {
return bankAddress;
}
public void setBankAddress(String bankAddress) {
this.bankAddress = bankAddress;
}
public String getBankCode() {
return bankCode;
}
public void setBankCode(String bankCode) {
this.bankCode = bankCode;
}
public Integer getType() {
return type;
}
public void setType(Integer type) {
this.type = type;
}
public String getCompanyId() {
return companyId;
}
public void setCompanyId(String companyId) {
this.companyId = companyId;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getIdCard() {
return idCard;
}
public void setIdCard(String idCard) {
this.idCard = idCard;
}
public Integer getStatus() {
return status;
}
public void setStatus(Integer status) {
this.status = status;
}
public String getBindingCode() {
return bindingCode;
}
public void setBindingCode(String bindingCode) {
this.bindingCode = bindingCode;
}
public String getBindingTime() {
return bindingTime;
}
public void setBindingTime(String bindingTime) {
this.bindingTime = bindingTime;
}
@Override
public int compareTo(CompanyBankCardVo o) {
return o.getIsDefault()-this.isDefault;
}
}
src/main/java/com/pangding/web/authority/vo/CompanyDivideRuleVo.java deleted 100644 → 0
View file @ 9e6c56e5
package com.pangding.web.authority.vo;
import com.yanzuoguang.dao.TableAnnotation;
@TableAnnotation("pd_company_divide_rule")
public class CompanyDivideRuleVo{
@TableAnnotation("id")
private String companyDivideId;
@TableAnnotation("company_id")
private String companyId;
@TableAnnotation("source_value")
private Double sourceValue;
@TableAnnotation("real_source_value")
private Double realSourceValue;
@TableAnnotation("source_explain")
private String sourceExplain;
@TableAnnotation("pass_value")
private Double passValue;
@TableAnnotation("real_pass_value")
private Double realPassValue;
@TableAnnotation("pass_explain")
private String passExplain;
@TableAnnotation("super_value")
private Double superValue;
@TableAnnotation("real_super_value")
private Double realSuperValue;
@TableAnnotation("super_explain")
private String superExplain;
private Double fee;
@TableAnnotation("bonus_type")
private Integer bonusType;
@TableAnnotation("bonus_value")
private Double bonusValue;
@TableAnnotation("real_bonus_value")
private Double realBonusValue;
@TableAnnotation("bonus_explain")
private String bonusExplain;
public String getCompanyDivideId() {
return companyDivideId;
}
public void setCompanyDivideId(String companyDivideId) {
this.companyDivideId = companyDivideId;
}
public String getCompanyId() {
return companyId;
}
public void setCompanyId(String companyId) {
this.companyId = companyId;
}
public Double getSourceValue() {
return sourceValue;
}
public void setSourceValue(Double sourceValue) {
this.sourceValue = sourceValue;
}
public Double getRealSourceValue() {
return realSourceValue;
}
public void setRealSourceValue(Double realSourceValue) {
this.realSourceValue = realSourceValue;
}
public String getSourceExplain() {
return sourceExplain;
}
public void setSourceExplain(String sourceExplain) {
this.sourceExplain = sourceExplain;
}
public Double getPassValue() {
return passValue;
}
public void setPassValue(Double passValue) {
this.passValue = passValue;
}
public Double getRealPassValue() {
return realPassValue;
}
public void setRealPassValue(Double realPassValue) {
this.realPassValue = realPassValue;
}
public String getPassExplain() {
return passExplain;
}
public void setPassExplain(String passExplain) {
this.passExplain = passExplain;
}
public Double getSuperValue() {
return superValue;
}
public void setSuperValue(Double superValue) {
this.superValue = superValue;
}
public double getRealSuperValue() {
return realSuperValue;
}
public void setRealSuperValue(double realSuperValue) {
this.realSuperValue = realSuperValue;
}
public String getSuperExplain() {
return superExplain;
}
public void setSuperExplain(String superExplain) {
this.superExplain = superExplain;
}
public Double getFee() {
return fee;
}
public void setFee(Double fee) {
this.fee = fee;
}
public Integer getBonusType() {
return bonusType;
}
public void setBonusType(Integer bonusType) {
this.bonusType = bonusType;
}
public Double getBonusValue() {
return bonusValue;
}
public void setBonusValue(Double bonusValue) {
this.bonusValue = bonusValue;
}
public Double getRealBonusValue() {
return realBonusValue;
}
public void setRealBonusValue(Double realBonusValue) {
this.realBonusValue = realBonusValue;
}
public String getBonusExplain() {
return bonusExplain;
}
public void setBonusExplain(String bonusExplain) {
this.bonusExplain = bonusExplain;
}
}
src/main/java/com/pangding/web/authority/vo/CompanyExtendVo.java deleted 100644 → 0
View file @ 9e6c56e5
package com.pangding.web.authority.vo;
import com.yanzuoguang.dao.TableAnnotation;
import com.yanzuoguang.util.vo.BaseVo;
import java.io.Serializable;
import java.math.BigDecimal;
/**
* @Author zhangjinyao
* @create 2019/5/16 15:35
*/
@TableAnnotation("pd_company_extend")
public class CompanyExtendVo{
private String id;
@TableAnnotation("QR_code")
private String qrCode;
@TableAnnotation("QR_code_type")
private Integer qrCodeType;
@TableAnnotation("QR_code_url")
private String qrCodeUrl;
/**
* 是否分账
*/
@TableAnnotation("subledger_status")
private Integer subledgerStatus;
/**
* 分账规则
*/
@TableAnnotation("subledger_rule_id")
private String subledgerRuleId;
/**
* 是否分润
*/
@TableAnnotation("divide_status")
private Integer divideStatus;
/**
* 是够可提现
*/
@TableAnnotation("withdraw_total_cash")
private Double withdrawTotalCash;
/**
* 是否扫码支付
*/
@TableAnnotation("scan_code_pay_status")
private Integer scanCodePayStatus;
/**
* 是否邀请
*/
@TableAnnotation("invitation_status")
private Integer invitationStatus;
/**
* 邀请规则
*/
@TableAnnotation("invitation_rule_id")
private String invitationRuleId;
@TableAnnotation("invitation_code")
private String invitationCode;
@TableAnnotation("withdraw_rule")
private Integer withdrawRule;
@TableAnnotation("withdraw_money")
private Double withdrawMoney;
@TableAnnotation("withdraw_fee")
private Double withdrawFee;
@TableAnnotation("withdraw_type")
private String withdrawType;
private Integer grade;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getQrCode() {
return qrCode;
}
public void setQrCode(String qrCode) {
this.qrCode = qrCode;
}
public Integer getQrCodeType() {
return qrCodeType;
}
public void setQrCodeType(Integer qrCodeType) {
this.qrCodeType = qrCodeType;
}
public String getQrCodeUrl() {
return qrCodeUrl;
}
public void setQrCodeUrl(String qrCodeUrl) {
this.qrCodeUrl = qrCodeUrl;
}
public Integer getSubledgerStatus() {
return subledgerStatus;
}
public void setSubledgerStatus(Integer subledgerStatus) {
this.subledgerStatus = subledgerStatus;
}
public String getSubledgerRuleId() {
return subledgerRuleId;
}
public void setSubledgerRuleId(String subledgerRuleId) {
this.subledgerRuleId = subledgerRuleId;
}
public Integer getDivideStatus() {
return divideStatus;
}
public void setDivideStatus(Integer divideStatus) {
this.divideStatus = divideStatus;
}
public Double getWithdrawTotalCash() {
return withdrawTotalCash;
}
public void setWithdrawTotalCash(Double withdrawTotalCash) {
this.withdrawTotalCash = withdrawTotalCash;
}
public Integer getScanCodePayStatus() {
return scanCodePayStatus;
}
public void setScanCodePayStatus(Integer scanCodePayStatus) {
this.scanCodePayStatus = scanCodePayStatus;
}
public Integer getInvitationStatus() {
return invitationStatus;
}
public void setInvitationStatus(Integer invitationStatus) {
this.invitationStatus = invitationStatus;
}
public String getInvitationRuleId() {
return invitationRuleId;
}
public void setInvitationRuleId(String invitationRuleId) {
this.invitationRuleId = invitationRuleId;
}
public String getInvitationCode() {
return invitationCode;
}
public void setInvitationCode(String invitationCode) {
this.invitationCode = invitationCode;
}
public Integer getWithdrawRule() {
return withdrawRule;
}
public void setWithdrawRule(Integer withdrawRule) {
this.withdrawRule = withdrawRule;
}
public Double getWithdrawMoney() {
return withdrawMoney;
}
public void setWithdrawMoney(Double withdrawMoney) {
this.withdrawMoney = withdrawMoney;
}
public Double getWithdrawFee() {
return withdrawFee;
}
public void setWithdrawFee(Double withdrawFee) {
this.withdrawFee = withdrawFee;
}
public String getWithdrawType() {
return withdrawType;
}
public void setWithdrawType(String withdrawType) {
this.withdrawType = withdrawType;
}
public Integer getGrade() {
return grade;
}
public void setGrade(Integer grade) {
this.grade = grade;
}
}
src/main/java/com/pangding/web/authority/vo/CompanyMoneyDateilVo.java deleted 100644 → 0
View file @ 9e6c56e5
package com.pangding.web.authority.vo;
import com.yanzuoguang.dao.TableAnnotation;
@TableAnnotation("pd_company_money_detail")
public class CompanyMoneyDateilVo {
private String id;
@TableAnnotation("company_id")
private String companyId;
private double money;
@TableAnnotation("money_type")
private int moneyType;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getCompanyId() {
return companyId;
}
public void setCompanyId(String companyId) {
this.companyId = companyId;
}
public double getMoney() {
return money;
}
public void setMoney(double money) {
this.money = money;
}
public int getMoneyType() {
return moneyType;
}
public void setMoneyType(int moneyType) {
this.moneyType = moneyType;
}
}
src/main/java/com/pangding/web/authority/vo/CompanyMsgVo.java deleted 100644 → 0
View file @ 9e6c56e5
package com.pangding.web.authority.vo;
import com.yanzuoguang.dao.TableAnnotation;
import com.yanzuoguang.util.vo.BaseVo;
@TableAnnotation("pd_company_msg")
public class CompanyMsgVo extends BaseVo{
/**
* 主键id
*/
@TableAnnotation("id")
private String companyMsgId;
/**
* 消息id
*/
@TableAnnotation("msg_id")
private String msgId;
/**
* 消息位置
*/
@TableAnnotation("msg_location")
private int msgLocation;
/**
* 适用类型
*/
private int type;
/**
* 公司id
*/
@TableAnnotation("company_id")
private String companyId;
/**
* 公司名称
*/
@TableAnnotation("company_name")
private String companyName;
/**
* 商户编号
*/
@TableAnnotation("merchant_id")
private String merchantId;
/**
* 商户名称
*/
@TableAnnotation("merchant_name")
private String merchantName;
public String getCompanyMsgId() {
return companyMsgId;
}
public void setCompanyMsgId(String companyMsgId) {
this.companyMsgId = companyMsgId;
}
public int getMsgLocation() {
return msgLocation;
}
public void setMsgLocation(int msgLocation) {
this.msgLocation = msgLocation;
}
public int getType() {
return type;
}
public void setType(int type) {
this.type = type;
}
public String getCompanyId() {
return companyId;
}
public void setCompanyId(String companyId) {
this.companyId = companyId;
}
public String getCompanyName() {
return companyName;
}
public void setCompanyName(String companyName) {
this.companyName = companyName;
}
public String getMerchantId() {
return merchantId;
}
public void setMerchantId(String merchantId) {
this.merchantId = merchantId;
}
public String getMerchantName() {
return merchantName;
}
public void setMerchantName(String merchantName) {
this.merchantName = merchantName;
}
public String getMsgId() {
return msgId;
}
public void setMsgId(String msgId) {
this.msgId = msgId;
}
}
src/main/java/com/pangding/web/authority/vo/CompanyVo.java deleted 100644 → 0
View file @ 9e6c56e5
package com.pangding.web.authority.vo;
import com.yanzuoguang.dao.TableAnnotation;
import com.yanzuoguang.util.helper.DateHelper;
import com.yanzuoguang.util.helper.StringHelper;
import com.yanzuoguang.util.vo.BaseVo;
import com.yanzuoguang.util.vo.InitDao;
import java.io.Serializable;
import java.sql.Timestamp;
import java.util.List;
/**
* @Author zhangjinyao
* @create 2019/5/13 14:44
*/
@TableAnnotation("pd_company")
public class CompanyVo extends BaseVo implements InitDao {
private String id;
private String pid;
@TableAnnotation("invitation_company_id")
private String invitationCompanyId;
@TableAnnotation("company_name")
private String companyName;
@TableAnnotation("company_type")
private Integer companyType;
@TableAnnotation("business_license_code")
private String businessLicenseCode;
private String address;
@TableAnnotation("company_attribute")
private Integer companyAttribute;
@TableAnnotation("contact_name")
private String contactName;
@TableAnnotation("contact_phone")
private String contactPhone;
@TableAnnotation("contact_code")
private String contactCode;
@TableAnnotation("electromic_agreement_code")
private String electromicAgreementCode;
@TableAnnotation("signing_status")
private Integer signingStatus;
private Integer status;
@TableAnnotation("create_time")
private String createTime;
@TableAnnotation("update_time")
private String updateTime;
private Integer nature;
@TableAnnotation("product_or_interface")
private Integer productOrInterface;
@TableAnnotation("examine_status")
private Integer examineStatus;
@TableAnnotation("examine_failed_reason")
private String examineFailedReason;
private String url;
public String getUrl() {
return url;
}
public void setUrl(String url) {
this.url = url;
}
public String getExamineFailedReason() {
return examineFailedReason;
}
public void setExamineFailedReason(String examineFailedReason) {
this.examineFailedReason = examineFailedReason;
}
public Integer getExamineStatus() {
return examineStatus;
}
public void setExamineStatus(Integer examineStatus) {
this.examineStatus = examineStatus;
}
public Integer getProductOrInterface() {
return productOrInterface;
}
public void setProductOrInterface(Integer productOrInterface) {
this.productOrInterface = productOrInterface;
}
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 getInvitationCompanyId() {
return invitationCompanyId;
}
public void setInvitationCompanyId(String invitationCompanyId) {
this.invitationCompanyId = invitationCompanyId;
}
public String getCompanyName() {
return companyName;
}
public void setCompanyName(String companyName) {
this.companyName = companyName;
}
public Integer getCompanyType() {
return companyType;
}
public void setCompanyType(Integer companyType) {
this.companyType = companyType;
}
public String getBusinessLicenseCode() {
return businessLicenseCode;
}
public void setBusinessLicenseCode(String businessLicenseCode) {
this.businessLicenseCode = businessLicenseCode;
}
public String getAddress() {
return address;
}
public void setAddress(String address) {
this.address = address;
}
public Integer getCompanyAttribute() {
return companyAttribute;
}
public void setCompanyAttribute(Integer companyAttribute) {
this.companyAttribute = companyAttribute;
}
public String getContactName() {
return contactName;
}
public void setContactName(String contactName) {
this.contactName = contactName;
}
public String getContactPhone() {
return contactPhone;
}
public void setContactPhone(String contactPhone) {
this.contactPhone = contactPhone;
}
public String getContactCode() {
return contactCode;
}
public void setContactCode(String contactCode) {
this.contactCode = contactCode;
}
public String getElectromicAgreementCode() {
return electromicAgreementCode;
}
public void setElectromicAgreementCode(String electromicAgreementCode) {
this.electromicAgreementCode = electromicAgreementCode;
}
public Integer getSigningStatus() {
return signingStatus;
}
public void setSigningStatus(Integer signingStatus) {
this.signingStatus = signingStatus;
}
public Integer getStatus() {
return status;
}
public void setStatus(Integer status) {
this.status = status;
}
public String getCreateTime() {
return createTime;
}
public void setCreateTime(String createTime) {
this.createTime = createTime;
}
public String getUpdateTime() {
return updateTime;
}
public void setUpdateTime(String updateTime) {
this.updateTime = updateTime;
}
public Integer getNature() {
return nature;
}
public void setNature(Integer nature) {
this.nature = nature;
}
@Override
public void init() {
this.createTime = StringHelper.getFirst(this.createTime, DateHelper.getNow());
}
}
src/main/java/com/pangding/web/authority/vo/DiscountDetailVo.java deleted 100644 → 0
View file @ 9e6c56e5
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/Merchant.java deleted 100644 → 0
View file @ 9e6c56e5
package com.pangding.web.authority.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yanzuoguang.dao.TableAnnotation;
import com.yanzuoguang.util.vo.BaseVo;
import java.math.BigDecimal;
/**
* @author LBW
* @name 商家（景区）基本信息
* @create 2019-04-28 15:21
*/
public class Merchant extends BaseVo {
public Merchant() {
}
public Merchant(String name, Integer type, String productCompanyId) {
this.name = name;
this.type = type;
this.productCompanyId = productCompanyId;
}
/**
* 主键
*/
private String id;
/**
* 编号
*/
private String code;
/**
* 名称
*/
private String name;
/**
* 经度
*/
private BigDecimal longitude;
/**
* 纬度
*/
private BigDecimal latitude;
/**
* 评分
*/
private BigDecimal score;
/**
* 行政区域编号
*/
@TableAnnotation("area_code")
private String areaCode;
/**
* 行政区域名称
*/
@TableAnnotation("area_name")
private String areaName;
/**
* 地址
*/
private String address;
/**
* 类型（1：景区；2：餐饮；3：酒店）
*/
private Integer type;
/**
* 标签
*/
private String tag;
/**
* 等级
*/
private String level;
/**
* 状态（0：上架；1：下架）
*/
private Integer status;
/**
* 游玩耗时
*/
@TableAnnotation("time_spent")
private String timeSpent;
/**
* 电话
*/
private String phone;
/**
* 商家简介
*/
private String synopsis;
/**
* 供应商
*/
@TableAnnotation("product_company_id")
private String productCompanyId;
/**
* 供应商名称
*/
@TableAnnotation("product_company_name")
private String productCompanyName;
/**
* 接口商
*/
@TableAnnotation("interface_company_id")
private String interfaceCompanyId;
@TableAnnotation("interface_company_Name")
private String interfaceCompanyName;
/**
* 营业时间(开始)
*/
@TableAnnotation("business_start")
private String businessStart;
/**
* 营业时间(结束)
*/
@TableAnnotation("business_end")
private String businessEnd;
/**
* 创建时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableAnnotation("create_time")
private String createTime;
/**
* 创建者ID
*/
@TableAnnotation("user_id")
private String userId;
/**
* 创建者
*/
private String username;
/**
* 来源
*/
private String source;
public String getProductCompanyName() {
return productCompanyName;
}
public void setProductCompanyName(String productCompanyName) {
this.productCompanyName = productCompanyName;
}
public String getSource() {
return source;
}
public void setSource(String source) {
this.source = source;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public BigDecimal getLongitude() {
return longitude;
}
public void setLongitude(BigDecimal longitude) {
this.longitude = longitude;
}
public BigDecimal getLatitude() {
return latitude;
}
public void setLatitude(BigDecimal latitude) {
this.latitude = latitude;
}
public BigDecimal getScore() {
return score;
}
public void setScore(BigDecimal score) {
this.score = score;
}
public String getAreaCode() {
return areaCode;
}
public void setAreaCode(String areaCode) {
this.areaCode = areaCode;
}
public String getAreaName() {
return areaName;
}
public void setAreaName(String areaName) {
this.areaName = areaName;
}
public String getAddress() {
return address;
}
public void setAddress(String address) {
this.address = address;
}
public Integer getType() {
return type;
}
public void setType(Integer type) {
this.type = type;
}
public String getTag() {
return tag;
}
public void setTag(String tag) {
this.tag = tag;
}
public String getLevel() {
return level;
}
public void setLevel(String level) {
this.level = level;
}
public Integer getStatus() {
return status;
}
public void setStatus(Integer status) {
this.status = status;
}
public String getTimeSpent() {
return timeSpent;
}
public void setTimeSpent(String timeSpent) {
this.timeSpent = timeSpent;
}
public String getPhone() {
return phone;
}
public void setPhone(String phone) {
this.phone = phone;
}
public String getProductCompanyId() {
return productCompanyId;
}
public void setProductCompanyId(String productCompanyId) {
this.productCompanyId = productCompanyId;
}
public String getInterfaceCompanyId() {
return interfaceCompanyId;
}
public void setInterfaceCompanyId(String interfaceCompanyId) {
this.interfaceCompanyId = interfaceCompanyId;
}
public String getBusinessStart() {
return businessStart;
}
public void setBusinessStart(String businessStart) {
this.businessStart = businessStart;
}
public String getBusinessEnd() {
return businessEnd;
}
public void setBusinessEnd(String businessEnd) {
this.businessEnd = businessEnd;
}
public String getCreateTime() {
return createTime;
}
public void setCreateTime(String createTime) {
this.createTime = createTime;
}
public String getUserId() {
return userId;
}
public void setUserId(String userId) {
this.userId = userId;
}
public String getUsername() {
return username;
}
public void setUsername(String username) {
this.username = username;
}
public String getInterfaceCompanyName() {
return interfaceCompanyName;
}
public void setInterfaceCompanyName(String interfaceCompanyName) {
this.interfaceCompanyName = interfaceCompanyName;
}
public String getSynopsis() {
return synopsis;
}
public void setSynopsis(String synopsis) {
this.synopsis = synopsis;
}
}
src/main/java/com/pangding/web/authority/vo/MsgVo.java deleted 100644 → 0
View file @ 9e6c56e5
package com.pangding.web.authority.vo;
import com.yanzuoguang.dao.TableAnnotation;
@TableAnnotation("pd_msg")
public class MsgVo {
/**
* 主键
*/
@TableAnnotation("id")
private String msgId;
@TableAnnotation("msg_title")
private String msgTitle;
@TableAnnotation("msg_content")
private String msgContent;
@TableAnnotation("msg_url")
private String msgUrl;
@TableAnnotation("msg_pic_url")
private String msgPicUrl;
@TableAnnotation("msg_type")
private int msgType;
@TableAnnotation("msg_status")
private int msgStatus;
@TableAnnotation("msg_sort")
private int msgSort;
public String getMsgId() {
return msgId;
}
public void setMsgId(String msgId) {
this.msgId = msgId;
}
public String getMsgTitle() {
return msgTitle;
}
public void setMsgTitle(String msgTitle) {
this.msgTitle = msgTitle;
}
public String getMsgUrl() {
return msgUrl;
}
public void setMsgUrl(String msgUrl) {
this.msgUrl = msgUrl;
}
public String getMsgPicUrl() {
return msgPicUrl;
}
public void setMsgPicUrl(String msgPicUrl) {
this.msgPicUrl = msgPicUrl;
}
public int getMsgType() {
return msgType;
}
public void setMsgType(int msgType) {
this.msgType = msgType;
}
public int getMsgStatus() {
return msgStatus;
}
public void setMsgStatus(int msgStatus) {
this.msgStatus = msgStatus;
}
public int getMsgSort() {
return msgSort;
}
public void setMsgSort(int msgSort) {
this.msgSort = msgSort;
}
public String getMsgContent() {
return msgContent;
}
public void setMsgContent(String msgContent) {
this.msgContent = msgContent;
}
}
src/main/java/com/pangding/web/authority/vo/OrderExtendVo.java deleted 100644 → 0
View file @ 9e6c56e5
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 deleted 100644 → 0
View file @ 9e6c56e5
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 {
/**
* 编号
*/
@TableAnnotation("id")
private String id;
/**
* 订单编号
*/
@TableAnnotation("order_id")
private String orderId;
/**
* 胖丁退款金额
*/
@TableAnnotation("pd_refund_money")
private double pdRefundMoney;
/**
* 退款金额
*/
@TableAnnotation("refund_money")
private double refundMoney;
/**
* 胖丁退款手续费
*/
@TableAnnotation("pd_refund_fee")
private double pdRefundFee;
/**
* 退款手续费
*/
@TableAnnotation("refund_fee")
private double refundFee;
/**
* 退款理由
*/
@TableAnnotation("refund_reason")
private String refundReason;
/**
* 退款状态
*/
@TableAnnotation("refund_status")
private int refundStatus;
/**
* 退款时间
*/
@TableAnnotation("refund_date")
private String refundDate;
/**
* 失败原因
*/
@TableAnnotation("error_message")
private String errorMessage;
@TableAnnotation("tonglian_id")
private String tonglianId;
@TableAnnotation("pay_refund_id")
private String payRefundId;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getOrderId() {
return orderId;
}
public void setOrderId(String orderId) {
this.orderId = orderId;
}
public double getPdRefundMoney() {
return pdRefundMoney;
}
public void setPdRefundMoney(double pdRefundMoney) {
this.pdRefundMoney = pdRefundMoney;
}
public double getRefundMoney() {
return refundMoney;
}
public void setRefundMoney(double refundMoney) {
this.refundMoney = refundMoney;
}
public double getPdRefundFee() {
return pdRefundFee;
}
public void setPdRefundFee(double pdRefundFee) {
this.pdRefundFee = pdRefundFee;
}
public double getRefundFee() {
return refundFee;
}
public void setRefundFee(double refundFee) {
this.refundFee = refundFee;
}
public String getRefundReason() {
return refundReason;
}
public void setRefundReason(String refundReason) {
this.refundReason = refundReason;
}
public int getRefundStatus() {
return refundStatus;
}
public void setRefundStatus(int refundStatus) {
this.refundStatus = refundStatus;
}
public String getRefundDate() {
return refundDate;
}
public void setRefundDate(String refundDate) {
this.refundDate = refundDate;
}
public String getErrorMessage() {
return errorMessage;
}
public void setErrorMessage(String errorMessage) {
this.errorMessage = errorMessage;
}
public String getTonglianId() {
return tonglianId;
}
public void setTonglianId(String tonglianId) {
this.tonglianId = tonglianId;
}
public String getPayRefundId() {
return payRefundId;
}
public void setPayRefundId(String payRefundId) {
this.payRefundId = payRefundId;
}
}
src/main/java/com/pangding/web/authority/vo/OrderRelVo.java deleted 100644 → 0
View file @ 9e6c56e5
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 deleted 100644 → 0
View file @ 9e6c56e5
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 deleted 100644 → 0
View file @ 9e6c56e5
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/cloudvo/LoginResVo.java
View file @ 85a1e5fb
......@@ -3,6 +3,7 @@ package com.pangding.web.authority.vo.cloudvo;
import com.pangding.web.authority.vo.*;
import com.pangding.web.authority.vo.resvo.AuthorityListByLevelResVo;
import com.pangding.web.authority.vo.resvo.LoginCompanyResVo;
import com.pangding.web.vo.product.pd.merchant.MerchantVo;
import java.util.List;
......@@ -28,13 +29,13 @@ public class LoginResVo {
private List<AuthorityListByLevelResVo> authorityListByLevel;
private Merchant merchant;
private MerchantVo merchant;
public Merchant getMerchant() {
public MerchantVo getMerchant() {
return merchant;
}
public void setMerchant(Merchant merchant) {
public void setMerchant(MerchantVo merchant) {
this.merchant = merchant;
}
......
src/main/java/com/pangding/web/authority/vo/reqvo/BankSubmitReqVo.java
View file @ 85a1e5fb
package com.pangding.web.authority.vo.reqvo;
import com.pangding.web.authority.vo.CompanyBankCardVo;
import com.pangding.web.vo.system.pd.company.CompanyBankCardVo;
/**
* @Author zhangjinyao
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment