Skip to content

T
tcm-system
Commit 6bbc5626 authored by zjy's avatar zjy
Browse files
Options

user/role/tright 7.10

parent 8900d2aa
Hide whitespace changes
Inline Side-by-side
Showing with 401 additions and 133 deletions
src/main/java/com/pangding/web/authority/service/impl/DataServiceImpl.java
View file @ 6bbc5626
...@@ -184,7 +184,169 @@ public class DataServiceImpl implements DataService { ...@@ -184,7 +184,169 @@ public class DataServiceImpl implements DataService {
List<TyyOrderbackVo> tyyOrderbackVoList = reqVo.getTyyOrderbackVoList(); List<TyyOrderbackVo> tyyOrderbackVoList = reqVo.getTyyOrderbackVoList();
TyyOrderdetailsVo tyyOrderdetailsVo = reqVo.getTyyOrderdetailsVo(); TyyOrderdetailsVo tyyOrderdetailsVo = reqVo.getTyyOrderdetailsVo();
TyyTouristVo tyyTouristVo = reqVo.getTyyTouristVo(); TyyTouristVo tyyTouristVo = reqVo.getTyyTouristVo();
OrderRelVo orderRelVo = reqVo.getOrderRelVo();
/*OrderVo表*/ /*OrderVo表*/
saveOrderVoStepThree(tyyOrdersVo,tyyOrderbackVoList,orderRelVo);
/*OrderExtendVo表*/
saveOrderExtendVoStepThree(tyyOrdersVo);
/*OrderRefundVo表*/
saveOrderRefundVoStepThree(tyyOrderbackVoList);
/*OrderStatusVo表*/
saveOrderStatusVoStepThree(tyyOrdersVo);
/*OrderTicketDetailVo表*/
saveOrderTicketDetailVoStepThree(tyyOrderdetailsVo,tyyOrdersVo);
/*OrderTouristVo表*/
saveOrderTouristVoStepThree(tyyTouristVo);
/*DiscountDetailVo表*/
saveDiscountDetailVoStepThree(tyyOrdersVo);
}
private void saveDiscountDetailVoStepThree(TyyOrdersVo tyyOrdersVo) {
DiscountDetailVo discountDetailVo = new DiscountDetailVo();
discountDetailVo.setId(StringHelper.getNewID());
discountDetailVo.setOrder_id(tyyOrdersVo.getOrdersn());
discountDetailVo.setDiscount_money(tyyOrdersVo.getDiscountprice());
/*若该order_id存在则跳过,不存在则新增*/
DiscountDetailGetReqVo discountDetailGetReqVo = new DiscountDetailGetReqVo();
discountDetailGetReqVo.setOrder_id(discountDetailVo.getOrder_id());
DiscountDetailVo discountDetailVo1 = discountDetailDao.load(discountDetailGetReqVo,DiscountDetailVo.class);
if (null == discountDetailVo1){
discountDetailDao.create(discountDetailVo);
}
}
private void saveOrderTouristVoStepThree(TyyTouristVo tyyTouristVo) {
OrderTouristVo orderTouristVo = new OrderTouristVo();
orderTouristVo.setId(StringHelper.getNewID());
orderTouristVo.setOrder_id(tyyTouristVo.getOrdersn());
orderTouristVo.setName(tyyTouristVo.getName());
orderTouristVo.setPhone(tyyTouristVo.getPhone());
orderTouristVo.setCredential_type(tyyTouristVo.getCard_type());
orderTouristVo.setCredential_number(tyyTouristVo.getIdcard());
/*若该order_id存在则跳过,不存在则新增*/
OrderTouristGetReqVo orderTouristGetReqVo = new OrderTouristGetReqVo();
orderTouristGetReqVo.setOrder_id(orderTouristVo.getOrder_id());
OrderTouristVo orderTouristVo1 = orderTouristDao.load(orderTouristGetReqVo,OrderTouristVo.class);
if (null == orderTouristVo1){
orderTouristDao.create(orderTouristVo);
}
}
private void saveOrderTicketDetailVoStepThree(TyyOrderdetailsVo tyyOrderdetailsVo, TyyOrdersVo tyyOrdersVo) {
OrderTicketDetailVo orderTicketDetailVo = new OrderTicketDetailVo();
orderTicketDetailVo.setId(StringHelper.getNewID());
orderTicketDetailVo.setVerify_code(tyyOrderdetailsVo.getAuxiliarycode());
orderTicketDetailVo.setOrder_id(tyyOrdersVo.getOrdersn());
orderTicketDetailVo.setTicket_status(tyyOrderdetailsVo.getCodestatus());
if ("1".equals(tyyOrderdetailsVo.getCodestatus())){
orderTicketDetailVo.setTime(tyyOrderdetailsVo.getChecktime());
}else if("2".equals(tyyOrderdetailsVo.getCodestatus())){
orderTicketDetailVo.setTime(tyyOrderdetailsVo.getRefundtime());
}
orderTicketDetailVo.setTicket_code(tyyOrderdetailsVo.getLinkid());
orderTicketDetailVo.setCode_url(tyyOrderdetailsVo.getPicUrl());
/*若该order_id存在则跳过,不存在则新增*/
OrderTicketDetailGetReqVo orderTicketDetailGetReqVo = new OrderTicketDetailGetReqVo();
orderTicketDetailGetReqVo.setOrder_id(orderTicketDetailVo.getOrder_id());
OrderTicketDetailVo orderTicketDetailVo1 = orderTicketDetailDao.load(orderTicketDetailGetReqVo,OrderTicketDetailVo.class);
if (null == orderTicketDetailVo1){
orderTicketDetailDao.create(orderTicketDetailVo);
}
}
private void saveOrderStatusVoStepThree(TyyOrdersVo tyyOrdersVo) {
OrderStatusVo orderStatusVo = new OrderStatusVo();
orderStatusVo.setId(tyyOrdersVo.getOrdersn());
orderStatusVo.setPay_type(tyyOrdersVo.getPaytype());
orderStatusVo.setPayment_time(tyyOrdersVo.getPaymenttime());
orderStatusVo.setPayment_status(tyyOrdersVo.getPaystatus());
if ("1".equals(tyyOrdersVo.getStatus())){
orderStatusVo.setOrder_status("2");
}else if("3".equals(tyyOrdersVo.getStatus()) && "0".equals(tyyOrdersVo.getPaystatus())){
orderStatusVo.setOrder_status("0");
}else if("3".equals(tyyOrdersVo.getStatus()) && "1".equals(tyyOrdersVo.getPaystatus())){
orderStatusVo.setOrder_status("1");
}
orderStatusVo.setThird_order_id(tyyOrdersVo.getPiaostorderid());
orderStatusVo.setProduct_company_id(tyyOrdersVo.getEnterpriseid());
orderStatusVo.setPayment_id(tyyOrdersVo.getTongl_third_ordersn());
orderStatusVo.setIs_summarize(tyyOrdersVo.getEmancipated());
orderStatusVo.setSummarize_time(tyyOrdersVo.getEmancipated_date());
orderStatusVo.setDivide_status(tyyOrdersVo.getProfit_checked());
orderStatusVo.setDivide_time(tyyOrdersVo.getProfit_checked_date());
orderStatusVo.setAgent_company_id(tyyOrdersVo.getFxsid());
orderStatusVo.setIs_delete(tyyOrdersVo.getIsdelete());
orderStatusVo.setPay_tonglian_id(tyyOrdersVo.getTongl_ordersn());
/*若该id存在则跳过,不存在则新增*/
OrderStatusGetReqVo orderStatusGetReqVo = new OrderStatusGetReqVo();
orderStatusGetReqVo.setId(orderStatusVo.getId());
OrderStatusVo orderStatusVo1 = orderStatusDaoImpl.load(orderStatusGetReqVo,OrderStatusVo.class);
if (null == orderStatusVo1){
orderStatusDaoImpl.create(orderStatusVo);
}
}
private void saveOrderRefundVoStepThree(List<TyyOrderbackVo> tyyOrderbackVoList) {
for (TyyOrderbackVo tyyOrderbackVo:tyyOrderbackVoList) {
OrderRefundVo orderRefundVo = new OrderRefundVo();
orderRefundVo.setId(tyyOrderbackVo.getId());
orderRefundVo.setOrder_id(tyyOrderbackVo.getOrdersn());
orderRefundVo.setOperator(tyyOrderbackVo.getAcceptanceuser());
orderRefundVo.setRefund_status(tyyOrderbackVo.getRefundstatus());
orderRefundVo.setRefund_date(tyyOrderbackVo.getRefundtime());
orderRefundVo.setRefund_fee(tyyOrderbackVo.getRefundFee());
orderRefundVo.setRefund_amount(tyyOrderbackVo.getReceiveMoney());
orderRefundVo.setRefund_reason(tyyOrderbackVo.getRefundReason());
/*若该id存在则跳过,不存在则新增*/
OrderRefundGetReqVo orderRefundGetReqVo = new OrderRefundGetReqVo();
orderRefundGetReqVo.setId(orderRefundVo.getId());
OrderRefundVo orderRefundVo1 = orderRefundDaoImpl.load(orderRefundGetReqVo,OrderRefundVo.class);
if (null == orderRefundVo1){
orderRefundDaoImpl.create(orderRefundVo);
}
}
}
private void saveOrderExtendVoStepThree(TyyOrdersVo tyyOrdersVo) {
/*游玩地址*/
OrderExtendVo orderExtendVoAddress = new OrderExtendVo();
orderExtendVoAddress.setId(StringHelper.getNewID());
orderExtendVoAddress.setOrder_id(tyyOrdersVo.getOrdersn());
orderExtendVoAddress.setTitle("游玩地址");
orderExtendVoAddress.setContent(tyyOrdersVo.getPlay_address());
OrderExtendGetReqVo orderExtendGetReqVo = new OrderExtendGetReqVo();
orderExtendGetReqVo.setOrder_id(orderExtendVoAddress.getOrder_id());
orderExtendGetReqVo.setTitle(orderExtendVoAddress.getTitle());
/*若该order_id存在则跳过,不存在则新增*/
OrderExtendVo orderExtendVo1 = orderExtendDaoImpl.load(orderExtendGetReqVo,OrderExtendVo.class);
if (null == orderExtendVo1){
orderExtendDaoImpl.create(orderExtendVoAddress);
}
/*OrderExtendVo表*/
/*游玩时间*/
OrderExtendVo orderExtendVoTime = new OrderExtendVo();
orderExtendVoTime.setId(StringHelper.getNewID());
orderExtendVoTime.setOrder_id(tyyOrdersVo.getOrdersn());
orderExtendVoTime.setTitle("游玩时间");
orderExtendVoTime.setContent(tyyOrdersVo.getPlay_time());
OrderExtendGetReqVo orderExtendGetReqVo1 = new OrderExtendGetReqVo();
orderExtendGetReqVo1.setOrder_id(orderExtendVoTime.getOrder_id());
orderExtendGetReqVo1.setTitle(orderExtendVoTime.getTitle());
/*若该order_id存在则跳过,不存在则新增*/
OrderExtendVo orderExtendVo2 = orderExtendDaoImpl.load(orderExtendGetReqVo,OrderExtendVo.class);
if (null == orderExtendVo2){
orderExtendDaoImpl.create(orderExtendVoTime);
}
}
private void saveOrderVoStepThree(TyyOrdersVo tyyOrdersVo, List<TyyOrderbackVo> tyyOrderbackVoList, OrderRelVo orderRelVo) {
int refundNum = 0; int refundNum = 0;
double refundFee = 0d; double refundFee = 0d;
double pdRefundMoney = 0d; double pdRefundMoney = 0d;
...@@ -196,6 +358,9 @@ public class DataServiceImpl implements DataService { ...@@ -196,6 +358,9 @@ public class DataServiceImpl implements DataService {
refundMoney += tyyOrderbackVo.getRefundMoney(); refundMoney += tyyOrderbackVo.getRefundMoney();
} }
OrderVo orderVo = new OrderVo(); OrderVo orderVo = new OrderVo();
if (null != orderRelVo){
orderVo.setPid(orderRelVo.getGroup_ordersn());
}
orderVo.setId(tyyOrdersVo.getOrdersn()); orderVo.setId(tyyOrdersVo.getOrdersn());
orderVo.setProduct_name(tyyOrdersVo.getConsignee()); orderVo.setProduct_name(tyyOrdersVo.getConsignee());
orderVo.setMerchant_name(tyyOrdersVo.getScenicspotname()); orderVo.setMerchant_name(tyyOrdersVo.getScenicspotname());
...@@ -227,37 +392,52 @@ public class DataServiceImpl implements DataService { ...@@ -227,37 +392,52 @@ public class DataServiceImpl implements DataService {
if (null == orderVo1){ if (null == orderVo1){
orderDaoImpl.create(orderVo); orderDaoImpl.create(orderVo);
} }
/*OrderExtendVo表*/ }
/*游玩地址*/
OrderExtendVo orderExtendVoAddress = new OrderExtendVo(); @Override
orderExtendVoAddress.setId(StringHelper.getNewID()); @Transactional(rollbackFor = Exception.class)
orderExtendVoAddress.setOrder_id(tyyOrdersVo.getOrdersn()); public void saveOrderStepOne(OrderStepOneResVo reqVo) {
orderExtendVoAddress.setTitle("游玩地址"); TyyOrderVo tyyOrderVo = reqVo.getTyyOrderVo();
orderExtendVoAddress.setContent(tyyOrdersVo.getPlay_address()); TyyOrderMixVo tyyOrderMixVo = reqVo.getTyyOrderMixVo();
OrderExtendGetReqVo orderExtendGetReqVo = new OrderExtendGetReqVo(); List<TyyOrderbackVo> tyyOrderbackVoList = reqVo.getTyyOrderbackVoList();
orderExtendGetReqVo.setOrder_id(orderExtendVoAddress.getOrder_id()); TyyOrderdetailsVo tyyOrderdetailsVo = reqVo.getTyyOrderdetailsVo();
orderExtendGetReqVo.setTitle(orderExtendVoAddress.getTitle()); TyyTouristVo tyyTouristVo = reqVo.getTyyTouristVo();
/*若该order_id存在则跳过,不存在则新增*/
OrderExtendVo orderExtendVo1 = orderExtendDaoImpl.load(orderExtendGetReqVo,OrderExtendVo.class); /*pd_order*/
if (null == orderExtendVo1){ saveOrderVoStepOne(tyyOrderVo,tyyOrderMixVo,tyyOrderbackVoList);
orderExtendDaoImpl.create(orderExtendVoAddress);
} /*pd_order_status*/
/*OrderExtendVo表*/ saveOrderStatusVoStepOne(tyyOrderVo,tyyOrderMixVo);
/*游玩时间*/
OrderExtendVo orderExtendVoTime = new OrderExtendVo(); /*pd_order_extend*/
orderExtendVoTime.setId(StringHelper.getNewID()); saveOrderExtendVoStepOne(tyyOrderVo,tyyOrderMixVo);
orderExtendVoTime.setOrder_id(tyyOrdersVo.getOrdersn());
orderExtendVoTime.setTitle("游玩时间"); /*pd_discount_detail*/
orderExtendVoTime.setContent(tyyOrdersVo.getPlay_time()); saveDiscountDetailVoStepOne(tyyOrderVo,tyyOrderMixVo);
OrderExtendGetReqVo orderExtendGetReqVo1 = new OrderExtendGetReqVo();
orderExtendGetReqVo1.setOrder_id(orderExtendVoTime.getOrder_id()); /*pd_order_ticket_detail*/
orderExtendGetReqVo1.setTitle(orderExtendVoTime.getTitle()); saveOrderTicketDetailVoStepOne(tyyOrderVo,tyyOrderMixVo,tyyOrderdetailsVo);
/*若该order_id存在则跳过,不存在则新增*/
OrderExtendVo orderExtendVo2 = orderExtendDaoImpl.load(orderExtendGetReqVo,OrderExtendVo.class); /*pd_order_refund*/
if (null == orderExtendVo2){ saveOrderRefundVoStepOne(tyyOrderbackVoList);
orderExtendDaoImpl.create(orderExtendVoTime);
} /*OrderTouristVo表*/
/*OrderRefundVo表*/ saveOrderTouristVoStepOne(tyyTouristVo);
}
private void saveOrderTouristVoStepOne(TyyTouristVo tyyTouristVo) {
OrderTouristVo orderTouristVo = new OrderTouristVo();
orderTouristVo.setId(StringHelper.getNewID());
orderTouristVo.setOrder_id(tyyTouristVo.getOrdersn());
orderTouristVo.setName(tyyTouristVo.getName());
orderTouristVo.setPhone(tyyTouristVo.getPhone());
orderTouristVo.setCredential_type(tyyTouristVo.getCard_type());
orderTouristVo.setCredential_number(tyyTouristVo.getIdcard());
orderTouristDao.create(orderTouristVo);
}
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());
...@@ -268,49 +448,19 @@ public class DataServiceImpl implements DataService { ...@@ -268,49 +448,19 @@ public class DataServiceImpl implements DataService {
orderRefundVo.setRefund_fee(tyyOrderbackVo.getRefundFee()); orderRefundVo.setRefund_fee(tyyOrderbackVo.getRefundFee());
orderRefundVo.setRefund_amount(tyyOrderbackVo.getReceiveMoney()); orderRefundVo.setRefund_amount(tyyOrderbackVo.getReceiveMoney());
orderRefundVo.setRefund_reason(tyyOrderbackVo.getRefundReason()); orderRefundVo.setRefund_reason(tyyOrderbackVo.getRefundReason());
/*若该id存在则跳过,不存在则新增*/ orderRefundDaoImpl.create(orderRefundVo);
OrderRefundGetReqVo orderRefundGetReqVo = new OrderRefundGetReqVo();
orderRefundGetReqVo.setId(orderRefundVo.getId());
OrderRefundVo orderRefundVo1 = orderRefundDaoImpl.load(orderRefundGetReqVo,OrderRefundVo.class);
if (null == orderRefundVo1){
orderRefundDaoImpl.create(orderRefundVo);
}
} }
/*OrderStatusVo表*/ }
OrderStatusVo orderStatusVo = new OrderStatusVo();
orderStatusVo.setId(tyyOrdersVo.getOrdersn()); private void saveOrderTicketDetailVoStepOne(TyyOrderVo tyyOrderVo, TyyOrderMixVo tyyOrderMixVo, TyyOrderdetailsVo tyyOrderdetailsVo) {
orderStatusVo.setPay_type(tyyOrdersVo.getPaytype());
orderStatusVo.setPayment_time(tyyOrdersVo.getPaymenttime());
orderStatusVo.setPayment_status(tyyOrdersVo.getPaystatus());
if ("1".equals(tyyOrdersVo.getStatus())){
orderStatusVo.setOrder_status("2");
}else if("3".equals(tyyOrdersVo.getStatus()) && "0".equals(tyyOrdersVo.getPaystatus())){
orderStatusVo.setOrder_status("0");
}else if("3".equals(tyyOrdersVo.getStatus()) && "1".equals(tyyOrdersVo.getPaystatus())){
orderStatusVo.setOrder_status("1");
}
orderStatusVo.setThird_order_id(tyyOrdersVo.getPiaostorderid());
orderStatusVo.setProduct_company_id(tyyOrdersVo.getEnterpriseid());
orderStatusVo.setPayment_id(tyyOrdersVo.getTongl_third_ordersn());
orderStatusVo.setIs_summarize(tyyOrdersVo.getEmancipated());
orderStatusVo.setSummarize_time(tyyOrdersVo.getEmancipated_date());
orderStatusVo.setDivide_status(tyyOrdersVo.getProfit_checked());
orderStatusVo.setDivide_time(tyyOrdersVo.getProfit_checked_date());
orderStatusVo.setAgent_company_id(tyyOrdersVo.getFxsid());
orderStatusVo.setIs_delete(tyyOrdersVo.getIsdelete());
orderStatusVo.setPay_tonglian_id(tyyOrdersVo.getTongl_ordersn());
/*若该id存在则跳过,不存在则新增*/
OrderStatusGetReqVo orderStatusGetReqVo = new OrderStatusGetReqVo();
orderStatusGetReqVo.setId(orderStatusVo.getId());
OrderStatusVo orderStatusVo1 = orderStatusDaoImpl.load(orderStatusGetReqVo,OrderStatusVo.class);
if (null == orderStatusVo1){
orderStatusDaoImpl.create(orderStatusVo);
}
/*OrderTicketDetailVo表*/
OrderTicketDetailVo orderTicketDetailVo = new OrderTicketDetailVo(); OrderTicketDetailVo orderTicketDetailVo = new OrderTicketDetailVo();
if (null != tyyOrderVo){
orderTicketDetailVo.setOrder_id(tyyOrderVo.getId());
}else if(null != tyyOrderMixVo){
orderTicketDetailVo.setOrder_id(tyyOrderMixVo.getOrdersn());
}
orderTicketDetailVo.setId(StringHelper.getNewID()); orderTicketDetailVo.setId(StringHelper.getNewID());
orderTicketDetailVo.setVerify_code(tyyOrderdetailsVo.getAuxiliarycode()); orderTicketDetailVo.setVerify_code(tyyOrderdetailsVo.getAuxiliarycode());
orderTicketDetailVo.setOrder_id(tyyOrdersVo.getOrdersn());
orderTicketDetailVo.setTicket_status(tyyOrderdetailsVo.getCodestatus()); orderTicketDetailVo.setTicket_status(tyyOrderdetailsVo.getCodestatus());
if ("1".equals(tyyOrderdetailsVo.getCodestatus())){ if ("1".equals(tyyOrderdetailsVo.getCodestatus())){
orderTicketDetailVo.setTime(tyyOrderdetailsVo.getChecktime()); orderTicketDetailVo.setTime(tyyOrderdetailsVo.getChecktime());
...@@ -319,59 +469,87 @@ public class DataServiceImpl implements DataService { ...@@ -319,59 +469,87 @@ public class DataServiceImpl implements DataService {
} }
orderTicketDetailVo.setTicket_code(tyyOrderdetailsVo.getLinkid()); orderTicketDetailVo.setTicket_code(tyyOrderdetailsVo.getLinkid());
orderTicketDetailVo.setCode_url(tyyOrderdetailsVo.getPicUrl()); orderTicketDetailVo.setCode_url(tyyOrderdetailsVo.getPicUrl());
/*若该order_id存在则跳过,不存在则新增*/ orderTicketDetailDao.create(orderTicketDetailVo);
OrderTicketDetailGetReqVo orderTicketDetailGetReqVo = new OrderTicketDetailGetReqVo(); }
orderTicketDetailGetReqVo.setOrder_id(orderTicketDetailVo.getOrder_id());
OrderTicketDetailVo orderTicketDetailVo1 = orderTicketDetailDao.load(orderTicketDetailGetReqVo,OrderTicketDetailVo.class); private void saveDiscountDetailVoStepOne(TyyOrderVo tyyOrderVo, TyyOrderMixVo tyyOrderMixVo) {
if (null == orderTicketDetailVo1){
orderTicketDetailDao.create(orderTicketDetailVo);
}
/*OrderTouristVo表*/
OrderTouristVo orderTouristVo = new OrderTouristVo();
orderTouristVo.setId(StringHelper.getNewID());
orderTouristVo.setOrder_id(tyyTouristVo.getOrdersn());
orderTouristVo.setName(tyyTouristVo.getName());
orderTouristVo.setPhone(tyyTouristVo.getPhone());
orderTouristVo.setCredential_type(tyyTouristVo.getCard_type());
orderTouristVo.setCredential_number(tyyTouristVo.getIdcard());
/*若该order_id存在则跳过,不存在则新增*/
OrderTouristGetReqVo orderTouristGetReqVo = new OrderTouristGetReqVo();
orderTouristGetReqVo.setOrder_id(orderTouristVo.getOrder_id());
OrderTouristVo orderTouristVo1 = orderTouristDao.load(orderTouristGetReqVo,OrderTouristVo.class);
if (null == orderTouristVo1){
orderTouristDao.create(orderTouristVo);
}
/*DiscountDetailVo表*/
DiscountDetailVo discountDetailVo = new DiscountDetailVo(); DiscountDetailVo discountDetailVo = new DiscountDetailVo();
if (null != tyyOrderVo){
discountDetailVo.setOrder_id(tyyOrderVo.getId());
discountDetailVo.setDiscount_money(tyyOrderVo.getDiscount_price());
}else if(null != tyyOrderMixVo){
discountDetailVo.setOrder_id(tyyOrderMixVo.getOrdersn());
discountDetailVo.setDiscount_money(tyyOrderMixVo.getDiscountprice());
}
discountDetailVo.setId(StringHelper.getNewID()); discountDetailVo.setId(StringHelper.getNewID());
discountDetailVo.setOrder_id(tyyOrdersVo.getOrdersn()); discountDetailDao.create(discountDetailVo);
discountDetailVo.setDiscount_money(tyyOrdersVo.getDiscountprice()); }
/*若该order_id存在则跳过,不存在则新增*/
DiscountDetailGetReqVo discountDetailGetReqVo = new DiscountDetailGetReqVo(); private void saveOrderExtendVoStepOne(TyyOrderVo tyyOrderVo, TyyOrderMixVo tyyOrderMixVo) {
discountDetailGetReqVo.setOrder_id(discountDetailVo.getOrder_id()); if (null != tyyOrderVo){
DiscountDetailVo discountDetailVo1 = discountDetailDao.load(discountDetailGetReqVo,DiscountDetailVo.class); OrderExtendVo orderExtendVo = new OrderExtendVo();
if (null == discountDetailVo1){ orderExtendVo.setId(StringHelper.getNewID());
discountDetailDao.create(discountDetailVo); orderExtendVo.setOrder_id(tyyOrderVo.getId());
orderExtendDaoImpl.create(orderExtendVo);
}else if(null != tyyOrderMixVo){
/*pd_order_extend游玩地址*/
OrderExtendVo orderExtendAddress = new OrderExtendVo();
orderExtendAddress.setId(StringHelper.getNewID());
orderExtendAddress.setOrder_id(tyyOrderMixVo.getOrdersn());
orderExtendAddress.setTitle("游玩地址");
orderExtendAddress.setContent(tyyOrderMixVo.getPlay_address());
orderExtendDaoImpl.create(orderExtendAddress);
/*pd_order_extend游玩时间*/
OrderExtendVo orderExtendDate = new OrderExtendVo();
orderExtendAddress.setId(StringHelper.getNewID());
orderExtendDate.setOrder_id(tyyOrderMixVo.getOrdersn());
orderExtendDate.setTitle("游玩时间");
orderExtendDate.setContent(tyyOrderMixVo.getPlay_time());
orderExtendDaoImpl.create(orderExtendDate);
} }
} }
@Override private void saveOrderStatusVoStepOne(TyyOrderVo tyyOrderVo, TyyOrderMixVo tyyOrderMixVo) {
public void saveOrderStepOne(OrderStepOneResVo reqVo) { OrderStatusVo orderStatusVo = new OrderStatusVo();
TyyOrderVo tyyOrderVo = reqVo.getTyyOrderVo(); if (null != tyyOrderVo){
TyyOrderMixVo tyyOrderMixVo = reqVo.getTyyOrderMixVo(); orderStatusVo.setId(tyyOrderVo.getId());
List<TyyOrderbackVo> tyyOrderbackVoList = reqVo.getTyyOrderbackVoList(); orderStatusVo.setAgent_company_id(tyyOrderVo.getSale_company_id());
TyyOrderdetailsVo tyyOrderdetailsVo = reqVo.getTyyOrderdetailsVo(); orderStatusVo.setProduct_company_id(tyyOrderVo.getProduct_company_id());
TyyTouristVo tyyTouristVo = reqVo.getTyyTouristVo(); 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 (tyyOrderVo.getPay_status() == 0){
orderStatusVo.setPayment_status("0");
}else{
orderStatusVo.setPayment_status("1");
}
orderStatusVo.setPayment_id(tyyOrderVo.getTongl_third_ordersn());
orderStatusVo.setPay_tonglian_id(tyyOrderVo.getTongl_ordersn());
}else if(null != tyyOrderMixVo){
orderStatusVo.setId(tyyOrderMixVo.getOrdersn());
orderStatusVo.setPay_type(tyyOrderMixVo.getPaytype());
orderStatusVo.setPayment_time(tyyOrderMixVo.getPaymenttime());
orderStatusVo.setPayment_status(tyyOrderMixVo.getPaystatus());
orderStatusVo.setOrder_status(tyyOrderMixVo.getOrder_status());
orderStatusVo.setThird_order_id(tyyOrderMixVo.getPiaostorderid());
orderStatusVo.setIs_summarize(tyyOrderMixVo.getEmancipated());
orderStatusVo.setSummarize_time(tyyOrderMixVo.getEmancipated_date());
orderStatusVo.setDivide_status(tyyOrderMixVo.getProfit_checked());
orderStatusVo.setDivide_time(tyyOrderMixVo.getProfit_checked_date());
orderStatusVo.setAgent_company_id(tyyOrderMixVo.getFxsid());
orderStatusVo.setIs_delete(tyyOrderMixVo.getIsdelete());
orderStatusVo.setPayment_id(tyyOrderMixVo.getTongl_third_ordersn());
orderStatusVo.setPay_tonglian_id(tyyOrderMixVo.getTongl_ordersn());
orderStatusVo.setPay_third_id(tyyOrderMixVo.getPay_type_id());
orderStatusVo.setProduct_company_id(tyyOrderMixVo.getProduct_company_id());
}
orderStatusDaoImpl.create(orderStatusVo);
}
private void saveOrderVoStepOne(TyyOrderVo tyyOrderVo, TyyOrderMixVo tyyOrderMixVo, List<TyyOrderbackVo> tyyOrderbackVoList) {
OrderVo orderVo = new OrderVo(); OrderVo orderVo = new OrderVo();
OrderStatusVo orderStatusVo = new OrderStatusVo();
OrderRefundVo orderRefundVo = new OrderRefundVo();
OrderExtendVo orderExtendVo = new OrderExtendVo();
DiscountDetailVo discountDetailVo = new DiscountDetailVo();
OrderTicketDetailVo orderTicketDetailVo = new OrderTicketDetailVo();
OrderTouristVo orderTouristVo = new OrderTouristVo();
if (null != tyyOrderVo){ if (null != tyyOrderVo){
/*pd_order*/
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());
...@@ -386,14 +564,46 @@ public class DataServiceImpl implements DataService { ...@@ -386,14 +564,46 @@ public class DataServiceImpl implements DataService {
orderVo.setPd_order_money(tyyOrderVo.getReal_price()); orderVo.setPd_order_money(tyyOrderVo.getReal_price());
orderVo.setCost_price(tyyOrderVo.getSettlement_price()); orderVo.setCost_price(tyyOrderVo.getSettlement_price());
orderVo.setCost_total_money(tyyOrderVo.getCost_price()); orderVo.setCost_total_money(tyyOrderVo.getCost_price());
orderVo.setOrder_money(orderVo.getCost_total_money()-orderVo.getDiscount_money()); orderVo.setOrder_money(orderVo.getCost_total_money()-tyyOrderVo.getDiscount_price());
orderVo.setOrder_fee(tyyOrderVo.getOrder_poundage_price()); orderVo.setOrder_fee(tyyOrderVo.getOrder_poundage_price());
orderVo.setRefund_num(tyyOrderVo.getReturn_num()); orderVo.setRefund_num(tyyOrderVo.getReturn_num());
orderVo.setRefund_money(tyyOrderVo.getReturn_money()); orderVo.setRefund_money(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){
orderVo.setId(tyyOrderMixVo.getOrdersn());
orderVo.setProduct_name(tyyOrderMixVo.getConsignee());
orderVo.setMerchant_name(tyyOrderMixVo.getScenicspotname());
orderVo.setProduct_code(tyyOrderMixVo.getProductsn());
orderVo.setOrder_num(tyyOrderMixVo.getBuynum());
orderVo.setUnit_price(tyyOrderMixVo.getPrice());
orderVo.setTotal_money(tyyOrderMixVo.getTotal());
orderVo.setPlay_date(tyyOrderMixVo.getTraveldate());
orderVo.setUser_id(tyyOrderMixVo.getMemberid());
orderVo.setTicket_phone(tyyOrderMixVo.getUsertel());
orderVo.setOrder_time(tyyOrderMixVo.getOrdertime());
orderVo.setCost_price(tyyOrderMixVo.getPurchaseprice());
orderVo.setCost_total_money(orderVo.getCost_price()*orderVo.getOrder_num());
orderVo.setOrder_money(orderVo.getCost_total_money()-tyyOrderMixVo.getDiscountprice());
orderVo.setSub_order_type(tyyOrderMixVo.getSub_order_type());
orderVo.setPd_order_money(tyyOrderMixVo.getRealprice());
orderVo.setPd_discount_money(tyyOrderMixVo.getDiscountprice());
orderVo.setDiscount_money(tyyOrderMixVo.getDiscountprice());
orderVo.setArea_code(tyyOrderMixVo.getSight_spot_code());
orderVo.setPid(tyyOrderMixVo.getPid());
orderVo.setOrder_type(tyyOrderMixVo.getOrder_type());
orderVo.setRefund_num(tyyOrderMixVo.getReturn_num());
orderVo.setPd_refund_money(tyyOrderMixVo.getReturn_money());
orderVo.setRefund_money(tyyOrderMixVo.getReturn_money());
orderVo.setOrder_fee(tyyOrderMixVo.getOrder_poundage_price());
} }
double refundFee = 0d;
for (TyyOrderbackVo tyyOrderbackVo:tyyOrderbackVoList) {
refundFee += tyyOrderbackVo.getRefundFee();
}
orderVo.setRefund_fee(refundFee);
orderDaoImpl.create(orderVo);
} }
} }
src/main/java/com/pangding/web/authority/vo/OrderRelVo.java 0 → 100644
View file @ 6bbc5626
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/TyyOrderMixVo.java
View file @ 6bbc5626
...@@ -16,14 +16,14 @@ public class TyyOrderMixVo { ...@@ -16,14 +16,14 @@ public class TyyOrderMixVo {
private String paytype; private String paytype;
private String paymenttime; private String paymenttime;
private String paystatus; private String paystatus;
private Integer order_status; private String order_status;
private String piaostorderid; private String piaostorderid;
private String memberid; private String memberid;
private String enterpriseid; private String enterpriseid;
private String usertel; private String usertel;
private String ordertime; private String ordertime;
private Double purchaseprice; private Double purchaseprice;
private Integer sub_order_type; private String sub_order_type;
private String emancipated; private String emancipated;
private String emancipated_date; private String emancipated_date;
private String profit_checked; private String profit_checked;
...@@ -133,11 +133,11 @@ public class TyyOrderMixVo { ...@@ -133,11 +133,11 @@ public class TyyOrderMixVo {
this.paystatus = paystatus; this.paystatus = paystatus;
} }
public Integer getOrder_status() { public String getOrder_status() {
return order_status; return order_status;
} }
public void setOrder_status(Integer order_status) { public void setOrder_status(String order_status) {
this.order_status = order_status; this.order_status = order_status;
} }
...@@ -189,11 +189,11 @@ public class TyyOrderMixVo { ...@@ -189,11 +189,11 @@ public class TyyOrderMixVo {
this.purchaseprice = purchaseprice; this.purchaseprice = purchaseprice;
} }
public Integer getSub_order_type() { public String getSub_order_type() {
return sub_order_type; return sub_order_type;
} }
public void setSub_order_type(Integer sub_order_type) { public void setSub_order_type(String sub_order_type) {
this.sub_order_type = sub_order_type; this.sub_order_type = sub_order_type;
} }
......
src/main/java/com/pangding/web/authority/vo/TyyOrderVo.java
View file @ 6bbc5626
...@@ -97,13 +97,13 @@ public class TyyOrderVo { ...@@ -97,13 +97,13 @@ public class TyyOrderVo {
* 订单状态 * 订单状态
* 0,待付款、1,已付款（出票中）、2,成功出票、3,核销中、4,核销完成、5,部分退款、6,全部退款、7,已取消 * 0,待付款、1,已付款（出票中）、2,成功出票、3,核销中、4,核销完成、5,部分退款、6,全部退款、7,已取消
*/ */
private Integer order_status; private String order_status;
private String create_date; private String create_date;
/** /**
* 付款类型 0：微信 1:支付宝 2:通联 * 付款类型 0：微信 1:支付宝 2:通联
*/ */
private Integer pay_type; private String pay_type;
/** /**
* 付款凭证编号 * 付款凭证编号
*/ */
...@@ -299,11 +299,11 @@ public class TyyOrderVo { ...@@ -299,11 +299,11 @@ public class TyyOrderVo {
this.refund_poundage_price = refund_poundage_price; this.refund_poundage_price = refund_poundage_price;
} }
public Integer getOrder_status() { public String getOrder_status() {
return order_status; return order_status;
} }
public void setOrder_status(Integer order_status) { public void setOrder_status(String order_status) {
this.order_status = order_status; this.order_status = order_status;
} }
...@@ -315,11 +315,11 @@ public class TyyOrderVo { ...@@ -315,11 +315,11 @@ public class TyyOrderVo {
this.create_date = create_date; this.create_date = create_date;
} }
public Integer getPay_type() { public String getPay_type() {
return pay_type; return pay_type;
} }
public void setPay_type(Integer pay_type) { public void setPay_type(String pay_type) {
this.pay_type = pay_type; this.pay_type = pay_type;
} }
......
src/main/java/com/pangding/web/authority/vo/resvo/OrderStepThreeResVo.java
View file @ 6bbc5626
package com.pangding.web.authority.vo.resvo; package com.pangding.web.authority.vo.resvo;
import com.pangding.web.authority.vo.TyyOrderbackVo; import com.pangding.web.authority.vo.*;
import com.pangding.web.authority.vo.TyyOrderdetailsVo;
import com.pangding.web.authority.vo.TyyOrdersVo;
import com.pangding.web.authority.vo.TyyTouristVo;
import java.util.List; import java.util.List;
...@@ -22,6 +19,16 @@ public class OrderStepThreeResVo { ...@@ -22,6 +19,16 @@ public class OrderStepThreeResVo {
private TyyTouristVo tyyTouristVo; private TyyTouristVo tyyTouristVo;
private OrderRelVo orderRelVo;
public OrderRelVo getOrderRelVo() {
return orderRelVo;
}
public void setOrderRelVo(OrderRelVo orderRelVo) {
this.orderRelVo = orderRelVo;
}
public TyyTouristVo getTyyTouristVo() { public TyyTouristVo getTyyTouristVo() {
return tyyTouristVo; return tyyTouristVo;
} }
......
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