Skip to content

caosy / fun-golf-service

Go to a project
Commit bf5586ac by Huang Linyu
Options

Re: 后台财务模块的球场订单，修改导出的模板格式

parent 355846c1
Inline Side-by-side
Showing with 39 additions and 1 deletions
src/main/java/com/ctrip/fun/golf/service/finance/CourseFinanceService.java
...@@ -16,16 +16,21 @@ import com.ctrip.fun.common.vo.finance.CourseOrderFinanceBean; ...@@ -16,16 +16,21 @@ import com.ctrip.fun.common.vo.finance.CourseOrderFinanceBean;
import com.ctrip.fun.common.vo.finance.CourseOrderFinanceQuery; import com.ctrip.fun.common.vo.finance.CourseOrderFinanceQuery;
import com.ctrip.fun.common.vo.operation.SupplierSettlementTypeEnum; import com.ctrip.fun.common.vo.operation.SupplierSettlementTypeEnum;
import com.ctrip.fun.common.vo.order.OfflinePayTypeEnum; import com.ctrip.fun.common.vo.order.OfflinePayTypeEnum;
import com.ctrip.fun.common.vo.order.OrderPayinfoBean;
import com.ctrip.fun.common.vo.order.OrderStatusEnum; import com.ctrip.fun.common.vo.order.OrderStatusEnum;
import com.ctrip.fun.common.vo.product.ProductPayModeEnum; import com.ctrip.fun.common.vo.product.ProductPayModeEnum;
import com.ctrip.fun.golf.dao.basic.DistrictDao; import com.ctrip.fun.golf.dao.basic.DistrictDao;
import com.ctrip.fun.golf.dao.order.CustomerInfoDao; import com.ctrip.fun.golf.dao.order.CustomerInfoDao;
import com.ctrip.fun.golf.dao.order.InvoiceinfoDao; import com.ctrip.fun.golf.dao.order.InvoiceinfoDao;
import com.ctrip.fun.golf.dao.order.OrderAssignmentDao;
import com.ctrip.fun.golf.dao.order.OrderDao; import com.ctrip.fun.golf.dao.order.OrderDao;
import com.ctrip.fun.golf.dao.order.OrderPayinfoDao;
import com.ctrip.fun.golf.dao.product.ResourcePriceDao; import com.ctrip.fun.golf.dao.product.ResourcePriceDao;
import com.ctrip.fun.golf.domain.basic.District; import com.ctrip.fun.golf.domain.basic.District;
import com.ctrip.fun.golf.domain.order.CustomerInfo; import com.ctrip.fun.golf.domain.order.CustomerInfo;
import com.ctrip.fun.golf.domain.order.Invoiceinfo; import com.ctrip.fun.golf.domain.order.Invoiceinfo;
import com.ctrip.fun.golf.domain.order.OrderAssignment;
import com.ctrip.fun.golf.domain.order.OrderPayinfo;
import com.ctrip.fun.golf.domain.product.ResourcePrice; import com.ctrip.fun.golf.domain.product.ResourcePrice;
/** /**
...@@ -44,6 +49,10 @@ public class CourseFinanceService { ...@@ -44,6 +49,10 @@ public class CourseFinanceService {
private DistrictDao districtDao = null; private DistrictDao districtDao = null;
private OrderPayinfoDao orderPayinfoDao = null;
private OrderAssignmentDao orderAssignmentDao = null;
private Invoiceinfo findInvoiceinfo(Integer orderId, List<Invoiceinfo> invoiceinfos) { private Invoiceinfo findInvoiceinfo(Integer orderId, List<Invoiceinfo> invoiceinfos) {
for (Invoiceinfo invoiceinfo : invoiceinfos) { for (Invoiceinfo invoiceinfo : invoiceinfos) {
int val = invoiceinfo.getOrderId().compareTo(orderId); int val = invoiceinfo.getOrderId().compareTo(orderId);
...@@ -130,7 +139,7 @@ public class CourseFinanceService { ...@@ -130,7 +139,7 @@ public class CourseFinanceService {
courseOrderFinanceBean.setOfflinePayTypeMsg(OfflinePayTypeEnum.valueOf(courseOrderFinanceBean.getOfflinePayType()).getMsg()); courseOrderFinanceBean.setOfflinePayTypeMsg(OfflinePayTypeEnum.valueOf(courseOrderFinanceBean.getOfflinePayType()).getMsg());
} }
List<CustomerInfo> customerInfos = this.customerInfoDao.getCustomerByOrderID(courseOrderFinanceBean.getOrderId()); List<CustomerInfo> customerInfos = this.customerInfoDao.getCustomerByOrderID(courseOrderFinanceBean.getOrderId());
courseOrderFinanceBean.setPlayerNum(customerInfos.size());
if(customerInfos.size()>=4){ if(customerInfos.size()>=4){
courseOrderFinanceBean.setPlayer4(customerInfos.get(3).getCname()); courseOrderFinanceBean.setPlayer4(customerInfos.get(3).getCname());
} }
...@@ -148,6 +157,17 @@ public class CourseFinanceService { ...@@ -148,6 +157,17 @@ public class CourseFinanceService {
District distinct = districtDao.findById(courseOrderFinanceBean.getDistrictId()); District distinct = districtDao.findById(courseOrderFinanceBean.getDistrictId());
courseOrderFinanceBean.setDistrictName(distinct.getName()); courseOrderFinanceBean.setDistrictName(distinct.getName());
} }
List<Integer> orderIds = new ArrayList<Integer>();
orderIds.add(courseOrderFinanceBean.getOrderId());
List<OrderPayinfoBean> orderPayInfoList = orderPayinfoDao.getOrderPayinfoBeanList(orderIds);
if(orderPayInfoList.size()>0){
courseOrderFinanceBean.setPayeeName(orderPayInfoList.get(0).getPayeeName());
}
List<OrderAssignment> orderAssignments = orderAssignmentDao.getOrderAssignmentByOrderIds(orderIds); // 接管人
if(orderAssignments.size()>0){
courseOrderFinanceBean.setReceiver(orderAssignments.get(0).getEid());
}
} }
} }
return pagedResponseBean; return pagedResponseBean;
...@@ -200,4 +220,20 @@ public class CourseFinanceService { ...@@ -200,4 +220,20 @@ public class CourseFinanceService {
this.districtDao = districtDao; this.districtDao = districtDao;
} }
public OrderPayinfoDao getOrderPayinfoDao() {
return orderPayinfoDao;
}
public void setOrderPayinfoDao(OrderPayinfoDao orderPayinfoDao) {
this.orderPayinfoDao = orderPayinfoDao;
}
public OrderAssignmentDao getOrderAssignmentDao() {
return orderAssignmentDao;
}
public void setOrderAssignmentDao(OrderAssignmentDao orderAssignmentDao) {
this.orderAssignmentDao = orderAssignmentDao;
}
} }
src/main/resources/finance.spring.xml
...@@ -56,6 +56,8 @@ ...@@ -56,6 +56,8 @@
<property name="orderDao" ref="orderDao"></property> <property name="orderDao" ref="orderDao"></property>
<property name="resourcePriceDao" ref="resourcePriceDao"></property> <property name="resourcePriceDao" ref="resourcePriceDao"></property>
<property name="districtDao" ref="districtDao"></property> <property name="districtDao" ref="districtDao"></property>
<property name="orderPayinfoDao" ref="orderPayinfoDao"></property>
<property name="orderAssignmentDao" ref="orderAssignmentDao"></property>
</bean> </bean>
<bean name="tourFinanceService" class="com.ctrip.fun.golf.service.finance.TourFinanceService"> <bean name="tourFinanceService" class="com.ctrip.fun.golf.service.finance.TourFinanceService">
......
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 sign in to comment