Skip to content

T
tcm-system
Commit 07b70813 authored by tangf's avatar tangf
Browse files
Options

1

parent f36294bc
Hide whitespace changes
Inline Side-by-side
Showing with 572 additions and 272 deletions
src/main/java/com/pangding/web/authority/controller/DataController.java
View file @ 07b70813
package com.pangding.web.authority.controller; package com.pangding.web.authority.controller;
import com.pangding.web.authority.service.DataService; 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.FindResVo;
import com.pangding.web.authority.vo.resvo.OrderStepOneResVo; import com.pangding.web.authority.vo.resvo.OrderStepOneResVo;
import com.pangding.web.authority.vo.resvo.OrderStepThreeResVo; import com.pangding.web.authority.vo.resvo.OrderStepThreeResVo;
...@@ -39,4 +40,10 @@ public class DataController { ...@@ -39,4 +40,10 @@ public class DataController {
dataServiceImpl.saveOrderStepOne(reqVo); dataServiceImpl.saveOrderStepOne(reqVo);
return new ResponseResult(); 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/service/DataService.java
View file @ 07b70813
package com.pangding.web.authority.service; 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.FindResVo;
import com.pangding.web.authority.vo.resvo.OrderStepOneResVo; import com.pangding.web.authority.vo.resvo.OrderStepOneResVo;
import com.pangding.web.authority.vo.resvo.OrderStepThreeResVo; import com.pangding.web.authority.vo.resvo.OrderStepThreeResVo;
...@@ -15,4 +16,6 @@ public interface DataService { ...@@ -15,4 +16,6 @@ public interface DataService {
void saveOrderStepThree(OrderStepThreeResVo reqVo); void saveOrderStepThree(OrderStepThreeResVo reqVo);
void saveOrderStepOne(OrderStepOneResVo reqVo); void saveOrderStepOne(OrderStepOneResVo reqVo);
void dataSyn(DataSynReqVo reqVo);
} }
src/main/java/com/pangding/web/authority/service/impl/AuthorityServiceImpl.java
View file @ 07b70813
...@@ -260,7 +260,12 @@ public class AuthorityServiceImpl implements AuthorityService { ...@@ -260,7 +260,12 @@ public class AuthorityServiceImpl implements AuthorityService {
AuthorityGetReqVo authorityGetReqVo = new AuthorityGetReqVo(); AuthorityGetReqVo authorityGetReqVo = new AuthorityGetReqVo();
authorityGetReqVo.setId(authorityVo.getPid()); authorityGetReqVo.setId(authorityVo.getPid());
AuthorityVo parent = authorityDao.load(authorityGetReqVo,AuthorityVo.class); AuthorityVo parent = authorityDao.load(authorityGetReqVo,AuthorityVo.class);
resVo.setParentName(parent.getName()); if(!StringHelper.isEmpty(parent)){
resVo.setParentName(parent.getName());
}else{
System.out.println("id:" + authorityVo.getPid());
}
} }
webAuthorityResVoList.add(resVo); webAuthorityResVoList.add(resVo);
} }
...@@ -289,7 +294,7 @@ public class AuthorityServiceImpl implements AuthorityService { ...@@ -289,7 +294,7 @@ public class AuthorityServiceImpl implements AuthorityService {
roleGetReqVo.setCompanyId(reqVo.getCompanyId()); roleGetReqVo.setCompanyId(reqVo.getCompanyId());
roleGetReqVo.setIsAdmin(1); roleGetReqVo.setIsAdmin(1);
RoleVo roleVo = roleDaoImpl.load(roleGetReqVo,RoleVo.class); RoleVo roleVo = roleDaoImpl.load(roleGetReqVo,RoleVo.class);
if (roleVo == null){ if (StringHelper.isEmpty(roleVo)){
throw new CodeException("该公司用户未设置管理员角色"); throw new CodeException("该公司用户未设置管理员角色");
} }
Set authorityIdSet = new HashSet(); Set authorityIdSet = new HashSet();
...@@ -311,7 +316,7 @@ public class AuthorityServiceImpl implements AuthorityService { ...@@ -311,7 +316,7 @@ public class AuthorityServiceImpl implements AuthorityService {
AuthorityGetReqVo authorityGetReqVo = new AuthorityGetReqVo(); AuthorityGetReqVo authorityGetReqVo = new AuthorityGetReqVo();
authorityGetReqVo.setId(authorityIdList.get(i)); authorityGetReqVo.setId(authorityIdList.get(i));
AuthorityVo authorityVo = authorityDao.load(authorityGetReqVo,AuthorityVo.class); AuthorityVo authorityVo = authorityDao.load(authorityGetReqVo,AuthorityVo.class);
if (null == authorityVo.getPid() || authorityVo.getPid().isEmpty()){ if (!StringHelper.isEmpty(authorityVo) && StringHelper.isEmpty(authorityVo.getPid())){
levelOneList.add(authorityVo); levelOneList.add(authorityVo);
authorityIdList.set(i,""); authorityIdList.set(i,"");
} }
......
src/main/java/com/pangding/web/authority/service/impl/DataServiceImpl.java
View file @ 07b70813
...@@ -3,12 +3,13 @@ package com.pangding.web.authority.service.impl; ...@@ -3,12 +3,13 @@ package com.pangding.web.authority.service.impl;
import com.pangding.web.authority.dao.*; import com.pangding.web.authority.dao.*;
import com.pangding.web.authority.service.DataService; import com.pangding.web.authority.service.DataService;
import com.pangding.web.authority.util.CompanyConstant; 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.*;
import com.pangding.web.authority.vo.reqvo.*; import com.pangding.web.authority.vo.reqvo.*;
import com.pangding.web.authority.vo.resvo.FindResVo; import com.pangding.web.authority.vo.resvo.FindResVo;
import com.pangding.web.authority.vo.resvo.OrderStepOneResVo; import com.pangding.web.authority.vo.resvo.OrderStepOneResVo;
import com.pangding.web.authority.vo.resvo.OrderStepThreeResVo; import com.pangding.web.authority.vo.resvo.OrderStepThreeResVo;
import com.yanzuoguang.util.base.ObjectHelper;
import com.yanzuoguang.util.exception.CodeException;
import com.yanzuoguang.util.helper.StringHelper; import com.yanzuoguang.util.helper.StringHelper;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -62,9 +63,9 @@ public class DataServiceImpl implements DataService { ...@@ -62,9 +63,9 @@ public class DataServiceImpl implements DataService {
companyVo.setPid(tyyCompanyVo.getPid()); companyVo.setPid(tyyCompanyVo.getPid());
companyVo.setInvitationCompanyId(tyyCompanyVo.getInvatationId()); companyVo.setInvitationCompanyId(tyyCompanyVo.getInvatationId());
companyVo.setNature(tyyCompanyVo.getCompanyType()); companyVo.setNature(tyyCompanyVo.getCompanyType());
if (tyyCompanyVo.getCompanyType() == 1 || tyyCompanyVo.getCompanyType() == 2){ if (tyyCompanyVo.getCompanyType() == 1 || tyyCompanyVo.getCompanyType() == 2) {
companyVo.setCompanyType(1); companyVo.setCompanyType(1);
}else if (tyyCompanyVo.getCompanyType() == 3){ } else if (tyyCompanyVo.getCompanyType() == 3) {
companyVo.setCompanyType(0); companyVo.setCompanyType(0);
} }
companyVo.setCompanyName(tyyCompanyVo.getCompanyName()); companyVo.setCompanyName(tyyCompanyVo.getCompanyName());
...@@ -75,27 +76,27 @@ public class DataServiceImpl implements DataService { ...@@ -75,27 +76,27 @@ public class DataServiceImpl implements DataService {
companyVo.setContactPhone(tyyCompanyVo.getContactTel()); companyVo.setContactPhone(tyyCompanyVo.getContactTel());
companyVo.setStatus(tyyCompanyVo.getStatus()); companyVo.setStatus(tyyCompanyVo.getStatus());
companyVo.setCreateTime(tyyCompanyVo.getCreateTime()); companyVo.setCreateTime(tyyCompanyVo.getCreateTime());
if (null == enterpriseVo.getExamine()){ if (null == enterpriseVo.getExamine()) {
companyVo.setExamineStatus(0); companyVo.setExamineStatus(0);
}else { } else {
companyVo.setExamineStatus(Integer.parseInt(enterpriseVo.getExamine())); companyVo.setExamineStatus(Integer.parseInt(enterpriseVo.getExamine()));
} }
if (null == enterpriseVo.getUsertype()){ if (null == enterpriseVo.getUsertype()) {
companyVo.setCompanyAttribute(0); companyVo.setCompanyAttribute(0);
}else { } else {
companyVo.setCompanyAttribute(Integer.parseInt(enterpriseVo.getUsertype())); companyVo.setCompanyAttribute(Integer.parseInt(enterpriseVo.getUsertype()));
} }
companyVo.setProductOrInterface(CompanyConstant.PRODUCT); companyVo.setProductOrInterface(CompanyConstant.PRODUCT);
if (null != tyyCompanyExtendVo ){ if (null != tyyCompanyExtendVo) {
companyVo.setElectromicAgreementCode(tyyCompanyExtendVo.getCode()); companyVo.setElectromicAgreementCode(tyyCompanyExtendVo.getCode());
companyVo.setSigningStatus(tyyCompanyExtendVo.getStatus()); companyVo.setSigningStatus(tyyCompanyExtendVo.getStatus());
} }
CompanyGetReqVo companyGetReqVo = new CompanyGetReqVo(); CompanyGetReqVo companyGetReqVo = new CompanyGetReqVo();
companyGetReqVo.setId(companyVo.getId()); companyGetReqVo.setId(companyVo.getId());
CompanyVo companyVo1 = companyDaoImpl.load(companyGetReqVo,CompanyVo.class); CompanyVo companyVo1 = companyDaoImpl.load(companyGetReqVo, CompanyVo.class);
if (null == companyVo1){ if (null == companyVo1) {
companyDaoImpl.create(companyVo); companyDaoImpl.create(companyVo);
}else{ } else {
companyDaoImpl.update(companyVo); companyDaoImpl.update(companyVo);
} }
...@@ -113,10 +114,10 @@ public class DataServiceImpl implements DataService { ...@@ -113,10 +114,10 @@ public class DataServiceImpl implements DataService {
userVo.setIsFirst(1); userVo.setIsFirst(1);
UserGetReqVo userGetReqVo = new UserGetReqVo(); UserGetReqVo userGetReqVo = new UserGetReqVo();
userGetReqVo.setAccount(userVo.getAccount()); userGetReqVo.setAccount(userVo.getAccount());
UserVo userVo1 = userDaoImpl.load(userGetReqVo,UserVo.class); UserVo userVo1 = userDaoImpl.load(userGetReqVo, UserVo.class);
if (null == userVo1){ if (null == userVo1) {
userDaoImpl.create(userVo); userDaoImpl.create(userVo);
}else{ } else {
userVo.setId(userVo1.getId()); userVo.setId(userVo1.getId());
userDaoImpl.update(userVo); userDaoImpl.update(userVo);
} }
...@@ -127,26 +128,26 @@ public class DataServiceImpl implements DataService { ...@@ -127,26 +128,26 @@ public class DataServiceImpl implements DataService {
companyExtendVo.setQrCodeUrl(enterpriseVo.getQrcodepath()); companyExtendVo.setQrCodeUrl(enterpriseVo.getQrcodepath());
companyExtendVo.setQrCode(enterpriseVo.getQrcodesrc()); companyExtendVo.setQrCode(enterpriseVo.getQrcodesrc());
companyExtendVo.setInvitationCode(enterpriseVo.getInvitationCode()); companyExtendVo.setInvitationCode(enterpriseVo.getInvitationCode());
if (null == enterpriseVo.getIsShare()){ if (null == enterpriseVo.getIsShare()) {
companyExtendVo.setDivideStatus(0); companyExtendVo.setDivideStatus(0);
}else { } else {
companyExtendVo.setDivideStatus(Integer.parseInt(enterpriseVo.getIsShare())); companyExtendVo.setDivideStatus(Integer.parseInt(enterpriseVo.getIsShare()));
} }
if (null != tyyCompanyExtendVo ){ if (null != tyyCompanyExtendVo) {
companyExtendVo.setWithdrawTotalCash(tyyCompanyExtendVo.getMoney()); companyExtendVo.setWithdrawTotalCash(tyyCompanyExtendVo.getMoney());
} }
CompanyExtendGetReqVo companyExtendGetReqVo = new CompanyExtendGetReqVo(); CompanyExtendGetReqVo companyExtendGetReqVo = new CompanyExtendGetReqVo();
companyExtendGetReqVo.setId(companyExtendVo.getId()); companyExtendGetReqVo.setId(companyExtendVo.getId());
CompanyExtendVo companyExtendVo1 = companyExtendDaoImpl.load(companyExtendGetReqVo,CompanyExtendVo.class); CompanyExtendVo companyExtendVo1 = companyExtendDaoImpl.load(companyExtendGetReqVo, CompanyExtendVo.class);
if (null == companyExtendVo1){ if (null == companyExtendVo1) {
companyExtendDaoImpl.create(companyExtendVo); companyExtendDaoImpl.create(companyExtendVo);
}else{ } else {
companyExtendDaoImpl.update(companyExtendVo); companyExtendDaoImpl.update(companyExtendVo);
} }
/*保存银行卡表*/ /*保存银行卡表*/
Boolean flag = true; Boolean flag = true;
for (EnterpriseBankVo enterpriseBankVo:enterpriseBankVoList) { for (EnterpriseBankVo enterpriseBankVo : enterpriseBankVoList) {
CompanyBankCardVo companyBankCardVo = new CompanyBankCardVo(); CompanyBankCardVo companyBankCardVo = new CompanyBankCardVo();
companyBankCardVo.setId(enterpriseBankVo.getId()); companyBankCardVo.setId(enterpriseBankVo.getId());
companyBankCardVo.setName(enterpriseBankVo.getName()); companyBankCardVo.setName(enterpriseBankVo.getName());
...@@ -161,16 +162,16 @@ public class DataServiceImpl implements DataService { ...@@ -161,16 +162,16 @@ public class DataServiceImpl implements DataService {
companyBankCardVo.setStatus(enterpriseBankVo.getBankStatus()); companyBankCardVo.setStatus(enterpriseBankVo.getBankStatus());
companyBankCardVo.setBindingCode(enterpriseBankVo.getBindId()); companyBankCardVo.setBindingCode(enterpriseBankVo.getBindId());
companyBankCardVo.setBindingTime(enterpriseBankVo.getBindDate()); companyBankCardVo.setBindingTime(enterpriseBankVo.getBindDate());
if (flag){ if (flag) {
companyBankCardVo.setIsDefault(1); companyBankCardVo.setIsDefault(1);
flag = false; flag = false;
} }
CompanyBankCardGetReqVo companyBankCardGetReqVo = new CompanyBankCardGetReqVo(); CompanyBankCardGetReqVo companyBankCardGetReqVo = new CompanyBankCardGetReqVo();
companyBankCardGetReqVo.setId(companyBankCardVo.getId()); companyBankCardGetReqVo.setId(companyBankCardVo.getId());
CompanyBankCardVo companyBankCardVo1 = companyBankCardDaoImpl.load(companyBankCardGetReqVo,CompanyBankCardVo.class); CompanyBankCardVo companyBankCardVo1 = companyBankCardDaoImpl.load(companyBankCardGetReqVo, CompanyBankCardVo.class);
if (null == companyBankCardVo1){ if (null == companyBankCardVo1) {
companyBankCardDaoImpl.create(companyBankCardVo); companyBankCardDaoImpl.create(companyBankCardVo);
}else{ } else {
companyBankCardDaoImpl.update(companyBankCardVo); companyBankCardDaoImpl.update(companyBankCardVo);
} }
} }
...@@ -185,37 +186,37 @@ public class DataServiceImpl implements DataService { ...@@ -185,37 +186,37 @@ public class DataServiceImpl implements DataService {
TyyTouristVo tyyTouristVo = reqVo.getTyyTouristVo(); TyyTouristVo tyyTouristVo = reqVo.getTyyTouristVo();
OrderRelVo orderRelVo = reqVo.getOrderRelVo(); OrderRelVo orderRelVo = reqVo.getOrderRelVo();
/*OrderVo表*/ /*OrderVo表*/
if (null != tyyOrdersVo){ if (null != tyyOrdersVo) {
saveOrderVoStepThree(tyyOrdersVo,tyyOrderbackVoList,orderRelVo); saveOrderVoStepThree(tyyOrdersVo, tyyOrderbackVoList, orderRelVo);
} }
/*OrderExtendVo表*/ /*OrderExtendVo表*/
if (null != tyyOrdersVo){ if (null != tyyOrdersVo) {
saveOrderExtendVoStepThree(tyyOrdersVo); saveOrderExtendVoStepThree(tyyOrdersVo);
} }
/*OrderRefundVo表*/ /*OrderRefundVo表*/
if (null != tyyOrderbackVoList){ if (null != tyyOrderbackVoList) {
saveOrderRefundVoStepThree(tyyOrderbackVoList); saveOrderRefundVoStepThree(tyyOrderbackVoList);
} }
/*OrderStatusVo表*/ /*OrderStatusVo表*/
if (null != tyyOrdersVo){ if (null != tyyOrdersVo) {
saveOrderStatusVoStepThree(tyyOrdersVo); saveOrderStatusVoStepThree(tyyOrdersVo);
} }
/*OrderTicketDetailVo表*/ /*OrderTicketDetailVo表*/
if (null != tyyOrderdetailsVo && null != tyyOrdersVo){ if (null != tyyOrderdetailsVo && null != tyyOrdersVo) {
saveOrderTicketDetailVoStepThree(tyyOrderdetailsVo,tyyOrdersVo); saveOrderTicketDetailVoStepThree(tyyOrderdetailsVo, tyyOrdersVo);
} }
/*OrderTouristVo表*/ /*OrderTouristVo表*/
if (null != tyyTouristVo){ if (null != tyyTouristVo) {
saveOrderTouristVoStepThree(tyyTouristVo); saveOrderTouristVoStepThree(tyyTouristVo);
} }
/*DiscountDetailVo表*/ /*DiscountDetailVo表*/
if (null != tyyOrdersVo){ if (null != tyyOrdersVo) {
saveDiscountDetailVoStepThree(tyyOrdersVo); saveDiscountDetailVoStepThree(tyyOrdersVo);
} }
} }
...@@ -228,8 +229,8 @@ public class DataServiceImpl implements DataService { ...@@ -228,8 +229,8 @@ public class DataServiceImpl implements DataService {
/*若该order_id存在则跳过,不存在则新增*/ /*若该order_id存在则跳过,不存在则新增*/
DiscountDetailGetReqVo discountDetailGetReqVo = new DiscountDetailGetReqVo(); DiscountDetailGetReqVo discountDetailGetReqVo = new DiscountDetailGetReqVo();
discountDetailGetReqVo.setOrder_id(discountDetailVo.getOrder_id()); discountDetailGetReqVo.setOrder_id(discountDetailVo.getOrder_id());
DiscountDetailVo discountDetailVo1 = discountDetailDao.load(discountDetailGetReqVo,DiscountDetailVo.class); DiscountDetailVo discountDetailVo1 = discountDetailDao.load(discountDetailGetReqVo, DiscountDetailVo.class);
if (null == discountDetailVo1){ if (null == discountDetailVo1) {
discountDetailDao.create(discountDetailVo); discountDetailDao.create(discountDetailVo);
} }
} }
...@@ -245,8 +246,8 @@ public class DataServiceImpl implements DataService { ...@@ -245,8 +246,8 @@ public class DataServiceImpl implements DataService {
/*若该order_id存在则跳过,不存在则新增*/ /*若该order_id存在则跳过,不存在则新增*/
OrderTouristGetReqVo orderTouristGetReqVo = new OrderTouristGetReqVo(); OrderTouristGetReqVo orderTouristGetReqVo = new OrderTouristGetReqVo();
orderTouristGetReqVo.setOrder_id(orderTouristVo.getOrder_id()); orderTouristGetReqVo.setOrder_id(orderTouristVo.getOrder_id());
OrderTouristVo orderTouristVo1 = orderTouristDao.load(orderTouristGetReqVo,OrderTouristVo.class); OrderTouristVo orderTouristVo1 = orderTouristDao.load(orderTouristGetReqVo, OrderTouristVo.class);
if (null == orderTouristVo1){ if (null == orderTouristVo1) {
orderTouristDao.create(orderTouristVo); orderTouristDao.create(orderTouristVo);
} }
} }
...@@ -256,14 +257,14 @@ public class DataServiceImpl implements DataService { ...@@ -256,14 +257,14 @@ public class DataServiceImpl implements DataService {
orderTicketDetailVo.setId(StringHelper.getNewID()); orderTicketDetailVo.setId(StringHelper.getNewID());
orderTicketDetailVo.setVerify_code(tyyOrderdetailsVo.getAuxiliarycode()); orderTicketDetailVo.setVerify_code(tyyOrderdetailsVo.getAuxiliarycode());
orderTicketDetailVo.setOrder_id(tyyOrdersVo.getOrdersn()); orderTicketDetailVo.setOrder_id(tyyOrdersVo.getOrdersn());
if (null == tyyOrderdetailsVo.getCodestatus()){ if (null == tyyOrderdetailsVo.getCodestatus()) {
orderTicketDetailVo.setTicket_status(0); orderTicketDetailVo.setTicket_status(0);
}else { } else {
orderTicketDetailVo.setTicket_status(Integer.parseInt(tyyOrderdetailsVo.getCodestatus())); orderTicketDetailVo.setTicket_status(Integer.parseInt(tyyOrderdetailsVo.getCodestatus()));
} }
if ("1".equals(tyyOrderdetailsVo.getCodestatus())){ if ("1".equals(tyyOrderdetailsVo.getCodestatus())) {
orderTicketDetailVo.setTime(tyyOrderdetailsVo.getChecktime()); orderTicketDetailVo.setTime(tyyOrderdetailsVo.getChecktime());
}else if("2".equals(tyyOrderdetailsVo.getCodestatus())){ } else if ("2".equals(tyyOrderdetailsVo.getCodestatus())) {
orderTicketDetailVo.setTime(tyyOrderdetailsVo.getRefundtime()); orderTicketDetailVo.setTime(tyyOrderdetailsVo.getRefundtime());
} }
orderTicketDetailVo.setTicket_code(tyyOrderdetailsVo.getLinkid()); orderTicketDetailVo.setTicket_code(tyyOrderdetailsVo.getLinkid());
...@@ -271,8 +272,8 @@ public class DataServiceImpl implements DataService { ...@@ -271,8 +272,8 @@ public class DataServiceImpl implements DataService {
/*若该order_id存在则跳过,不存在则新增*/ /*若该order_id存在则跳过,不存在则新增*/
OrderTicketDetailGetReqVo orderTicketDetailGetReqVo = new OrderTicketDetailGetReqVo(); OrderTicketDetailGetReqVo orderTicketDetailGetReqVo = new OrderTicketDetailGetReqVo();
orderTicketDetailGetReqVo.setOrder_id(orderTicketDetailVo.getOrder_id()); orderTicketDetailGetReqVo.setOrder_id(orderTicketDetailVo.getOrder_id());
OrderTicketDetailVo orderTicketDetailVo1 = orderTicketDetailDao.load(orderTicketDetailGetReqVo,OrderTicketDetailVo.class); OrderTicketDetailVo orderTicketDetailVo1 = orderTicketDetailDao.load(orderTicketDetailGetReqVo, OrderTicketDetailVo.class);
if (null == orderTicketDetailVo1){ if (null == orderTicketDetailVo1) {
orderTicketDetailDao.create(orderTicketDetailVo); orderTicketDetailDao.create(orderTicketDetailVo);
} }
} }
...@@ -280,57 +281,57 @@ public class DataServiceImpl implements DataService { ...@@ -280,57 +281,57 @@ public class DataServiceImpl implements DataService {
private void saveOrderStatusVoStepThree(TyyOrdersVo tyyOrdersVo) { private void saveOrderStatusVoStepThree(TyyOrdersVo tyyOrdersVo) {
OrderStatusVo orderStatusVo = new OrderStatusVo(); OrderStatusVo orderStatusVo = new OrderStatusVo();
orderStatusVo.setId(tyyOrdersVo.getOrdersn()); orderStatusVo.setId(tyyOrdersVo.getOrdersn());
if (null == tyyOrdersVo.getPaytype()){ if (null == tyyOrdersVo.getPaytype()) {
orderStatusVo.setPay_type(0); orderStatusVo.setPay_type(0);
}else { } else {
orderStatusVo.setPay_type(Integer.parseInt(tyyOrdersVo.getPaytype())); orderStatusVo.setPay_type(Integer.parseInt(tyyOrdersVo.getPaytype()));
} }
orderStatusVo.setPayment_time(tyyOrdersVo.getPaymenttime()); orderStatusVo.setPayment_time(tyyOrdersVo.getPaymenttime());
if (null == tyyOrdersVo.getPaystatus()){ if (null == tyyOrdersVo.getPaystatus()) {
orderStatusVo.setPayment_status(0); orderStatusVo.setPayment_status(0);
}else { } else {
orderStatusVo.setPayment_status(Integer.parseInt(tyyOrdersVo.getPaystatus())); orderStatusVo.setPayment_status(Integer.parseInt(tyyOrdersVo.getPaystatus()));
} }
if ("1".equals(tyyOrdersVo.getStatus())){ if ("1".equals(tyyOrdersVo.getStatus())) {
orderStatusVo.setOrder_status(2); orderStatusVo.setOrder_status(2);
}else if("3".equals(tyyOrdersVo.getStatus()) && "0".equals(tyyOrdersVo.getPaystatus())){ } else if ("3".equals(tyyOrdersVo.getStatus()) && "0".equals(tyyOrdersVo.getPaystatus())) {
orderStatusVo.setOrder_status(0); orderStatusVo.setOrder_status(0);
}else if("3".equals(tyyOrdersVo.getStatus()) && "1".equals(tyyOrdersVo.getPaystatus())){ } else if ("3".equals(tyyOrdersVo.getStatus()) && "1".equals(tyyOrdersVo.getPaystatus())) {
orderStatusVo.setOrder_status(1); orderStatusVo.setOrder_status(1);
} }
orderStatusVo.setThird_order_id(tyyOrdersVo.getPiaostorderid()); orderStatusVo.setThird_order_id(tyyOrdersVo.getPiaostorderid());
orderStatusVo.setProduct_company_id(tyyOrdersVo.getEnterpriseid()); orderStatusVo.setProduct_company_id(tyyOrdersVo.getEnterpriseid());
orderStatusVo.setPayment_id(tyyOrdersVo.getTongl_third_ordersn()); orderStatusVo.setPayment_id(tyyOrdersVo.getTongl_third_ordersn());
if ("N".equals(tyyOrdersVo.getEmancipated())){ if ("N".equals(tyyOrdersVo.getEmancipated())) {
orderStatusVo.setIs_summarize(0); orderStatusVo.setIs_summarize(0);
}else{ } else {
orderStatusVo.setIs_summarize(1); orderStatusVo.setIs_summarize(1);
} }
orderStatusVo.setSummarize_time(tyyOrdersVo.getEmancipated_date()); orderStatusVo.setSummarize_time(tyyOrdersVo.getEmancipated_date());
if (null == tyyOrdersVo.getProfit_checked()){ if (null == tyyOrdersVo.getProfit_checked()) {
orderStatusVo.setDivide_status(0); orderStatusVo.setDivide_status(0);
}else{ } else {
orderStatusVo.setDivide_status(Integer.parseInt(tyyOrdersVo.getProfit_checked())); orderStatusVo.setDivide_status(Integer.parseInt(tyyOrdersVo.getProfit_checked()));
} }
orderStatusVo.setDivide_time(tyyOrdersVo.getProfit_checked_date()); orderStatusVo.setDivide_time(tyyOrdersVo.getProfit_checked_date());
orderStatusVo.setAgent_company_id(tyyOrdersVo.getFxsid()); orderStatusVo.setAgent_company_id(tyyOrdersVo.getFxsid());
if (null == tyyOrdersVo.getIsdelete()){ if (null == tyyOrdersVo.getIsdelete()) {
orderStatusVo.setIs_delete(0); orderStatusVo.setIs_delete(0);
}else { } else {
orderStatusVo.setIs_delete(Integer.parseInt(tyyOrdersVo.getIsdelete())); orderStatusVo.setIs_delete(Integer.parseInt(tyyOrdersVo.getIsdelete()));
} }
orderStatusVo.setPay_tonglian_id(tyyOrdersVo.getTongl_ordersn()); orderStatusVo.setPay_tonglian_id(tyyOrdersVo.getTongl_ordersn());
/*若该id存在则跳过,不存在则新增*/ /*若该id存在则跳过,不存在则新增*/
OrderStatusGetReqVo orderStatusGetReqVo = new OrderStatusGetReqVo(); OrderStatusGetReqVo orderStatusGetReqVo = new OrderStatusGetReqVo();
orderStatusGetReqVo.setId(orderStatusVo.getId()); orderStatusGetReqVo.setId(orderStatusVo.getId());
OrderStatusVo orderStatusVo1 = orderStatusDaoImpl.load(orderStatusGetReqVo,OrderStatusVo.class); OrderStatusVo orderStatusVo1 = orderStatusDaoImpl.load(orderStatusGetReqVo, OrderStatusVo.class);
if (null == orderStatusVo1){ if (null == orderStatusVo1) {
orderStatusDaoImpl.create(orderStatusVo); orderStatusDaoImpl.create(orderStatusVo);
} }
} }
private void saveOrderRefundVoStepThree(List<TyyOrderbackVo> tyyOrderbackVoList) { private void saveOrderRefundVoStepThree(List<TyyOrderbackVo> tyyOrderbackVoList) {
for (TyyOrderbackVo tyyOrderbackVo:tyyOrderbackVoList) { for (TyyOrderbackVo tyyOrderbackVo : tyyOrderbackVoList) {
OrderRefundVo orderRefundVo = new OrderRefundVo(); OrderRefundVo orderRefundVo = new OrderRefundVo();
orderRefundVo.setId(tyyOrderbackVo.getId()); orderRefundVo.setId(tyyOrderbackVo.getId());
orderRefundVo.setOrder_id(tyyOrderbackVo.getOrdersn()); orderRefundVo.setOrder_id(tyyOrderbackVo.getOrdersn());
...@@ -343,8 +344,8 @@ public class DataServiceImpl implements DataService { ...@@ -343,8 +344,8 @@ public class DataServiceImpl implements DataService {
/*若该id存在则跳过,不存在则新增*/ /*若该id存在则跳过,不存在则新增*/
OrderRefundGetReqVo orderRefundGetReqVo = new OrderRefundGetReqVo(); OrderRefundGetReqVo orderRefundGetReqVo = new OrderRefundGetReqVo();
orderRefundGetReqVo.setId(orderRefundVo.getId()); orderRefundGetReqVo.setId(orderRefundVo.getId());
OrderRefundVo orderRefundVo1 = orderRefundDaoImpl.load(orderRefundGetReqVo,OrderRefundVo.class); OrderRefundVo orderRefundVo1 = orderRefundDaoImpl.load(orderRefundGetReqVo, OrderRefundVo.class);
if (null == orderRefundVo1){ if (null == orderRefundVo1) {
orderRefundDaoImpl.create(orderRefundVo); orderRefundDaoImpl.create(orderRefundVo);
} }
} }
...@@ -361,8 +362,8 @@ public class DataServiceImpl implements DataService { ...@@ -361,8 +362,8 @@ public class DataServiceImpl implements DataService {
orderExtendGetReqVo.setOrder_id(orderExtendVoAddress.getOrder_id()); orderExtendGetReqVo.setOrder_id(orderExtendVoAddress.getOrder_id());
orderExtendGetReqVo.setTitle(orderExtendVoAddress.getTitle()); orderExtendGetReqVo.setTitle(orderExtendVoAddress.getTitle());
/*若该order_id存在则跳过,不存在则新增*/ /*若该order_id存在则跳过,不存在则新增*/
OrderExtendVo orderExtendVo1 = orderExtendDaoImpl.load(orderExtendGetReqVo,OrderExtendVo.class); OrderExtendVo orderExtendVo1 = orderExtendDaoImpl.load(orderExtendGetReqVo, OrderExtendVo.class);
if (null == orderExtendVo1){ if (null == orderExtendVo1) {
orderExtendDaoImpl.create(orderExtendVoAddress); orderExtendDaoImpl.create(orderExtendVoAddress);
} }
/*OrderExtendVo表*/ /*OrderExtendVo表*/
...@@ -376,8 +377,8 @@ public class DataServiceImpl implements DataService { ...@@ -376,8 +377,8 @@ public class DataServiceImpl implements DataService {
orderExtendGetReqVo1.setOrder_id(orderExtendVoTime.getOrder_id()); orderExtendGetReqVo1.setOrder_id(orderExtendVoTime.getOrder_id());
orderExtendGetReqVo1.setTitle(orderExtendVoTime.getTitle()); orderExtendGetReqVo1.setTitle(orderExtendVoTime.getTitle());
/*若该order_id存在则跳过,不存在则新增*/ /*若该order_id存在则跳过,不存在则新增*/
OrderExtendVo orderExtendVo2 = orderExtendDaoImpl.load(orderExtendGetReqVo,OrderExtendVo.class); OrderExtendVo orderExtendVo2 = orderExtendDaoImpl.load(orderExtendGetReqVo, OrderExtendVo.class);
if (null == orderExtendVo2){ if (null == orderExtendVo2) {
orderExtendDaoImpl.create(orderExtendVoTime); orderExtendDaoImpl.create(orderExtendVoTime);
} }
} }
...@@ -387,8 +388,8 @@ public class DataServiceImpl implements DataService { ...@@ -387,8 +388,8 @@ public class DataServiceImpl implements DataService {
double refundFee = 0d; double refundFee = 0d;
double pdRefundMoney = 0d; double pdRefundMoney = 0d;
double refundMoney = 0d; double refundMoney = 0d;
for (TyyOrderbackVo tyyOrderbackVo:tyyOrderbackVoList) { for (TyyOrderbackVo tyyOrderbackVo : tyyOrderbackVoList) {
if (null != tyyOrderbackVo){ if (null != tyyOrderbackVo) {
refundNum += tyyOrderbackVo.getRefundnum(); refundNum += tyyOrderbackVo.getRefundnum();
refundFee += tyyOrderbackVo.getRefundFee(); refundFee += tyyOrderbackVo.getRefundFee();
pdRefundMoney += tyyOrderbackVo.getReceiveMoney() == null ? 0 : tyyOrderbackVo.getReceiveMoney(); pdRefundMoney += tyyOrderbackVo.getReceiveMoney() == null ? 0 : tyyOrderbackVo.getReceiveMoney();
...@@ -396,7 +397,7 @@ public class DataServiceImpl implements DataService { ...@@ -396,7 +397,7 @@ public class DataServiceImpl implements DataService {
} }
} }
OrderVo orderVo = new OrderVo(); OrderVo orderVo = new OrderVo();
if (null != orderRelVo){ if (null != orderRelVo) {
orderVo.setPid(orderRelVo.getGroup_ordersn()); orderVo.setPid(orderRelVo.getGroup_ordersn());
} }
orderVo.setId(tyyOrdersVo.getOrdersn()); orderVo.setId(tyyOrdersVo.getOrdersn());
...@@ -412,28 +413,28 @@ public class DataServiceImpl implements DataService { ...@@ -412,28 +413,28 @@ public class DataServiceImpl implements DataService {
orderVo.setUser_id(tyyOrdersVo.getMemberid()); orderVo.setUser_id(tyyOrdersVo.getMemberid());
orderVo.setTicket_phone(tyyOrdersVo.getUsertel()); orderVo.setTicket_phone(tyyOrdersVo.getUsertel());
orderVo.setCost_price(tyyOrdersVo.getPurchaseprice()); orderVo.setCost_price(tyyOrdersVo.getPurchaseprice());
orderVo.setCost_total_money(tyyOrdersVo.getPurchaseprice()*tyyOrdersVo.getBuynum()); orderVo.setCost_total_money(tyyOrdersVo.getPurchaseprice() * tyyOrdersVo.getBuynum());
if (null != tyyOrdersVo.getDiscountprice() && null != orderVo.getCost_total_money()){ if (null != tyyOrdersVo.getDiscountprice() && null != orderVo.getCost_total_money()) {
orderVo.setOrder_money(orderVo.getCost_total_money()-tyyOrdersVo.getDiscountprice()); orderVo.setOrder_money(orderVo.getCost_total_money() - tyyOrdersVo.getDiscountprice());
} }
orderVo.setRefund_fee(refundFee); orderVo.setRefund_fee(refundFee);
orderVo.setPd_refund_money(pdRefundMoney); orderVo.setPd_refund_money(pdRefundMoney);
orderVo.setDiscount_money(null == tyyOrdersVo.getDiscountprice()?0:tyyOrdersVo.getDiscountprice()); orderVo.setDiscount_money(null == tyyOrdersVo.getDiscountprice() ? 0 : tyyOrdersVo.getDiscountprice());
orderVo.setPd_discount_money(null == tyyOrdersVo.getDiscountprice()?0:tyyOrdersVo.getDiscountprice()); orderVo.setPd_discount_money(null == tyyOrdersVo.getDiscountprice() ? 0 : tyyOrdersVo.getDiscountprice());
orderVo.setRefund_money(refundMoney); orderVo.setRefund_money(refundMoney);
if (null == tyyOrdersVo.getFieldTicket()){ if (null == tyyOrdersVo.getFieldTicket()) {
orderVo.setSub_order_type(0); orderVo.setSub_order_type(0);
}else { } else {
orderVo.setSub_order_type(Integer.parseInt(tyyOrdersVo.getFieldTicket())); orderVo.setSub_order_type(Integer.parseInt(tyyOrdersVo.getFieldTicket()));
} }
orderVo.setPd_order_money(null == tyyOrdersVo.getRealprice()?orderVo.getTotal_money()-orderVo.getPd_discount_money():tyyOrdersVo.getRealprice()); orderVo.setPd_order_money(null == tyyOrdersVo.getRealprice() ? orderVo.getTotal_money() - orderVo.getPd_discount_money() : tyyOrdersVo.getRealprice());
orderVo.setArea_code(tyyOrdersVo.getSight_spot_code()); orderVo.setArea_code(tyyOrdersVo.getSight_spot_code());
orderVo.setOrder_type(1); orderVo.setOrder_type(1);
/*若该id存在则跳过，不存在则新增*/ /*若该id存在则跳过，不存在则新增*/
OrderGetReqVo orderGetReqVo = new OrderGetReqVo(); OrderGetReqVo orderGetReqVo = new OrderGetReqVo();
orderGetReqVo.setId(orderVo.getId()); orderGetReqVo.setId(orderVo.getId());
OrderVo orderVo1 = orderDaoImpl.load(orderGetReqVo,OrderVo.class); OrderVo orderVo1 = orderDaoImpl.load(orderGetReqVo, OrderVo.class);
if (null == orderVo1){ if (null == orderVo1) {
orderDaoImpl.create(orderVo); orderDaoImpl.create(orderVo);
} }
} }
...@@ -444,67 +445,270 @@ public class DataServiceImpl implements DataService { ...@@ -444,67 +445,270 @@ public class DataServiceImpl implements DataService {
TyyOrderVo tyyOrderVo = reqVo.getTyyOrderVo(); TyyOrderVo tyyOrderVo = reqVo.getTyyOrderVo();
TyyOrderMixVo tyyOrderMixVo = reqVo.getTyyOrderMixVo(); TyyOrderMixVo tyyOrderMixVo = reqVo.getTyyOrderMixVo();
List<TyyOrderbackVo> tyyOrderbackVoList = reqVo.getTyyOrderbackVoList(); List<TyyOrderbackVo> tyyOrderbackVoList = reqVo.getTyyOrderbackVoList();
TyyOrderdetailsVo tyyOrderdetailsVo = reqVo.getTyyOrderdetailsVo(); List<TyyOrderdetailsVo> tyyOrderdetailsVoList = reqVo.getTyyOrderdetailsVoList();
TyyTouristVo tyyTouristVo = reqVo.getTyyTouristVo(); List<TyyTouristVo> tyyTouristVoList = reqVo.getTyyTouristVoList();
/*pd_order*/ /*pd_order*/
if (null != tyyOrderVo || null != tyyOrderMixVo){ if (!StringHelper.isEmpty(tyyOrderVo) || !StringHelper.isEmpty(tyyOrderMixVo)) {
saveOrderVoStepOne(tyyOrderVo,tyyOrderMixVo,tyyOrderbackVoList); saveOrderVoStepOne(tyyOrderVo, tyyOrderMixVo, tyyOrderbackVoList);
} }
/*pd_order_status*/ /*pd_order_status*/
if (null != tyyOrderVo || null != tyyOrderMixVo){ if (!StringHelper.isEmpty(tyyOrderVo) || !StringHelper.isEmpty(tyyOrderMixVo)) {
saveOrderStatusVoStepOne(tyyOrderVo,tyyOrderMixVo); saveOrderStatusVoStepOne(tyyOrderVo, tyyOrderMixVo);
} }
/*pd_order_extend*/ /*pd_order_extend*/
if (null != tyyOrderVo || null != tyyOrderMixVo){ if (!StringHelper.isEmpty(tyyOrderVo) || !StringHelper.isEmpty(tyyOrderMixVo)) {
saveOrderExtendVoStepOne(tyyOrderVo,tyyOrderMixVo); saveOrderExtendVoStepOne(tyyOrderVo, tyyOrderMixVo);
} }
/*pd_discount_detail*/ /*pd_discount_detail*/
if (null != tyyOrderVo || null != tyyOrderMixVo){ if (!StringHelper.isEmpty(tyyOrderVo) || !StringHelper.isEmpty(tyyOrderMixVo)) {
saveDiscountDetailVoStepOne(tyyOrderVo,tyyOrderMixVo); saveDiscountDetailVoStepOne(tyyOrderVo, tyyOrderMixVo);
} }
/*pd_order_ticket_detail*/ /*pd_order_ticket_detail*/
if ((null != tyyOrderVo || null != tyyOrderMixVo) && null != tyyOrderdetailsVo){ saveOrderTicketDetailVoStepOne(tyyOrderVo, tyyOrderMixVo, tyyOrderdetailsVoList);
saveOrderTicketDetailVoStepOne(tyyOrderVo,tyyOrderMixVo,tyyOrderdetailsVo);
}
/*pd_order_refund*/ /*pd_order_refund*/
if (null != tyyOrderbackVoList){ if (null != tyyOrderbackVoList) {
saveOrderRefundVoStepOne(tyyOrderbackVoList); saveOrderRefundVoStepOne(tyyOrderbackVoList);
} }
/*OrderTouristVo表*/ /*OrderTouristVo表*/
if (null != tyyTouristVo){ saveOrderTouristVoStepOne(tyyTouristVoList);
saveOrderTouristVoStepOne(tyyTouristVo); }
@Override
@Transactional(rollbackFor = Exception.class)
public void dataSyn(DataSynReqVo reqVo) {
TyyOrderVo tyyOrderVo = reqVo.getTyyOrderVo();
TyyOrdersVo tyyOrdersVo = reqVo.getTyyOrdersVo();
List<TyyOrderbackVo> tyyOrderbackVoList = reqVo.getOrderbackVoList();
List<TyyOrderdetailsVo> tyyOrderdetailsVoList = reqVo.getOrderdetailsVoList();
List<TyyTouristVo> tyyTouristVoList = reqVo.getTouristVoList();
if (StringHelper.isEmpty(tyyOrderVo)) {
throw new CodeException("pdOrder无数据");
} }
savePdOrder(tyyOrderVo, tyyOrdersVo);
/*pd_order_status*/
saveOrderStatus(tyyOrderVo, tyyOrdersVo);
/*pd_order_ticket_detail*/
saveOrderTicketDetail(tyyOrderVo, tyyOrderdetailsVoList);
/*OrderTouristVo表*/
saveOrderTouristVoStepOne(tyyTouristVoList);
/*pd_order_extend*/
saveOrderExtend(tyyOrdersVo);
/*pd_order_refund*/
if (null != tyyOrderbackVoList) {
saveOrderRefundVoStepOne(tyyOrderbackVoList);
}
} }
private void saveOrderTouristVoStepOne(TyyTouristVo tyyTouristVo) { private void savePdOrder(TyyOrderVo tyyOrderVo, TyyOrdersVo tyyOrdersVo) {
OrderTouristVo orderTouristVo = new OrderTouristVo(); OrderVo orderVo = new OrderVo();
orderTouristVo.setId(StringHelper.getNewID());
orderTouristVo.setOrder_id(tyyTouristVo.getOrdersn()); orderVo.setId(tyyOrderVo.getId());
orderTouristVo.setName(tyyTouristVo.getName()); orderVo.setPid(tyyOrderVo.getPid());
orderTouristVo.setPhone(tyyTouristVo.getPhone()); orderVo.setOrder_type(tyyOrderVo.getOrder_type());
orderTouristVo.setCredential_type(tyyTouristVo.getCard_type()); orderVo.setSub_order_type(tyyOrderVo.getSub_order_type());
orderTouristVo.setCredential_number(tyyTouristVo.getIdcard()); if (StringHelper.isEmpty(tyyOrdersVo)) {
String productName = tyyOrderVo.getProduct_name();
int index = productName.indexOf("(");
String merchantName = productName.substring(0,index);
productName = productName.substring(index + 1 , productName.length() - 1);
orderVo.setProduct_name(productName);
orderVo.setMerchant_name(merchantName);
} else {
orderVo.setProduct_name(tyyOrdersVo.getConsignee());
orderVo.setMerchant_name(tyyOrdersVo.getScenicspotname());
}
orderVo.setPlay_date(tyyOrderVo.getPlay_date());
orderVo.setUnit_price(StringHelper.isEmpty(tyyOrderVo.getPrice()) ? 0 : tyyOrderVo.getPrice());
orderVo.setOrder_num(StringHelper.isEmpty(tyyOrderVo.getOrder_num()) ? 0 : tyyOrderVo.getOrder_num());
orderVo.setTotal_money(tyyOrderVo.getSale_price());
orderVo.setPd_order_money(StringHelper.isEmpty(tyyOrderVo.getReal_price()) ? orderVo.getTotal_money() - orderVo.getPd_discount_money() : tyyOrderVo.getReal_price());
orderVo.setCost_price(StringHelper.isEmpty(tyyOrderVo.getSettlement_price()) ? 0 : tyyOrderVo.getSettlement_price());
orderVo.setCost_total_money(StringHelper.isEmpty(tyyOrderVo.getCost_price()) ? orderVo.getTotal_money() - orderVo.getDiscount_money() : tyyOrderVo.getCost_price());
double disPrice = StringHelper.isEmpty(tyyOrderVo.getDiscount_price()) ? 0 : tyyOrderVo.getDiscount_price();
orderVo.setPd_discount_money(disPrice);
orderVo.setDiscount_money(disPrice);
if (orderVo.getMerchant_name().contains("重庆国际马戏城") && disPrice > 0) {
orderVo.setPd_discount_money(disPrice);
orderVo.setDiscount_money(orderVo.getCost_price());
}
if (orderVo.getMerchant_name().contains("两江游朝天系列") && disPrice > 0) {
orderVo.setPd_discount_money(disPrice);
orderVo.setDiscount_money(0d);
}
orderVo.setOrder_money(orderVo.getCost_total_money() - orderVo.getDiscount_money());
orderVo.setOrder_fee(StringHelper.isEmpty(tyyOrderVo.getOrder_poundage_price()) ? 0 : tyyOrderVo.getOrder_poundage_price());
orderVo.setRefund_num(StringHelper.isEmpty(tyyOrderVo.getReturn_num()) ? 0 : tyyOrderVo.getReturn_num());
orderVo.setRefund_money(StringHelper.isEmpty(tyyOrderVo.getReturn_money()) ? 0 : tyyOrderVo.getReturn_money());
orderVo.setPd_refund_money(tyyOrderVo.getReturn_money());
orderVo.setOrder_time(tyyOrderVo.getCreate_date());
orderVo.setProduct_code(tyyOrdersVo.getProductsn());
orderVo.setArea_code(tyyOrdersVo.getSight_spot_code());
/*若存在则修改，不存在则添加*/ /*若存在则修改，不存在则添加*/
OrderTouristGetReqVo orderTouristGetReqVo = new OrderTouristGetReqVo(); OrderGetReqVo orderGetReqVo = new OrderGetReqVo();
orderTouristGetReqVo.setOrder_id(tyyTouristVo.getOrdersn()); orderGetReqVo.setId(orderVo.getId());
OrderTouristVo orderTouristVo1 = orderTouristDao.load(orderTouristGetReqVo,OrderTouristVo.class); OrderVo orderVo1 = orderDaoImpl.load(orderGetReqVo, OrderVo.class);
if (null == orderTouristVo1){ if (null == orderVo1) {
orderTouristDao.create(orderTouristVo); orderDaoImpl.create(orderVo);
}else { } else {
orderTouristVo.setId(orderTouristVo1.getId()); ObjectHelper.writeWithFrom(orderVo1, orderVo);
orderTouristDao.update(orderTouristVo); orderDaoImpl.update(orderVo1);
}
}
private void saveOrderStatus(TyyOrderVo tyyOrderVo, TyyOrdersVo tyyOrdersVo) {
OrderStatusVo orderStatusVo = new OrderStatusVo();
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);
}
}
if (StringHelper.isEmpty(tyyOrdersVo)) {
} else {
orderStatusVo.setPayment_id(tyyOrdersVo.getQueryid());
orderStatusVo.setPay_third_id(tyyOrdersVo.getTongl_third_ordersn());
orderStatusVo.setPay_tonglian_id(tyyOrderVo.getTongl_ordersn());
orderStatusVo.setThird_order_id(tyyOrdersVo.getPiaostorderid());
}
/*若存在则修改，不存在则添加*/
OrderStatusGetReqVo orderStatusGetReqVo = new OrderStatusGetReqVo();
orderStatusGetReqVo.setId(orderStatusVo.getId());
OrderStatusVo orderStatusVo1 = orderStatusDaoImpl.load(orderStatusGetReqVo, OrderStatusVo.class);
if (null == orderStatusVo1) {
orderStatusDaoImpl.create(orderStatusVo);
} else {
ObjectHelper.writeWithFrom(orderStatusVo1, orderStatusVo);
orderStatusDaoImpl.update(orderStatusVo1);
}
}
private void saveOrderTicketDetail(TyyOrderVo tyyOrderVo, List<TyyOrderdetailsVo> tyyOrderdetailsVoList) {
for (int i = 0; i < tyyOrderdetailsVoList.size(); i++) {
OrderTicketDetailVo orderTicketDetailVo = new OrderTicketDetailVo();
TyyOrderdetailsVo tyyOrderdetailsVo = tyyOrderdetailsVoList.get(i);
orderTicketDetailVo.setOrder_id(tyyOrderVo.getId());
orderTicketDetailVo.setId(StringHelper.getNewID());
orderTicketDetailVo.setVerify_code(tyyOrderdetailsVo.getAuxiliarycode());
if (StringHelper.isEmpty(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 saveOrderExtend(TyyOrdersVo tyyOrdersVo) {
if (!StringHelper.isEmpty(tyyOrdersVo) && !StringHelper.isEmpty(tyyOrdersVo.getPlay_address())) {
/*pd_order_extend游玩地址*/
OrderExtendVo orderExtendAddress = new OrderExtendVo();
orderExtendAddress.setId(StringHelper.getNewID());
orderExtendAddress.setOrder_id(tyyOrdersVo.getOrdersn());
orderExtendAddress.setTitle("游玩地址");
orderExtendAddress.setContent(tyyOrdersVo.getPlay_address());
/*若存在则修改，不存在则添加*/
OrderExtendGetReqVo orderExtendGetReqVo = new OrderExtendGetReqVo();
orderExtendGetReqVo.setOrder_id(tyyOrdersVo.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);
}
}
if (!StringHelper.isEmpty(tyyOrdersVo) && !StringHelper.isEmpty(tyyOrdersVo.getPlay_time())) {
/*pd_order_extend游玩时间*/
OrderExtendVo orderExtendDate = new OrderExtendVo();
orderExtendDate.setId(StringHelper.getNewID());
orderExtendDate.setOrder_id(tyyOrdersVo.getOrdersn());
orderExtendDate.setTitle("游玩时间");
orderExtendDate.setContent(tyyOrdersVo.getPlay_time());
/*若存在则修改，不存在则添加*/
OrderExtendGetReqVo orderExtendGetReqVo1 = new OrderExtendGetReqVo();
orderExtendGetReqVo1.setOrder_id(tyyOrdersVo.getOrdersn());
orderExtendGetReqVo1.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 saveOrderTouristVoStepOne(List<TyyTouristVo> tyyTouristVoList) {
for (int i = 0; i < tyyTouristVoList.size(); i++) {
TyyTouristVo tyyTouristVo = tyyTouristVoList.get(i);
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) { private void saveOrderRefundVoStepOne(List<TyyOrderbackVo> tyyOrderbackVoList) {
for (TyyOrderbackVo tyyOrderbackVo:tyyOrderbackVoList) { for (TyyOrderbackVo tyyOrderbackVo : tyyOrderbackVoList) {
OrderRefundVo orderRefundVo = new OrderRefundVo(); OrderRefundVo orderRefundVo = new OrderRefundVo();
orderRefundVo.setId(tyyOrderbackVo.getId()); orderRefundVo.setId(tyyOrderbackVo.getId());
orderRefundVo.setOrder_id(tyyOrderbackVo.getOrdersn()); orderRefundVo.setOrder_id(tyyOrderbackVo.getOrdersn());
...@@ -517,56 +721,59 @@ public class DataServiceImpl implements DataService { ...@@ -517,56 +721,59 @@ public class DataServiceImpl implements DataService {
/*若存在则修改，不存在则添加*/ /*若存在则修改，不存在则添加*/
OrderRefundGetReqVo orderRefundGetReqVo = new OrderRefundGetReqVo(); OrderRefundGetReqVo orderRefundGetReqVo = new OrderRefundGetReqVo();
orderRefundGetReqVo.setId(tyyOrderbackVo.getId()); orderRefundGetReqVo.setId(tyyOrderbackVo.getId());
OrderRefundVo orderRefundVo1 = orderRefundDaoImpl.load(orderRefundGetReqVo,OrderRefundVo.class); OrderRefundVo orderRefundVo1 = orderRefundDaoImpl.load(orderRefundGetReqVo, OrderRefundVo.class);
if (null == orderRefundVo1){ if (null == orderRefundVo1) {
orderRefundDaoImpl.create(orderRefundVo); orderRefundDaoImpl.create(orderRefundVo);
}else{ } else {
orderRefundDaoImpl.update(orderRefundVo); orderRefundDaoImpl.update(orderRefundVo);
} }
} }
} }
private void saveOrderTicketDetailVoStepOne(TyyOrderVo tyyOrderVo, TyyOrderMixVo tyyOrderMixVo, TyyOrderdetailsVo tyyOrderdetailsVo) { private void saveOrderTicketDetailVoStepOne(TyyOrderVo tyyOrderVo, TyyOrderMixVo tyyOrderMixVo, List<TyyOrderdetailsVo> tyyOrderdetailsVoList) {
OrderTicketDetailVo orderTicketDetailVo = new OrderTicketDetailVo(); for (int i = 0; i < tyyOrderdetailsVoList.size(); i++) {
if (null != tyyOrderVo){ OrderTicketDetailVo orderTicketDetailVo = new OrderTicketDetailVo();
orderTicketDetailVo.setOrder_id(tyyOrderVo.getId()); TyyOrderdetailsVo tyyOrderdetailsVo = tyyOrderdetailsVoList.get(i);
}else if(null != tyyOrderMixVo){ if (!StringHelper.isEmpty(tyyOrderVo)) {
orderTicketDetailVo.setOrder_id(tyyOrderMixVo.getOrdersn()); orderTicketDetailVo.setOrder_id(tyyOrderVo.getId());
} } else if (!StringHelper.isEmpty(tyyOrderMixVo)) {
orderTicketDetailVo.setId(StringHelper.getNewID()); orderTicketDetailVo.setOrder_id(tyyOrderMixVo.getOrdersn());
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.setId(StringHelper.getNewID());
orderTicketDetailVo.setTicket_code(tyyOrderdetailsVo.getLinkid()); orderTicketDetailVo.setVerify_code(tyyOrderdetailsVo.getAuxiliarycode());
orderTicketDetailVo.setCode_url(tyyOrderdetailsVo.getPicUrl()); 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 orderTicketDetailGetReqVo = new OrderTicketDetailGetReqVo();
orderTicketDetailGetReqVo.setOrder_id(orderTicketDetailVo.getOrder_id()); orderTicketDetailGetReqVo.setOrder_id(orderTicketDetailVo.getOrder_id());
OrderTicketDetailVo orderTicketDetailVo1 = orderTicketDetailDao.load(orderTicketDetailGetReqVo,OrderTicketDetailVo.class); OrderTicketDetailVo orderTicketDetailVo1 = orderTicketDetailDao.load(orderTicketDetailGetReqVo, OrderTicketDetailVo.class);
if (null == orderTicketDetailVo1){ if (null == orderTicketDetailVo1) {
orderTicketDetailDao.create(orderTicketDetailVo); orderTicketDetailDao.create(orderTicketDetailVo);
}else { } else {
orderTicketDetailVo.setId(orderTicketDetailVo1.getId()); orderTicketDetailVo.setId(orderTicketDetailVo1.getId());
orderTicketDetailDao.update(orderTicketDetailVo); orderTicketDetailDao.update(orderTicketDetailVo);
}
} }
} }
private void saveDiscountDetailVoStepOne(TyyOrderVo tyyOrderVo, TyyOrderMixVo tyyOrderMixVo) { private void saveDiscountDetailVoStepOne(TyyOrderVo tyyOrderVo, TyyOrderMixVo tyyOrderMixVo) {
DiscountDetailVo discountDetailVo = new DiscountDetailVo(); DiscountDetailVo discountDetailVo = new DiscountDetailVo();
if (null != tyyOrderVo){ if (null != tyyOrderVo) {
discountDetailVo.setOrder_id(tyyOrderVo.getId()); discountDetailVo.setOrder_id(tyyOrderVo.getId());
discountDetailVo.setDiscount_money(tyyOrderVo.getDiscount_price()); discountDetailVo.setDiscount_money(tyyOrderVo.getDiscount_price());
}else if(null != tyyOrderMixVo){ } else if (null != tyyOrderMixVo) {
discountDetailVo.setOrder_id(tyyOrderMixVo.getOrdersn()); discountDetailVo.setOrder_id(tyyOrderMixVo.getOrdersn());
discountDetailVo.setDiscount_money(tyyOrderMixVo.getDiscountprice()); discountDetailVo.setDiscount_money(tyyOrderMixVo.getDiscountprice());
} }
...@@ -574,32 +781,32 @@ public class DataServiceImpl implements DataService { ...@@ -574,32 +781,32 @@ public class DataServiceImpl implements DataService {
/*若存在则修改，不存在则添加*/ /*若存在则修改，不存在则添加*/
DiscountDetailGetReqVo discountDetailGetReqVo = new DiscountDetailGetReqVo(); DiscountDetailGetReqVo discountDetailGetReqVo = new DiscountDetailGetReqVo();
discountDetailGetReqVo.setOrder_id(discountDetailVo.getOrder_id()); discountDetailGetReqVo.setOrder_id(discountDetailVo.getOrder_id());
DiscountDetailVo discountDetailVo1 = discountDetailDao.load(discountDetailGetReqVo,DiscountDetailVo.class); DiscountDetailVo discountDetailVo1 = discountDetailDao.load(discountDetailGetReqVo, DiscountDetailVo.class);
if (null == discountDetailVo1){ if (null == discountDetailVo1) {
discountDetailDao.create(discountDetailVo); discountDetailDao.create(discountDetailVo);
}else { } else {
discountDetailVo.setId(discountDetailVo1.getId()); discountDetailVo.setId(discountDetailVo1.getId());
discountDetailDao.update(discountDetailVo); discountDetailDao.update(discountDetailVo);
} }
} }
private void saveOrderExtendVoStepOne(TyyOrderVo tyyOrderVo, TyyOrderMixVo tyyOrderMixVo) { private void saveOrderExtendVoStepOne(TyyOrderVo tyyOrderVo, TyyOrderMixVo tyyOrderMixVo) {
if (null != tyyOrderVo){ if (null != tyyOrderVo) {
OrderExtendVo orderExtendVo = new OrderExtendVo(); OrderExtendVo orderExtendVo = new OrderExtendVo();
orderExtendVo.setId(StringHelper.getNewID()); orderExtendVo.setId(StringHelper.getNewID());
orderExtendVo.setOrder_id(tyyOrderVo.getId()); orderExtendVo.setOrder_id(tyyOrderVo.getId());
/*若存在则修改，不存在则添加*/ /*若存在则修改，不存在则添加*/
OrderExtendGetReqVo orderExtendGetReqVo = new OrderExtendGetReqVo(); OrderExtendGetReqVo orderExtendGetReqVo = new OrderExtendGetReqVo();
orderExtendGetReqVo.setOrder_id(tyyOrderVo.getId()); orderExtendGetReqVo.setOrder_id(tyyOrderVo.getId());
OrderExtendVo orderExtendVo1 = orderExtendDaoImpl.load(orderExtendGetReqVo,OrderExtendVo.class); OrderExtendVo orderExtendVo1 = orderExtendDaoImpl.load(orderExtendGetReqVo, OrderExtendVo.class);
if (null == orderExtendVo1){ if (null == orderExtendVo1) {
orderExtendDaoImpl.create(orderExtendVo); orderExtendDaoImpl.create(orderExtendVo);
}else { } else {
orderExtendVo.setId(orderExtendVo1.getId()); orderExtendVo.setId(orderExtendVo1.getId());
orderExtendDaoImpl.update(orderExtendVo); orderExtendDaoImpl.update(orderExtendVo);
} }
}else if(null != tyyOrderMixVo){ } else if (null != tyyOrderMixVo) {
/*pd_order_extend游玩地址*/ /*pd_order_extend游玩地址*/
OrderExtendVo orderExtendAddress = new OrderExtendVo(); OrderExtendVo orderExtendAddress = new OrderExtendVo();
orderExtendAddress.setId(StringHelper.getNewID()); orderExtendAddress.setId(StringHelper.getNewID());
...@@ -610,10 +817,10 @@ public class DataServiceImpl implements DataService { ...@@ -610,10 +817,10 @@ public class DataServiceImpl implements DataService {
OrderExtendGetReqVo orderExtendGetReqVo = new OrderExtendGetReqVo(); OrderExtendGetReqVo orderExtendGetReqVo = new OrderExtendGetReqVo();
orderExtendGetReqVo.setOrder_id(tyyOrderMixVo.getOrdersn()); orderExtendGetReqVo.setOrder_id(tyyOrderMixVo.getOrdersn());
orderExtendGetReqVo.setTitle(orderExtendAddress.getTitle()); orderExtendGetReqVo.setTitle(orderExtendAddress.getTitle());
OrderExtendVo orderExtendAddress1 = orderExtendDaoImpl.load(orderExtendGetReqVo,OrderExtendVo.class); OrderExtendVo orderExtendAddress1 = orderExtendDaoImpl.load(orderExtendGetReqVo, OrderExtendVo.class);
if (null == orderExtendAddress1){ if (null == orderExtendAddress1) {
orderExtendDaoImpl.create(orderExtendAddress); orderExtendDaoImpl.create(orderExtendAddress);
}else { } else {
orderExtendAddress.setId(orderExtendAddress1.getId()); orderExtendAddress.setId(orderExtendAddress1.getId());
orderExtendDaoImpl.update(orderExtendAddress); orderExtendDaoImpl.update(orderExtendAddress);
} }
...@@ -627,10 +834,10 @@ public class DataServiceImpl implements DataService { ...@@ -627,10 +834,10 @@ public class DataServiceImpl implements DataService {
OrderExtendGetReqVo orderExtendGetReqVo1 = new OrderExtendGetReqVo(); OrderExtendGetReqVo orderExtendGetReqVo1 = new OrderExtendGetReqVo();
orderExtendGetReqVo.setOrder_id(tyyOrderMixVo.getOrdersn()); orderExtendGetReqVo.setOrder_id(tyyOrderMixVo.getOrdersn());
orderExtendGetReqVo.setTitle(orderExtendDate.getTitle()); orderExtendGetReqVo.setTitle(orderExtendDate.getTitle());
OrderExtendVo orderExtendDate1 = orderExtendDaoImpl.load(orderExtendGetReqVo1,OrderExtendVo.class); OrderExtendVo orderExtendDate1 = orderExtendDaoImpl.load(orderExtendGetReqVo1, OrderExtendVo.class);
if (null == orderExtendDate1){ if (null == orderExtendDate1) {
orderExtendDaoImpl.create(orderExtendDate); orderExtendDaoImpl.create(orderExtendDate);
}else{ } else {
orderExtendDate.setId(orderExtendDate1.getId()); orderExtendDate.setId(orderExtendDate1.getId());
orderExtendDaoImpl.update(orderExtendDate); orderExtendDaoImpl.update(orderExtendDate);
} }
...@@ -639,7 +846,7 @@ public class DataServiceImpl implements DataService { ...@@ -639,7 +846,7 @@ public class DataServiceImpl implements DataService {
private void saveOrderStatusVoStepOne(TyyOrderVo tyyOrderVo, TyyOrderMixVo tyyOrderMixVo) { private void saveOrderStatusVoStepOne(TyyOrderVo tyyOrderVo, TyyOrderMixVo tyyOrderMixVo) {
OrderStatusVo orderStatusVo = new OrderStatusVo(); OrderStatusVo orderStatusVo = new OrderStatusVo();
if (null != tyyOrderVo){ if (null != tyyOrderVo) {
orderStatusVo.setId(tyyOrderVo.getId()); orderStatusVo.setId(tyyOrderVo.getId());
orderStatusVo.setAgent_company_id(tyyOrderVo.getSale_company_id()); orderStatusVo.setAgent_company_id(tyyOrderVo.getSale_company_id());
orderStatusVo.setProduct_company_id(tyyOrderVo.getProduct_company_id()); orderStatusVo.setProduct_company_id(tyyOrderVo.getProduct_company_id());
...@@ -647,52 +854,53 @@ public class DataServiceImpl implements DataService { ...@@ -647,52 +854,53 @@ public class DataServiceImpl implements DataService {
orderStatusVo.setPay_type(tyyOrderVo.getPay_type()); orderStatusVo.setPay_type(tyyOrderVo.getPay_type());
orderStatusVo.setPay_third_id(tyyOrderVo.getPay_type_id()); orderStatusVo.setPay_third_id(tyyOrderVo.getPay_type_id());
orderStatusVo.setPayment_time(tyyOrderVo.getPay_date()); orderStatusVo.setPayment_time(tyyOrderVo.getPay_date());
if (null != tyyOrderVo.getPay_status()){ if (null != tyyOrderVo.getPay_status()) {
if (tyyOrderVo.getPay_status() == 0){ if (tyyOrderVo.getPay_status() == 0) {
orderStatusVo.setPayment_status(0); orderStatusVo.setPayment_status(0);
}else{ } else {
orderStatusVo.setPayment_status(1); orderStatusVo.setPayment_status(1);
} }
} }
orderStatusVo.setPayment_id(tyyOrderVo.getTongl_third_ordersn()); orderStatusVo.setPayment_id(tyyOrderVo.getTongl_third_ordersn());
orderStatusVo.setPay_tonglian_id(tyyOrderVo.getTongl_ordersn()); orderStatusVo.setPay_tonglian_id(tyyOrderVo.getTongl_ordersn());
}else if(null != tyyOrderMixVo){ orderStatusVo.setThird_order_id(tyyOrderMixVo.getPiaostorderid());
} else if (null != tyyOrderMixVo) {
orderStatusVo.setId(tyyOrderMixVo.getOrdersn()); orderStatusVo.setId(tyyOrderMixVo.getOrdersn());
if (null == tyyOrderMixVo.getPaytype()){ if (null == tyyOrderMixVo.getPaytype()) {
orderStatusVo.setPay_type(0); orderStatusVo.setPay_type(0);
}else { } else {
orderStatusVo.setPay_type(Integer.parseInt(tyyOrderMixVo.getPaytype())); orderStatusVo.setPay_type(Integer.parseInt(tyyOrderMixVo.getPaytype()));
} }
orderStatusVo.setPayment_time(tyyOrderMixVo.getPaymenttime()); orderStatusVo.setPayment_time(tyyOrderMixVo.getPaymenttime());
if (null == tyyOrderMixVo.getPaystatus()){ if (null == tyyOrderMixVo.getPaystatus()) {
orderStatusVo.setPayment_status(0); orderStatusVo.setPayment_status(0);
}else { } else {
orderStatusVo.setPayment_status(Integer.parseInt(tyyOrderMixVo.getPaystatus())); orderStatusVo.setPayment_status(Integer.parseInt(tyyOrderMixVo.getPaystatus()));
} }
if (null == tyyOrderMixVo.getOrder_status()){ if (null == tyyOrderMixVo.getOrder_status()) {
orderStatusVo.setOrder_status(0); orderStatusVo.setOrder_status(0);
}else { } else {
orderStatusVo.setOrder_status(Integer.parseInt(tyyOrderMixVo.getOrder_status())); orderStatusVo.setOrder_status(Integer.parseInt(tyyOrderMixVo.getOrder_status()));
} }
orderStatusVo.setThird_order_id(tyyOrderMixVo.getPiaostorderid()); orderStatusVo.setThird_order_id(tyyOrderMixVo.getPiaostorderid());
if (null != tyyOrderMixVo.getEmancipated()){ if (null != tyyOrderMixVo.getEmancipated()) {
if ("N".equals(tyyOrderMixVo.getEmancipated())){ if ("N".equals(tyyOrderMixVo.getEmancipated())) {
orderStatusVo.setIs_summarize(0); orderStatusVo.setIs_summarize(0);
}else{ } else {
orderStatusVo.setIs_summarize(1); orderStatusVo.setIs_summarize(1);
} }
} }
orderStatusVo.setSummarize_time(tyyOrderMixVo.getEmancipated_date()); orderStatusVo.setSummarize_time(tyyOrderMixVo.getEmancipated_date());
if (null == tyyOrderMixVo.getProfit_checked()){ if (null == tyyOrderMixVo.getProfit_checked()) {
orderStatusVo.setDivide_status(0); orderStatusVo.setDivide_status(0);
}else { } else {
orderStatusVo.setDivide_status(Integer.parseInt(tyyOrderMixVo.getProfit_checked())); orderStatusVo.setDivide_status(Integer.parseInt(tyyOrderMixVo.getProfit_checked()));
} }
orderStatusVo.setDivide_time(tyyOrderMixVo.getProfit_checked_date()); orderStatusVo.setDivide_time(tyyOrderMixVo.getProfit_checked_date());
orderStatusVo.setAgent_company_id(tyyOrderMixVo.getFxsid()); orderStatusVo.setAgent_company_id(tyyOrderMixVo.getFxsid());
if (null == tyyOrderMixVo.getIsdelete()){ if (null == tyyOrderMixVo.getIsdelete()) {
orderStatusVo.setIs_delete(0); orderStatusVo.setIs_delete(0);
}else { } else {
orderStatusVo.setIs_delete(Integer.parseInt(tyyOrderMixVo.getIsdelete())); orderStatusVo.setIs_delete(Integer.parseInt(tyyOrderMixVo.getIsdelete()));
} }
orderStatusVo.setPayment_id(tyyOrderMixVo.getTongl_third_ordersn()); orderStatusVo.setPayment_id(tyyOrderMixVo.getTongl_third_ordersn());
...@@ -703,40 +911,41 @@ public class DataServiceImpl implements DataService { ...@@ -703,40 +911,41 @@ public class DataServiceImpl implements DataService {
/*若存在则修改，不存在则添加*/ /*若存在则修改，不存在则添加*/
OrderStatusGetReqVo orderStatusGetReqVo = new OrderStatusGetReqVo(); OrderStatusGetReqVo orderStatusGetReqVo = new OrderStatusGetReqVo();
orderStatusGetReqVo.setId(orderStatusVo.getId()); orderStatusGetReqVo.setId(orderStatusVo.getId());
OrderStatusVo orderStatusVo1 = orderStatusDaoImpl.load(orderStatusGetReqVo,OrderStatusVo.class); OrderStatusVo orderStatusVo1 = orderStatusDaoImpl.load(orderStatusGetReqVo, OrderStatusVo.class);
if (null == orderStatusVo1){ if (null == orderStatusVo1) {
orderStatusDaoImpl.create(orderStatusVo); orderStatusDaoImpl.create(orderStatusVo);
}else { } else {
orderStatusDaoImpl.update(orderStatusVo); orderStatusDaoImpl.update(orderStatusVo);
} }
} }
private void saveOrderVoStepOne(TyyOrderVo tyyOrderVo, TyyOrderMixVo tyyOrderMixVo, List<TyyOrderbackVo> tyyOrderbackVoList) { private void saveOrderVoStepOne(TyyOrderVo tyyOrderVo, TyyOrderMixVo tyyOrderMixVo, List<TyyOrderbackVo> tyyOrderbackVoList) {
OrderVo orderVo = new OrderVo(); OrderVo orderVo = new OrderVo();
if (null != tyyOrderVo){ if (null != tyyOrderVo) {
orderVo.setId(tyyOrderVo.getId()); orderVo.setId(tyyOrderVo.getId());
orderVo.setPid(tyyOrderVo.getPid()); orderVo.setPid(tyyOrderVo.getPid());
orderVo.setOrder_type(tyyOrderVo.getOrder_type()); orderVo.setOrder_type(tyyOrderVo.getOrder_type());
orderVo.setSub_order_type(tyyOrderVo.getSub_order_type()); orderVo.setSub_order_type(tyyOrderVo.getSub_order_type());
orderVo.setProduct_name(tyyOrderVo.getProduct_name()); orderVo.setProduct_name(tyyOrderMixVo.getConsignee());
orderVo.setMerchant_name(tyyOrderMixVo.getScenicspotname());
orderVo.setPlay_date(tyyOrderVo.getPlay_date()); orderVo.setPlay_date(tyyOrderVo.getPlay_date());
orderVo.setUnit_price(null == tyyOrderVo.getPrice()?0:tyyOrderVo.getPrice()); orderVo.setUnit_price(null == tyyOrderVo.getPrice() ? 0 : tyyOrderVo.getPrice());
orderVo.setOrder_num(null == tyyOrderVo.getOrder_num()?0:tyyOrderVo.getOrder_num()); orderVo.setOrder_num(null == tyyOrderVo.getOrder_num() ? 0 : tyyOrderVo.getOrder_num());
orderVo.setTotal_money(tyyOrderVo.getSale_price()); orderVo.setTotal_money(tyyOrderVo.getSale_price());
orderVo.setDiscount_money(null == tyyOrderVo.getDiscount_price()?0:tyyOrderVo.getDiscount_price()); orderVo.setDiscount_money(null == tyyOrderVo.getDiscount_price() ? 0 : tyyOrderVo.getDiscount_price());
orderVo.setPd_discount_money(tyyOrderVo.getDiscount_price()); orderVo.setPd_discount_money(tyyOrderVo.getDiscount_price());
orderVo.setPd_order_money(null == tyyOrderVo.getReal_price()?orderVo.getTotal_money()-orderVo.getPd_discount_money():tyyOrderVo.getReal_price()); orderVo.setPd_order_money(null == tyyOrderVo.getReal_price() ? orderVo.getTotal_money() - orderVo.getPd_discount_money() : tyyOrderVo.getReal_price());
orderVo.setCost_price(null == tyyOrderVo.getSettlement_price()?0:tyyOrderVo.getSettlement_price()); orderVo.setCost_price(null == tyyOrderVo.getSettlement_price() ? 0 : tyyOrderVo.getSettlement_price());
orderVo.setCost_total_money(null==tyyOrderVo.getCost_price()?orderVo.getTotal_money()-orderVo.getDiscount_money():tyyOrderVo.getCost_price()); orderVo.setCost_total_money(null == tyyOrderVo.getCost_price() ? orderVo.getTotal_money() - orderVo.getDiscount_money() : tyyOrderVo.getCost_price());
if (null != orderVo.getCost_total_money() && null != tyyOrderVo.getDiscount_price()){ if (null != orderVo.getCost_total_money() && null != tyyOrderVo.getDiscount_price()) {
orderVo.setOrder_money(orderVo.getCost_total_money()-tyyOrderVo.getDiscount_price()); orderVo.setOrder_money(orderVo.getCost_total_money() - tyyOrderVo.getDiscount_price());
} }
orderVo.setOrder_fee(null == tyyOrderVo.getOrder_poundage_price()?0:tyyOrderVo.getOrder_poundage_price()); orderVo.setOrder_fee(null == tyyOrderVo.getOrder_poundage_price() ? 0 : tyyOrderVo.getOrder_poundage_price());
orderVo.setRefund_num(null == tyyOrderVo.getReturn_num()?0:tyyOrderVo.getReturn_num()); orderVo.setRefund_num(null == tyyOrderVo.getReturn_num() ? 0 : tyyOrderVo.getReturn_num());
orderVo.setRefund_money(null == tyyOrderVo.getReturn_money()?0:tyyOrderVo.getReturn_money()); orderVo.setRefund_money(null == tyyOrderVo.getReturn_money() ? 0 : tyyOrderVo.getReturn_money());
orderVo.setPd_refund_money(tyyOrderVo.getReturn_money()); orderVo.setPd_refund_money(tyyOrderVo.getReturn_money());
orderVo.setOrder_time(tyyOrderVo.getCreate_date()); orderVo.setOrder_time(tyyOrderVo.getCreate_date());
}else if(null != tyyOrderMixVo){ } else if (null != tyyOrderMixVo) {
orderVo.setId(tyyOrderMixVo.getOrdersn()); orderVo.setId(tyyOrderMixVo.getOrdersn());
orderVo.setProduct_name(tyyOrderMixVo.getConsignee()); orderVo.setProduct_name(tyyOrderMixVo.getConsignee());
orderVo.setMerchant_name(tyyOrderMixVo.getScenicspotname()); orderVo.setMerchant_name(tyyOrderMixVo.getScenicspotname());
...@@ -749,13 +958,13 @@ public class DataServiceImpl implements DataService { ...@@ -749,13 +958,13 @@ public class DataServiceImpl implements DataService {
orderVo.setTicket_phone(tyyOrderMixVo.getUsertel()); orderVo.setTicket_phone(tyyOrderMixVo.getUsertel());
orderVo.setOrder_time(tyyOrderMixVo.getOrdertime()); orderVo.setOrder_time(tyyOrderMixVo.getOrdertime());
orderVo.setCost_price(tyyOrderMixVo.getPurchaseprice()); orderVo.setCost_price(tyyOrderMixVo.getPurchaseprice());
orderVo.setCost_total_money(orderVo.getCost_price()*orderVo.getOrder_num()); orderVo.setCost_total_money(orderVo.getCost_price() * orderVo.getOrder_num());
if (null != orderVo.getCost_total_money() && null != tyyOrderMixVo.getDiscountprice()){ if (null != orderVo.getCost_total_money() && null != tyyOrderMixVo.getDiscountprice()) {
orderVo.setOrder_money(orderVo.getCost_total_money()-tyyOrderMixVo.getDiscountprice()); orderVo.setOrder_money(orderVo.getCost_total_money() - tyyOrderMixVo.getDiscountprice());
} }
if (null == tyyOrderMixVo.getSub_order_type()){ if (null == tyyOrderMixVo.getSub_order_type()) {
orderVo.setSub_order_type(0); orderVo.setSub_order_type(0);
}else { } else {
orderVo.setSub_order_type(Integer.parseInt(tyyOrderMixVo.getSub_order_type())); orderVo.setSub_order_type(Integer.parseInt(tyyOrderMixVo.getSub_order_type()));
} }
orderVo.setPd_order_money(tyyOrderMixVo.getRealprice()); orderVo.setPd_order_money(tyyOrderMixVo.getRealprice());
...@@ -770,8 +979,8 @@ public class DataServiceImpl implements DataService { ...@@ -770,8 +979,8 @@ public class DataServiceImpl implements DataService {
orderVo.setOrder_fee(tyyOrderMixVo.getOrder_poundage_price()); orderVo.setOrder_fee(tyyOrderMixVo.getOrder_poundage_price());
} }
double refundFee = 0d; double refundFee = 0d;
for (TyyOrderbackVo tyyOrderbackVo:tyyOrderbackVoList) { for (TyyOrderbackVo tyyOrderbackVo : tyyOrderbackVoList) {
if (null != tyyOrderbackVo){ if (null != tyyOrderbackVo) {
refundFee += tyyOrderbackVo.getRefundFee(); refundFee += tyyOrderbackVo.getRefundFee();
} }
} }
...@@ -779,10 +988,10 @@ public class DataServiceImpl implements DataService { ...@@ -779,10 +988,10 @@ public class DataServiceImpl implements DataService {
/*若存在则修改，不存在则添加*/ /*若存在则修改，不存在则添加*/
OrderGetReqVo orderGetReqVo = new OrderGetReqVo(); OrderGetReqVo orderGetReqVo = new OrderGetReqVo();
orderGetReqVo.setId(orderVo.getId()); orderGetReqVo.setId(orderVo.getId());
OrderVo orderVo1 = orderDaoImpl.load(orderGetReqVo,OrderVo.class); OrderVo orderVo1 = orderDaoImpl.load(orderGetReqVo, OrderVo.class);
if (null == orderVo1){ if (null == orderVo1) {
orderDaoImpl.create(orderVo); orderDaoImpl.create(orderVo);
}else{ } else {
orderDaoImpl.update(orderVo); orderDaoImpl.update(orderVo);
} }
} }
......
src/main/java/com/pangding/web/authority/service/impl/RegisterServiceImpl.java
View file @ 07b70813
...@@ -522,17 +522,22 @@ public class RegisterServiceImpl implements RegisterService { ...@@ -522,17 +522,22 @@ public class RegisterServiceImpl implements RegisterService {
AuthorityGetReqVo authorityGetReqVo = new AuthorityGetReqVo(); AuthorityGetReqVo authorityGetReqVo = new AuthorityGetReqVo();
authorityGetReqVo.setId(authorityIds.get(i)); authorityGetReqVo.setId(authorityIds.get(i));
AuthorityVo authorityVo1 = authorityDaoImpl.load(authorityGetReqVo,AuthorityVo.class); AuthorityVo authorityVo1 = authorityDaoImpl.load(authorityGetReqVo,AuthorityVo.class);
if (authorityVo1.getPid().equals(authorityVo.getId())){ if(!StringHelper.isEmpty(authorityVo1)){
List<String> authorityIdList = new ArrayList<>(); if (authorityVo1.getPid().equals(authorityVo.getId())){
authorityIdList.addAll(authorityIds); List<String> authorityIdList = new ArrayList<>();
authorityIdList.remove(i); authorityIdList.addAll(authorityIds);
AuthorityListByLevelResVo resVo = new AuthorityListByLevelResVo(); authorityIdList.remove(i);
ObjectHelper.writeWithFrom(resVo,authorityVo1); AuthorityListByLevelResVo resVo = new AuthorityListByLevelResVo();
if (authorityIds.size()>0){ ObjectHelper.writeWithFrom(resVo,authorityVo1);
resVo.setChildList(getChildList(authorityVo1,authorityIdList)); if (authorityIds.size()>0){
resVo.setChildList(getChildList(authorityVo1,authorityIdList));
}
resVoList.add(resVo);
} }
resVoList.add(resVo); }else{
System.out.println("无该权限：" + authorityIds.get(i));
} }
} }
Collections.sort(resVoList); Collections.sort(resVoList);
return resVoList; return resVoList;
......
src/main/java/com/pangding/web/authority/service/impl/RoleServiceImpl.java
View file @ 07b70813
...@@ -51,15 +51,15 @@ public class RoleServiceImpl implements RoleService { ...@@ -51,15 +51,15 @@ public class RoleServiceImpl implements RoleService {
this.checkNameExist(roleVo); this.checkNameExist(roleVo);
webRoleReqVo.setId(StringHelper.getNewID()); webRoleReqVo.setId(StringHelper.getNewID());
if (CompanyConstant.PD_COMPANY_ID.equals(roleVo.getCompanyId())){ if (CompanyConstant.PD_COMPANY_ID.equals(roleVo.getCompanyId())) {
roleVo.setCompanyId(""); roleVo.setCompanyId("");
} }
roleDao.create(roleVo); roleDao.create(roleVo);
List<String> authorityIds = webRoleReqVo.getAuthorityIds(); List<String> authorityIds = webRoleReqVo.getAuthorityIds();
if (authorityIds != null && !authorityIds.isEmpty()){ if (authorityIds != null && !authorityIds.isEmpty()) {
for (String authorityId : authorityIds) { for (String authorityId : authorityIds) {
/*查看该权限是否有上级权限*/ /*查看该权限是否有上级权限*/
findParent(authorityId,webRoleReqVo.getId()); findParent(authorityId, webRoleReqVo.getId());
RoleAuthorityVo roleAuthorityRelation = new RoleAuthorityVo(); RoleAuthorityVo roleAuthorityRelation = new RoleAuthorityVo();
roleAuthorityRelation.setAuthorityId(authorityId); roleAuthorityRelation.setAuthorityId(authorityId);
roleAuthorityRelation.setRoleId(webRoleReqVo.getId()); roleAuthorityRelation.setRoleId(webRoleReqVo.getId());
...@@ -70,20 +70,20 @@ public class RoleServiceImpl implements RoleService { ...@@ -70,20 +70,20 @@ public class RoleServiceImpl implements RoleService {
return roleVo.getId(); return roleVo.getId();
} }
private void findParent(String authorityId,String roleId){ private void findParent(String authorityId, String roleId) {
AuthorityGetReqVo authorityGetReqVo = new AuthorityGetReqVo(); AuthorityGetReqVo authorityGetReqVo = new AuthorityGetReqVo();
authorityGetReqVo.setId(authorityId); authorityGetReqVo.setId(authorityId);
AuthorityVo authorityVo = authorityDaoImpl.load(authorityGetReqVo,AuthorityVo.class); AuthorityVo authorityVo = authorityDaoImpl.load(authorityGetReqVo, AuthorityVo.class);
if (null != authorityVo.getPid() && !authorityVo.getPid().isEmpty()){ if (null != authorityVo.getPid() && !authorityVo.getPid().isEmpty()) {
String authorityPid = authorityVo.getPid(); String authorityPid = authorityVo.getPid();
RoleAuthorityVo roleAuthorityVo = new RoleAuthorityVo(); RoleAuthorityVo roleAuthorityVo = new RoleAuthorityVo();
roleAuthorityVo.setAuthorityId(authorityPid); roleAuthorityVo.setAuthorityId(authorityPid);
roleAuthorityVo.setRoleId(roleId); roleAuthorityVo.setRoleId(roleId);
RoleAuthorityVo roleAuthorityVo1 = roleAuthorityDaoImpl.load(roleAuthorityVo,RoleAuthorityVo.class); RoleAuthorityVo roleAuthorityVo1 = roleAuthorityDaoImpl.load(roleAuthorityVo, RoleAuthorityVo.class);
if (null == roleAuthorityVo1){ if (null == roleAuthorityVo1) {
roleAuthorityVo.setId(StringHelper.getNewID()); roleAuthorityVo.setId(StringHelper.getNewID());
roleAuthorityDaoImpl.create(roleAuthorityVo); roleAuthorityDaoImpl.create(roleAuthorityVo);
findParent(authorityPid,roleId); findParent(authorityPid, roleId);
} }
} }
} }
...@@ -103,33 +103,33 @@ public class RoleServiceImpl implements RoleService { ...@@ -103,33 +103,33 @@ public class RoleServiceImpl implements RoleService {
roleDao.update(roleVo); roleDao.update(roleVo);
RoleAuthorityGetReqVo reqVo = new RoleAuthorityGetReqVo(); RoleAuthorityGetReqVo reqVo = new RoleAuthorityGetReqVo();
reqVo.setRoleId(webRoleReqVo.getId()); reqVo.setRoleId(webRoleReqVo.getId());
List<RoleAuthorityVo> roleAuthorityList = roleAuthorityDaoImpl.loadList(reqVo,RoleAuthorityVo.class); List<RoleAuthorityVo> roleAuthorityList = roleAuthorityDaoImpl.loadList(reqVo, RoleAuthorityVo.class);
if (roleAuthorityList != null && !roleAuthorityList.isEmpty()){ if (roleAuthorityList != null && !roleAuthorityList.isEmpty()) {
for (RoleAuthorityVo roleAuthorityRelation:roleAuthorityList) { for (RoleAuthorityVo roleAuthorityRelation : roleAuthorityList) {
roleAuthorityDaoImpl.remove(roleAuthorityRelation); roleAuthorityDaoImpl.remove(roleAuthorityRelation);
} }
} }
List<String> authorityIds = webRoleReqVo.getAuthorityIds(); List<String> authorityIds = webRoleReqVo.getAuthorityIds();
if (authorityIds != null && !authorityIds.isEmpty()){ if (authorityIds != null && !authorityIds.isEmpty()) {
for (String authorityId : authorityIds) { for (String authorityId : authorityIds) {
saveRoleAuthority(reqVo.getRoleId(),authorityId); saveRoleAuthority(reqVo.getRoleId(), authorityId);
} }
} }
return roleVo.getId(); return roleVo.getId();
} }
private void saveRoleAuthority(String roleId,String authorityId){ private void saveRoleAuthority(String roleId, String authorityId) {
AuthorityGetReqVo getReqVo = new AuthorityGetReqVo(); AuthorityGetReqVo getReqVo = new AuthorityGetReqVo();
getReqVo.setId(authorityId); getReqVo.setId(authorityId);
AuthorityVo authorityVo = authorityDaoImpl.load(getReqVo,AuthorityVo.class); AuthorityVo authorityVo = authorityDaoImpl.load(getReqVo, AuthorityVo.class);
if (null != authorityVo && null != authorityVo.getPid() && !authorityVo.getPid().isEmpty()){ if (null != authorityVo && null != authorityVo.getPid() && !authorityVo.getPid().isEmpty()) {
saveRoleAuthority(roleId,authorityVo.getPid()); saveRoleAuthority(roleId, authorityVo.getPid());
} }
RoleAuthorityVo roleAuthorityVo = new RoleAuthorityVo(); RoleAuthorityVo roleAuthorityVo = new RoleAuthorityVo();
roleAuthorityVo.setRoleId(roleId); roleAuthorityVo.setRoleId(roleId);
roleAuthorityVo.setAuthorityId(authorityId); roleAuthorityVo.setAuthorityId(authorityId);
RoleAuthorityVo existVo = roleAuthorityDaoImpl.load(roleAuthorityVo,RoleAuthorityVo.class); RoleAuthorityVo existVo = roleAuthorityDaoImpl.load(roleAuthorityVo, RoleAuthorityVo.class);
if (null == existVo){ if (null == existVo) {
roleAuthorityVo.setId(StringHelper.getNewID()); roleAuthorityVo.setId(StringHelper.getNewID());
roleAuthorityDaoImpl.create(roleAuthorityVo); roleAuthorityDaoImpl.create(roleAuthorityVo);
} }
...@@ -146,11 +146,11 @@ public class RoleServiceImpl implements RoleService { ...@@ -146,11 +146,11 @@ public class RoleServiceImpl implements RoleService {
RoleGetReqVo roleGetReqVo = new RoleGetReqVo(); RoleGetReqVo roleGetReqVo = new RoleGetReqVo();
roleGetReqVo.setId(webRoleReqVo.getId()); roleGetReqVo.setId(webRoleReqVo.getId());
RoleVo roleVo = roleDao.getRoleById(roleGetReqVo); RoleVo roleVo = roleDao.getRoleById(roleGetReqVo);
if (roleVo == null){ if (roleVo == null) {
throw new CodeException("未找到该角色"); throw new CodeException("未找到该角色");
} }
List<AuthorityVo> authorityList = this.getAuthorityListByRoleId(webRoleReqVo.getId()); List<AuthorityVo> authorityList = this.getAuthorityListByRoleId(webRoleReqVo.getId());
return this.makeResVo(roleVo,authorityList); return this.makeResVo(roleVo, authorityList);
} }
/** /**
...@@ -159,7 +159,7 @@ public class RoleServiceImpl implements RoleService { ...@@ -159,7 +159,7 @@ public class RoleServiceImpl implements RoleService {
* @param roleVo RoleVo对象 * @param roleVo RoleVo对象
*/ */
@Override @Override
public void checkNameExist(RoleVo roleVo){ public void checkNameExist(RoleVo roleVo) {
roleDao.checkNameExist(roleVo); roleDao.checkNameExist(roleVo);
} }
...@@ -171,19 +171,22 @@ public class RoleServiceImpl implements RoleService { ...@@ -171,19 +171,22 @@ public class RoleServiceImpl implements RoleService {
*/ */
@Override @Override
public List<WebRoleResVo> getWebRoleResVoList(ListRoleReqVo req) { public List<WebRoleResVo> getWebRoleResVoList(ListRoleReqVo req) {
List<RoleVo> roleVoList = roleDao.loadList(req,RoleVo.class); if ("10001".equals(req.getCompanyId())) {
req.setCompanyId("");
}
List<RoleVo> roleVoList = roleDao.loadList(req, RoleVo.class);
List<WebRoleResVo> webRoleResVoList = new ArrayList(); List<WebRoleResVo> webRoleResVoList = new ArrayList();
for (RoleVo roleVo:roleVoList) { for (RoleVo roleVo : roleVoList) {
WebRoleResVo resVo = new WebRoleResVo(); WebRoleResVo resVo = new WebRoleResVo();
List<AuthorityVo> authorityVoList = this.getAuthorityListByRoleId(roleVo.getId()); List<AuthorityVo> authorityVoList = this.getAuthorityListByRoleId(roleVo.getId());
ObjectHelper.writeWithFrom(resVo,roleVo); ObjectHelper.writeWithFrom(resVo, roleVo);
resVo.setAuthorityList(authorityVoList); resVo.setAuthorityList(authorityVoList);
CountByRoleReqVo countByRoleReqVo = new CountByRoleReqVo(); CountByRoleReqVo countByRoleReqVo = new CountByRoleReqVo();
countByRoleReqVo.setCompanyId(req.getCompanyId()); countByRoleReqVo.setCompanyId(req.getCompanyId());
countByRoleReqVo.setRoleId(roleVo.getId()); countByRoleReqVo.setRoleId(roleVo.getId());
List<UserVo> userVoList = count(countByRoleReqVo); List<UserVo> userVoList = count(countByRoleReqVo);
if (null == userVoList || userVoList.isEmpty()){ if (null == userVoList || userVoList.isEmpty()) {
resVo.setCount(0); resVo.setCount(0);
} }
resVo.setCount(userVoList.size()); resVo.setCount(userVoList.size());
...@@ -196,6 +199,7 @@ public class RoleServiceImpl implements RoleService { ...@@ -196,6 +199,7 @@ public class RoleServiceImpl implements RoleService {
/** /**
* 获取该公司该角色已分配的角色列表 * 获取该公司该角色已分配的角色列表
*
* @param reqVo 封装了公司id和权限id的请求对象 * @param reqVo 封装了公司id和权限id的请求对象
* @return 用户列表 * @return 用户列表
*/ */
...@@ -203,19 +207,19 @@ public class RoleServiceImpl implements RoleService { ...@@ -203,19 +207,19 @@ public class RoleServiceImpl implements RoleService {
public List<UserVo> count(CountByRoleReqVo reqVo) { public List<UserVo> count(CountByRoleReqVo reqVo) {
UserRoleGetReqVo getReqVo = new UserRoleGetReqVo(); UserRoleGetReqVo getReqVo = new UserRoleGetReqVo();
getReqVo.setRoleId(reqVo.getRoleId()); getReqVo.setRoleId(reqVo.getRoleId());
List<UserRoleVo> userRoleVoList = userRoleDaoImpl.loadList(getReqVo,UserRoleVo.class); List<UserRoleVo> userRoleVoList = userRoleDaoImpl.loadList(getReqVo, UserRoleVo.class);
List<String> userIdList = new ArrayList<>(); List<String> userIdList = new ArrayList<>();
for (UserRoleVo userRoleVo:userRoleVoList) { for (UserRoleVo userRoleVo : userRoleVoList) {
userIdList.add(userRoleVo.getUserId()); userIdList.add(userRoleVo.getUserId());
} }
String companyId = reqVo.getCompanyId(); String companyId = reqVo.getCompanyId();
List<UserVo> userVoList = new ArrayList<>(); List<UserVo> userVoList = new ArrayList<>();
for (String userId:userIdList) { for (String userId : userIdList) {
UserGetReqVo userGetReqVo = new UserGetReqVo(); UserGetReqVo userGetReqVo = new UserGetReqVo();
userGetReqVo.setId(userId); userGetReqVo.setId(userId);
UserVo userVo = userDaoImpl.load(userGetReqVo,UserVo.class); UserVo userVo = userDaoImpl.load(userGetReqVo, UserVo.class);
if (null != userVo && companyId.equals(userVo.getCompanyId())){ if (null != userVo && companyId.equals(userVo.getCompanyId())) {
userVo.setPassword(""); userVo.setPassword("");
userVo.setRemark(""); userVo.setRemark("");
userVoList.add(userVo); userVoList.add(userVo);
...@@ -234,13 +238,13 @@ public class RoleServiceImpl implements RoleService { ...@@ -234,13 +238,13 @@ public class RoleServiceImpl implements RoleService {
public List<AuthorityVo> getAuthorityListByRoleId(String roleId) { public List<AuthorityVo> getAuthorityListByRoleId(String roleId) {
RoleAuthorityGetReqVo reqVo = new RoleAuthorityGetReqVo(); RoleAuthorityGetReqVo reqVo = new RoleAuthorityGetReqVo();
reqVo.setRoleId(roleId); reqVo.setRoleId(roleId);
List<RoleAuthorityVo> roleAuthorityRelationList = roleAuthorityDaoImpl.loadList(reqVo,RoleAuthorityVo.class); List<RoleAuthorityVo> roleAuthorityRelationList = roleAuthorityDaoImpl.loadList(reqVo, RoleAuthorityVo.class);
if (roleAuthorityRelationList != null && !roleAuthorityRelationList.isEmpty()){ if (roleAuthorityRelationList != null && !roleAuthorityRelationList.isEmpty()) {
List<AuthorityVo> authorityList = new ArrayList(roleAuthorityRelationList.size()); List<AuthorityVo> authorityList = new ArrayList(roleAuthorityRelationList.size());
for (RoleAuthorityVo roleAuthorityRelation:roleAuthorityRelationList) { for (RoleAuthorityVo roleAuthorityRelation : roleAuthorityRelationList) {
AuthorityGetReqVo authorityGetReqVo = new AuthorityGetReqVo(); AuthorityGetReqVo authorityGetReqVo = new AuthorityGetReqVo();
authorityGetReqVo.setId(roleAuthorityRelation.getAuthorityId()); authorityGetReqVo.setId(roleAuthorityRelation.getAuthorityId());
AuthorityVo authorityVo = authorityDaoImpl.load(authorityGetReqVo,AuthorityVo.class); AuthorityVo authorityVo = authorityDaoImpl.load(authorityGetReqVo, AuthorityVo.class);
authorityList.add(authorityVo); authorityList.add(authorityVo);
} }
return authorityList; return authorityList;
...@@ -252,7 +256,7 @@ public class RoleServiceImpl implements RoleService { ...@@ -252,7 +256,7 @@ public class RoleServiceImpl implements RoleService {
public String getAuthorityNameByAuthorityId(String authorityId) { public String getAuthorityNameByAuthorityId(String authorityId) {
AuthorityGetReqVo authorityGetReqVo = new AuthorityGetReqVo(); AuthorityGetReqVo authorityGetReqVo = new AuthorityGetReqVo();
authorityGetReqVo.setId(authorityId); authorityGetReqVo.setId(authorityId);
AuthorityVo authorityVo = authorityDaoImpl.load(authorityGetReqVo,AuthorityVo.class); AuthorityVo authorityVo = authorityDaoImpl.load(authorityGetReqVo, AuthorityVo.class);
return authorityVo.getName(); return authorityVo.getName();
} }
...@@ -276,17 +280,17 @@ public class RoleServiceImpl implements RoleService { ...@@ -276,17 +280,17 @@ public class RoleServiceImpl implements RoleService {
UserRoleGetReqVo userRoleGetReqVo = new UserRoleGetReqVo(); UserRoleGetReqVo userRoleGetReqVo = new UserRoleGetReqVo();
userRoleGetReqVo.setRoleId(roleVo.getId()); userRoleGetReqVo.setRoleId(roleVo.getId());
List<UserRoleVo> userRoleList = userRoleDaoImpl.getUserRoleList(userRoleGetReqVo); List<UserRoleVo> userRoleList = userRoleDaoImpl.getUserRoleList(userRoleGetReqVo);
if (userRoleList != null && !userRoleList.isEmpty()){ if (userRoleList != null && !userRoleList.isEmpty()) {
for (UserRoleVo userRoleRelation:userRoleList) { for (UserRoleVo userRoleRelation : userRoleList) {
userRoleDaoImpl.remove(userRoleRelation); userRoleDaoImpl.remove(userRoleRelation);
} }
} }
RoleAuthorityGetReqVo reqVo = new RoleAuthorityGetReqVo(); RoleAuthorityGetReqVo reqVo = new RoleAuthorityGetReqVo();
reqVo.setRoleId(roleVo.getId()); reqVo.setRoleId(roleVo.getId());
List<RoleAuthorityVo> roleAuthorityList = roleAuthorityDaoImpl.loadList(reqVo,RoleAuthorityVo.class); List<RoleAuthorityVo> roleAuthorityList = roleAuthorityDaoImpl.loadList(reqVo, RoleAuthorityVo.class);
if (roleAuthorityList != null && !roleAuthorityList.isEmpty()){ if (roleAuthorityList != null && !roleAuthorityList.isEmpty()) {
for (RoleAuthorityVo roleAuthority:roleAuthorityList) { for (RoleAuthorityVo roleAuthority : roleAuthorityList) {
roleAuthorityDaoImpl.remove(roleAuthority); roleAuthorityDaoImpl.remove(roleAuthority);
} }
} }
...@@ -294,7 +298,7 @@ public class RoleServiceImpl implements RoleService { ...@@ -294,7 +298,7 @@ public class RoleServiceImpl implements RoleService {
RoleGetReqVo roleGetReqVo = new RoleGetReqVo(); RoleGetReqVo roleGetReqVo = new RoleGetReqVo();
roleGetReqVo.setId(roleVo.getId()); roleGetReqVo.setId(roleVo.getId());
List<RoleVo> childList = roleDao.getChild(roleGetReqVo); List<RoleVo> childList = roleDao.getChild(roleGetReqVo);
for (RoleVo child:childList) { for (RoleVo child : childList) {
this.deleteRole(child); this.deleteRole(child);
} }
} }
...@@ -314,7 +318,7 @@ public class RoleServiceImpl implements RoleService { ...@@ -314,7 +318,7 @@ public class RoleServiceImpl implements RoleService {
@Override @Override
public void add(AddReqVo reqVo) { public void add(AddReqVo reqVo) {
RoleAuthorityVo roleAuthorityVo = new RoleAuthorityVo(); RoleAuthorityVo roleAuthorityVo = new RoleAuthorityVo();
ObjectHelper.writeWithFrom(roleAuthorityVo,reqVo); ObjectHelper.writeWithFrom(roleAuthorityVo, reqVo);
roleAuthorityVo.setId(StringHelper.getNewID()); roleAuthorityVo.setId(StringHelper.getNewID());
roleAuthorityDaoImpl.create(roleAuthorityVo); roleAuthorityDaoImpl.create(roleAuthorityVo);
} }
......
src/main/java/com/pangding/web/authority/vo/TyyOrderMixVo.java
View file @ 07b70813
...@@ -16,6 +16,7 @@ public class TyyOrderMixVo { ...@@ -16,6 +16,7 @@ public class TyyOrderMixVo {
private String paytype; private String paytype;
private String paymenttime; private String paymenttime;
private String paystatus; private String paystatus;
private String queryid;
private String order_status; private String order_status;
private String piaostorderid; private String piaostorderid;
private String memberid; private String memberid;
...@@ -356,4 +357,12 @@ public class TyyOrderMixVo { ...@@ -356,4 +357,12 @@ public class TyyOrderMixVo {
public void setProduct_company_id(String product_company_id) { public void setProduct_company_id(String product_company_id) {
this.product_company_id = product_company_id; this.product_company_id = product_company_id;
} }
public String getQueryid() {
return queryid;
}
public void setQueryid(String queryid) {
this.queryid = queryid;
}
} }
src/main/java/com/pangding/web/authority/vo/reqvo/DataSynReqVo.java
View file @ 07b70813
package com.pangding.web.authority.vo.reqvo; package com.pangding.web.authority.vo.reqvo;
import com.pangding.web.authority.vo.*;
import java.util.List;
/**
* tf
*/
public class DataSynReqVo { public class DataSynReqVo {
private TyyOrderVo tyyOrderVo;
private TyyOrdersVo tyyOrdersVo;
private List<TyyOrderdetailsVo> orderdetailsVoList;
private List<TyyTouristVo> touristVoList;
private List<TyyOrderbackVo> orderbackVoList;
public TyyOrderVo getTyyOrderVo() {
return tyyOrderVo;
}
public void setTyyOrderVo(TyyOrderVo tyyOrderVo) {
this.tyyOrderVo = tyyOrderVo;
}
public TyyOrdersVo getTyyOrdersVo() {
return tyyOrdersVo;
}
public void setTyyOrdersVo(TyyOrdersVo tyyOrdersVo) {
this.tyyOrdersVo = tyyOrdersVo;
}
public List<TyyOrderdetailsVo> getOrderdetailsVoList() {
return orderdetailsVoList;
}
public void setOrderdetailsVoList(List<TyyOrderdetailsVo> orderdetailsVoList) {
this.orderdetailsVoList = orderdetailsVoList;
}
public List<TyyTouristVo> getTouristVoList() {
return touristVoList;
}
public void setTouristVoList(List<TyyTouristVo> touristVoList) {
this.touristVoList = touristVoList;
}
public List<TyyOrderbackVo> getOrderbackVoList() {
return orderbackVoList;
}
public void setOrderbackVoList(List<TyyOrderbackVo> orderbackVoList) {
this.orderbackVoList = orderbackVoList;
}
} }
src/main/java/com/pangding/web/authority/vo/resvo/OrderStepOneResVo.java
View file @ 07b70813
...@@ -17,9 +17,9 @@ public class OrderStepOneResVo { ...@@ -17,9 +17,9 @@ public class OrderStepOneResVo {
private List<TyyOrderbackVo> tyyOrderbackVoList; private List<TyyOrderbackVo> tyyOrderbackVoList;
private TyyOrderdetailsVo tyyOrderdetailsVo; private List<TyyOrderdetailsVo> tyyOrderdetailsVoList;
private TyyTouristVo tyyTouristVo; private List<TyyTouristVo> tyyTouristVoList;
public String getReqId() { public String getReqId() {
return reqId; return reqId;
...@@ -53,19 +53,19 @@ public class OrderStepOneResVo { ...@@ -53,19 +53,19 @@ public class OrderStepOneResVo {
this.tyyOrderbackVoList = tyyOrderbackVoList; this.tyyOrderbackVoList = tyyOrderbackVoList;
} }
public TyyOrderdetailsVo getTyyOrderdetailsVo() { public List<TyyOrderdetailsVo> getTyyOrderdetailsVoList() {
return tyyOrderdetailsVo; return tyyOrderdetailsVoList;
} }
public void setTyyOrderdetailsVo(TyyOrderdetailsVo tyyOrderdetailsVo) { public void setTyyOrderdetailsVoList(List<TyyOrderdetailsVo> tyyOrderdetailsVoList) {
this.tyyOrderdetailsVo = tyyOrderdetailsVo; this.tyyOrderdetailsVoList = tyyOrderdetailsVoList;
} }
public TyyTouristVo getTyyTouristVo() { public List<TyyTouristVo> getTyyTouristVoList() {
return tyyTouristVo; return tyyTouristVoList;
} }
public void setTyyTouristVo(TyyTouristVo tyyTouristVo) { public void setTyyTouristVoList(List<TyyTouristVo> tyyTouristVoList) {
this.tyyTouristVo = tyyTouristVo; this.tyyTouristVoList = tyyTouristVoList;
} }
} }
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