Skip to content

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

Merge branch 'master' of http://192.168.0.204/pd-new/pd-user

parents 915631d9 99385e85
Show whitespace changes
Inline Side-by-side
Showing with 12 additions and 12 deletions
src/main/java/com/pangding/web/authority/service/impl/DataServiceImpl.java
View file @ a18ed593
......@@ -417,15 +417,15 @@ public class DataServiceImpl implements DataService {
}
orderVo.setRefund_fee(refundFee);
orderVo.setPd_refund_money(pdRefundMoney);
orderVo.setDiscount_money(tyyOrdersVo.getDiscountprice());
orderVo.setPd_discount_money(tyyOrdersVo.getDiscountprice());
orderVo.setDiscount_money(null == tyyOrdersVo.getDiscountprice()?0:tyyOrdersVo.getDiscountprice());
orderVo.setPd_discount_money(null == tyyOrdersVo.getDiscountprice()?0:tyyOrdersVo.getDiscountprice());
orderVo.setRefund_money(refundMoney);
if (null == tyyOrdersVo.getFieldTicket()){
orderVo.setSub_order_type(0);
}else {
orderVo.setSub_order_type(Integer.parseInt(tyyOrdersVo.getFieldTicket()));
}
orderVo.setPd_order_money(tyyOrdersVo.getRealprice());
orderVo.setPd_order_money(null == tyyOrdersVo.getRealprice()?orderVo.getTotal_money()-orderVo.getPd_discount_money():tyyOrdersVo.getRealprice());
orderVo.setArea_code(tyyOrdersVo.getSight_spot_code());
orderVo.setOrder_type(1);
/*若该id存在则跳过，不存在则新增*/
......@@ -719,20 +719,20 @@ public class DataServiceImpl implements DataService {
orderVo.setSub_order_type(tyyOrderVo.getSub_order_type());
orderVo.setProduct_name(tyyOrderVo.getProduct_name());
orderVo.setPlay_date(tyyOrderVo.getPlay_date());
orderVo.setUnit_price(tyyOrderVo.getPrice());
orderVo.setOrder_num(tyyOrderVo.getOrder_num());
orderVo.setUnit_price(null == tyyOrderVo.getPrice()?0:tyyOrderVo.getPrice());
orderVo.setOrder_num(null == tyyOrderVo.getOrder_num()?0:tyyOrderVo.getOrder_num());
orderVo.setTotal_money(tyyOrderVo.getSale_price());
orderVo.setDiscount_money(tyyOrderVo.getDiscount_price());
orderVo.setDiscount_money(null == tyyOrderVo.getDiscount_price()?0:tyyOrderVo.getDiscount_price());
orderVo.setPd_discount_money(tyyOrderVo.getDiscount_price());
orderVo.setPd_order_money(tyyOrderVo.getReal_price());
orderVo.setCost_price(tyyOrderVo.getSettlement_price());
orderVo.setCost_total_money(tyyOrderVo.getCost_price());
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_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()){
orderVo.setOrder_money(orderVo.getCost_total_money()-tyyOrderVo.getDiscount_price());
}
orderVo.setOrder_fee(tyyOrderVo.getOrder_poundage_price());
orderVo.setRefund_num(tyyOrderVo.getReturn_num());
orderVo.setRefund_money(tyyOrderVo.getReturn_money());
orderVo.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_money(null == tyyOrderVo.getReturn_money()?0:tyyOrderVo.getReturn_money());
orderVo.setPd_refund_money(tyyOrderVo.getReturn_money());
orderVo.setOrder_time(tyyOrderVo.getCreate_date());
}else if(null != tyyOrderMixVo){
......
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