Skip to content

caosy / fun-golf-service

Go to a project
Commit c7e95633 by Huang Linyu
Options

修复BigDecimal.valueOf(double) 和BigDecimal.valueOf(long) 中参数的转换,针对Double和Long/Integer

parent 29348935
Inline Side-by-side
Showing with 51 additions and 51 deletions
src/main/java/com/ctrip/fun/golf/service/assemble/AsmCourseResourceService.java
......@@ -1183,8 +1183,8 @@ public class AsmCourseResourceService {
courseProductBean.setId(courseProduct.getId());
courseProductBean.setCourseId(courseProduct.getCourseId());
courseProductBean.setName(courseProduct.getName());
courseProductBean.setMinPrice(BigDecimal.valueOf(asmCourseresourceBean.getCommunePrice()));
courseProductBean.setMinusPrice(BigDecimal.valueOf(asmCourseresourceBean.getCommuneMinus()));
courseProductBean.setMinPrice(BigDecimal.valueOf(asmCourseresourceBean.getCommunePrice().doubleValue()));
courseProductBean.setMinusPrice(BigDecimal.valueOf(asmCourseresourceBean.getCommuneMinus().doubleValue()));
return courseProductBean;
}
......
src/main/java/com/ctrip/fun/golf/service/finance/CourseBalanceService.java
......@@ -108,7 +108,7 @@ public class CourseBalanceService extends GenericService<CourseBalanceDao, Cours
throw new ServiceException("预付款手动操作失败:找不到对应的courseBalance，id=" + changeCourseBalanceBean.getId());
}
CourseBalanceTxn courseBalanceTxn = new CourseBalanceTxn();
courseBalanceTxn.setPrePayAmount(BigDecimal.valueOf(changeCourseBalanceBean.getAddBalance()));
courseBalanceTxn.setPrePayAmount(BigDecimal.valueOf(changeCourseBalanceBean.getAddBalance().doubleValue()));
courseBalanceTxn.setOperateType(PrepayAmtOperateTypeEnum.AMT_SET.getKey());
courseBalanceTxn.setCourseId(courseBalance.getCourseId());
courseBalanceTxn.setOperationDesc(changeCourseBalanceBean.getRemarks());
......
src/main/java/com/ctrip/fun/golf/service/finance/CourseFinanceService.java
......@@ -111,7 +111,7 @@ public class CourseFinanceService {
courseOrderFinanceBean.setTeeTime("--:--");
}
ResourcePrice resourceCommission = resourcePriceDao.getResourcePrice(courseOrderFinanceBean.getPlayDate(), courseOrderFinanceBean.getResourceId());
courseOrderFinanceBean.setCommission(resourceCommission == null ? BigDecimal.ZERO : BigDecimal.valueOf(resourceCommission.getCommission()).multiply(
courseOrderFinanceBean.setCommission(resourceCommission == null ? BigDecimal.ZERO : BigDecimal.valueOf(resourceCommission.getCommission().doubleValue()).multiply(
BigDecimal.valueOf(courseOrderFinanceBean.getPlayNums())));
List<CustomerInfo> customerInfos = this.customerInfoDao.getCustomerByOrderID(courseOrderFinanceBean.getOrderId());
if (courseOrderFinanceQuery.isExportExcel()) {
......
src/main/java/com/ctrip/fun/golf/service/finance/TourBalanceService.java
......@@ -110,7 +110,7 @@ public class TourBalanceService extends GenericService<TourBalanceDao, TourBalan
// 增加预付款交易记录
TourBalanceTxn tourBalanceTxn = new TourBalanceTxn();
tourBalanceTxn.setPrePayAmount(BigDecimal.valueOf(changeTourBalanceBean.getAddBalance()));
tourBalanceTxn.setPrePayAmount(BigDecimal.valueOf(changeTourBalanceBean.getAddBalance().doubleValue()));
tourBalanceTxn.setOperateType(PrepayAmtOperateTypeEnum.AMT_SET.getKey());
tourBalanceTxn.setTourId(tourBalance.getTourId());
tourBalanceTxn.setOperationDesc(changeTourBalanceBean.getRemarks());
......
src/main/java/com/ctrip/fun/golf/service/order/CourseOrderService.java
......@@ -675,7 +675,7 @@ public class CourseOrderService extends AbstractOrderService<CourseOrderBean, Co
resourceInventoryQuery.setTheDate(resourceInfo.getPlayDate());
Integer intInventory = this.getCourseResourceService().getInventory(resourceInventoryQuery);
CourseResource courseResource = this.courseResourceDao.findById(resourceInfo.getResourceId());
if (resourceInfo.getAmount().subtract(resourceInfo.getSalePrice().multiply(BigDecimal.valueOf(resourceInfo.getQuantity()))).doubleValue() != 0) {
if (resourceInfo.getAmount().subtract(resourceInfo.getSalePrice().multiply(BigDecimal.valueOf(resourceInfo.getQuantity().intValue()))).doubleValue() != 0) {
throw new OrderException(-5, "订单金额计算有误");
} else if (!asmCourseresource.getSalePrice().equals(resourceInfo.getSalePrice().doubleValue())) {
throw new OrderException(-5, "产品单价有误");
......@@ -833,9 +833,9 @@ public class CourseOrderService extends AbstractOrderService<CourseOrderBean, Co
orderItem.setTeeTime(orderItemBean.getTeeTime());
orderItem.setRealPlayTime("");
orderItem.setCurrency(orderItemBean.getCurrency());
orderItem.setMarketPrice(BigDecimal.valueOf(asmCourseResource.getMarketPrice()));
orderItem.setMarketPrice(BigDecimal.valueOf(asmCourseResource.getMarketPrice().doubleValue()));
orderItem.setSalePrice(orderItemBean.getSalePrice());
orderItem.setFloorPrice(BigDecimal.valueOf(asmCourseResource.getFloorPrice()));
orderItem.setFloorPrice(BigDecimal.valueOf(asmCourseResource.getFloorPrice().doubleValue()));
orderItem.setAmount(orderItemBean.getAmount());
orderItem.setConfirmStatus("S");
orderItem.setSupplierId(supplier.getId());
......@@ -850,7 +850,7 @@ public class CourseOrderService extends AbstractOrderService<CourseOrderBean, Co
this.getOrderDao().updateOrdersCanInvoiceDate(orderId, DateUtil.addDays(orderItemBean.getPlayDate(), 1));
this.getOrderItemDao().save(orderItem);
//更新订单成本
this.updateOrderCost(orderId, BigDecimal.valueOf(asmCourseResource.getFloorPrice()));
this.updateOrderCost(orderId, BigDecimal.valueOf(asmCourseResource.getFloorPrice().doubleValue()));
try {
userService.saveOrderedCourse(asmCourseResource.getCourseId(), courseOrderBean.getUid());
} catch (Exception e) {
......@@ -1133,7 +1133,7 @@ public class CourseOrderService extends AbstractOrderService<CourseOrderBean, Co
orderItemBean.setFeeDesc(courseResource.getService());
orderItemBean.setCancelTips(courseResource.getCancelTips());
orderItemBean.setProductId(orderItem.getCourseProductId());
orderItemBean.setSalePrice(BigDecimal.valueOf(resourcePrice.getSalePrice()));
orderItemBean.setSalePrice(BigDecimal.valueOf(resourcePrice.getSalePrice().doubleValue()));
orderItemBean.setMemberCashRebate(resourcePrice.getMemberCashRebate());
orderItemBean.setMemberPrice(resourcePrice.getMemberPrice());
orderItemBean.setPrepaidPrice(resourcePrice.getPrepaidPrice());
......
src/main/java/com/ctrip/fun/golf/service/order/EventActivityOrderService.java
......@@ -734,13 +734,13 @@ public class EventActivityOrderService extends
if (eventActivityOrderItemBeans != null) {
for (EventActivityOrderResourceBean eventActivityOrderResourceBean : eventActivityOrderItemBeans) {
double amount = (BigDecimal.valueOf(communeNum).multiply(BigDecimal.valueOf(
eventActivityOrderResourceBean.getCommunePrice()).subtract(
BigDecimal.valueOf(eventActivityOrderResourceBean.getCommuneMinus()))))
eventActivityOrderResourceBean.getCommunePrice().doubleValue()).subtract(
BigDecimal.valueOf(eventActivityOrderResourceBean.getCommuneMinus().doubleValue()))))
.add(BigDecimal.valueOf(communeGuestNum).multiply(
(BigDecimal.valueOf(eventActivityOrderResourceBean
.getCommuneGuestPrice()).subtract(BigDecimal
.getCommuneGuestPrice().doubleValue()).subtract(BigDecimal
.valueOf(eventActivityOrderResourceBean
.getCommuneGuestMinus()))))).doubleValue();
.getCommuneGuestMinus().doubleValue()))))).doubleValue();
totAmount = totAmount.add(BigDecimal.valueOf(amount));
}
}
......@@ -842,12 +842,12 @@ public class EventActivityOrderService extends
ResourcePrice resourcePrice = resourcePriceDao.getResourcePrice(
resourceInfo.getPlayDate(), resourceInfo.getResourceId());
double amount = (BigDecimal.valueOf(communeNum)
.multiply(BigDecimal.valueOf(resourcePrice.getCommunePrice()).subtract(
BigDecimal.valueOf(resourcePrice.getCommuneMinus())))).add(
.multiply(BigDecimal.valueOf(resourcePrice.getCommunePrice().doubleValue()).subtract(
BigDecimal.valueOf(resourcePrice.getCommuneMinus().doubleValue())))).add(
BigDecimal.valueOf(communeGuestNum).multiply(
(BigDecimal.valueOf(resourcePrice.getCommuneGuestPrice())
(BigDecimal.valueOf(resourcePrice.getCommuneGuestPrice().doubleValue())
.subtract(BigDecimal.valueOf(resourcePrice
.getCommuneGuestMinus()))))).doubleValue();
.getCommuneGuestMinus().doubleValue()))))).doubleValue();
//boolean isCommuneQuantityCorrect = (communeNum == resourceInfo.getCommuneQuantity());
//boolean isCommuneGuestQuantityCorrect = (communeGuestNum == resourceInfo.getCommuneGuestQuantity());
//boolean isTotalQuantityCorrect = ((communeNum+communeGuestNum) == resourceInfo.getQuantity());
......@@ -948,7 +948,7 @@ public class EventActivityOrderService extends
eventActivityOrderItem.setCurrency(eventActivityOrderItemBean.getCurrency());
eventActivityOrderItem.setFloorPrice(BigDecimal.valueOf(asmCourseResource
.getFloorPrice()));
.getFloorPrice().doubleValue()));
eventActivityOrderItem.setCommuneQuantity(eventActivityOrderItemBean
.getCommuneQuantity());
......
src/main/java/com/ctrip/fun/golf/service/order/OpCourseOrderService.java
......@@ -226,8 +226,8 @@ public class OpCourseOrderService extends AbstractOpOrderService<CourseOrderProc
.append(DateUtil.int2TeeTime(Integer.parseInt(orderItem.getTeeTime()))).append("] 改为 [").append(DateUtil.getDateStr(asmCourseresource.getPriceDate())).append(" ")
.append(DateUtil.int2TeeTime(asmCourseresource.getTeeTime())).append("]");
orderItem.setCourseProductId(asmCourseresource.getProductId());
orderItem.setFloorPrice(BigDecimal.valueOf(asmCourseresource.getFloorPrice()));
orderItem.setMarketPrice(BigDecimal.valueOf(asmCourseresource.getMarketPrice()));
orderItem.setFloorPrice(BigDecimal.valueOf(asmCourseresource.getFloorPrice().doubleValue()));
orderItem.setMarketPrice(BigDecimal.valueOf(asmCourseresource.getMarketPrice().doubleValue()));
orderItem.setResourceId(asmCourseresource.getResourceId());
orderItem.setResourceName(asmCourseresource.getResourceName());
orderItem.setPlayDate(asmCourseresource.getPriceDate());
......@@ -313,8 +313,8 @@ public class OpCourseOrderService extends AbstractOpOrderService<CourseOrderProc
OrderPayinfo orderPayinfo = getOrderPayinfoDao().getByOrderId(order.getOrderId());
if (orderPayinfo != null && orderPayinfo.getPrePayAmount() != null && orderPayinfo.getPrePayAmount() > 0) {
// 增加order预存款退款金额
BigDecimal demPrePayRefundAmount = BigDecimal.valueOf(orderPayinfo.getPrePayRefundAmount() == null ? 0 : orderPayinfo.getPrePayRefundAmount()).add(
BigDecimal.valueOf(orderPayinfo.getPrePayAmount()));
BigDecimal demPrePayRefundAmount = BigDecimal.valueOf(orderPayinfo.getPrePayRefundAmount() == null ? 0 : orderPayinfo.getPrePayRefundAmount().doubleValue()).add(
BigDecimal.valueOf(orderPayinfo.getPrePayAmount().doubleValue()));
orderPayinfo.setPrePayRefundAmount(demPrePayRefundAmount.doubleValue());
getOrderPayinfoDao().update(orderPayinfo);
......@@ -330,7 +330,7 @@ public class OpCourseOrderService extends AbstractOpOrderService<CourseOrderProc
// 增加预存款金额流水
CourseBalanceTxn courseBalanceTxn = new CourseBalanceTxn();
courseBalanceTxn.setOrderId(order.getOrderId());
courseBalanceTxn.setPrePayAmount(BigDecimal.valueOf(orderPayinfo.getPrePayAmount()));
courseBalanceTxn.setPrePayAmount(BigDecimal.valueOf(orderPayinfo.getPrePayAmount().doubleValue()));
courseBalanceTxn.setOperateType(PrepayAmtOperateTypeEnum.AMT_TXN.getKey());
courseBalanceTxn.setCourseId(orderItem.getCourseID());
courseBalanceTxn.setOrderNo(order.getOrderNo());
......@@ -537,16 +537,16 @@ public class OpCourseOrderService extends AbstractOpOrderService<CourseOrderProc
// 3.1、退还余额卡
if (orderProcessBean.getPrePayCardRefundAmount() != null) {
BigDecimal prePayCardRefundAmount = order.getPrePayCardRefundAmount();
order.setPrePayCardRefundAmount(prePayCardRefundAmount.add(BigDecimal.valueOf(orderProcessBean.getPrePayCardRefundAmount())));
this.userExtDao.addAmount(order.getUid(), BigDecimal.valueOf(orderProcessBean.getPrePayCardRefundAmount()));
order.setPrePayCardRefundAmount(prePayCardRefundAmount.add(BigDecimal.valueOf(orderProcessBean.getPrePayCardRefundAmount().doubleValue())));
this.userExtDao.addAmount(order.getUid(), BigDecimal.valueOf(orderProcessBean.getPrePayCardRefundAmount().doubleValue()));
}
// 3.2、退预存款
if (orderProcessBean.getPrePayRefundAmount() != null && orderProcessBean.getPrePayRefundAmount() != 0) {
// 3.2.1、增加order预存款退款金额
OrderPayinfo orderPayinfo = null;
orderPayinfo = getOrderPayinfoDao().getByOrderId(orderProcessBean.getOrderId());
BigDecimal demPrePayRefundAmount = BigDecimal.valueOf(orderPayinfo.getPrePayRefundAmount() == null ? 0 : orderPayinfo.getPrePayRefundAmount()).add(
BigDecimal.valueOf(orderProcessBean.getPrePayRefundAmount()));
BigDecimal demPrePayRefundAmount = BigDecimal.valueOf(orderPayinfo.getPrePayRefundAmount() == null ? 0 : orderPayinfo.getPrePayRefundAmount().doubleValue()).add(
BigDecimal.valueOf(orderProcessBean.getPrePayRefundAmount().doubleValue()));
orderPayinfo.setPrePayRefundAmount(demPrePayRefundAmount.doubleValue());
getOrderPayinfoDao().update(orderPayinfo);
// 3.2.2、还原预存款
......@@ -728,7 +728,7 @@ public class OpCourseOrderService extends AbstractOpOrderService<CourseOrderProc
Order order = getOrderDao().findById(orderProcessBean.getOrderId());
CourseBalanceTxn courseBalanceTxn = new CourseBalanceTxn();
courseBalanceTxn.setOrderId(orderpayInfo.getOrderId());
courseBalanceTxn.setPrePayAmount(BigDecimal.valueOf(-orderpayInfo.getPrePayAmount()));
courseBalanceTxn.setPrePayAmount(BigDecimal.valueOf(-orderpayInfo.getPrePayAmount().doubleValue()));
courseBalanceTxn.setOperateType(PrepayAmtOperateTypeEnum.AMT_TXN.getKey());
courseBalanceTxn.setCourseId(orderItem.getCourseID());
courseBalanceTxn.setOrderNo(order.getOrderNo());
......@@ -942,7 +942,7 @@ public class OpCourseOrderService extends AbstractOpOrderService<CourseOrderProc
// 价格变化订单，返回最新单价
if (orderBean.getNotifyFlag() != null) {
ResourcePrice resourcePrice = resourcePriceDao.getResourcePrice(orderItem.getPlayDate(), orderItem.getResourceId());
orderBean.setNowSalePrice(BigDecimal.valueOf(resourcePrice.getSalePrice()));
orderBean.setNowSalePrice(BigDecimal.valueOf(resourcePrice.getSalePrice().doubleValue()));
}
orderBean.setUseMemberPrice(order.getUseMemberPrice() == null ? false : order.getUseMemberPrice());
orderBean.setMemberUnitAmount(order.getMemberUnitAmount());
......@@ -1039,7 +1039,7 @@ public class OpCourseOrderService extends AbstractOpOrderService<CourseOrderProc
OrderPayinfoBean payInfoBean = this.findPayInfo(orderListExcelBean.getOrderId(), payinfoList);
if (payInfoBean != null) {
orderListExcelBean.setPayeeName(payInfoBean.getPayeeName());
orderListExcelBean.setDepositAmount(BigDecimal.valueOf(payInfoBean.getPrePayAmount() == null ? 0 : payInfoBean.getPrePayAmount()));
orderListExcelBean.setDepositAmount(BigDecimal.valueOf(payInfoBean.getPrePayAmount() == null ? 0 : payInfoBean.getPrePayAmount().doubleValue()));
}
}
}
......
src/main/java/com/ctrip/fun/golf/service/order/OpEventActivityOrderService.java
......@@ -355,7 +355,7 @@ public class OpEventActivityOrderService
order.setPrePayCardRefundAmount(BigDecimal.valueOf(prePayCardRefundAmount
.doubleValue() + orderProcessBean.getPrePayCardRefundAmount()));
this.userExtDao.addAmount(order.getUid(),
BigDecimal.valueOf(orderProcessBean.getPrePayCardRefundAmount()));
BigDecimal.valueOf(orderProcessBean.getPrePayCardRefundAmount().doubleValue()));
if(!isManual){
//赛事这边鼓励只退余额给用户， 替代退金额
......@@ -572,7 +572,7 @@ public class OpEventActivityOrderService
Order order = getOrderDao().findById(orderProcessBean.getOrderId());
CourseBalanceTxn courseBalanceTxn = new CourseBalanceTxn();
courseBalanceTxn.setOrderId(orderpayInfo.getOrderId());
courseBalanceTxn.setPrePayAmount(BigDecimal.valueOf(-orderpayInfo.getPrePayAmount()));
courseBalanceTxn.setPrePayAmount(BigDecimal.valueOf(-orderpayInfo.getPrePayAmount().doubleValue()));
courseBalanceTxn.setOperateType(PrepayAmtOperateTypeEnum.AMT_TXN.getKey());
courseBalanceTxn.setCourseId(orderItem.getCourseId());
courseBalanceTxn.setOrderNo(order.getOrderNo());
......@@ -809,7 +809,7 @@ public class OpEventActivityOrderService
if (orderBean.getNotifyFlag() != null) {
ResourcePrice resourcePrice = resourcePriceDao.getResourcePrice(
orderItem.getPlayDate(), orderItem.getResourceId());
orderBean.setNowSalePrice(BigDecimal.valueOf(resourcePrice.getSalePrice()));
orderBean.setNowSalePrice(BigDecimal.valueOf(resourcePrice.getSalePrice().doubleValue()));
}
// 获取携程支付订单编号
......
src/main/java/com/ctrip/fun/golf/service/order/OpTourOrderService.java
......@@ -142,8 +142,8 @@ public class OpTourOrderService extends AbstractOpOrderService<TourOrderProcessB
OrderPayinfo orderPayinfo = getOrderPayinfoDao().getByOrderId(order.getOrderId());
if (orderPayinfo != null && orderPayinfo.getPrePayAmount() != null && orderPayinfo.getPrePayAmount() > 0) {
// 增加order预存款退款金额
BigDecimal demPrePayRefundAmount = BigDecimal.valueOf(orderPayinfo.getPrePayRefundAmount() == null ? 0 : orderPayinfo.getPrePayRefundAmount()).add(
BigDecimal.valueOf(orderPayinfo.getPrePayAmount()));
BigDecimal demPrePayRefundAmount = BigDecimal.valueOf(orderPayinfo.getPrePayRefundAmount() == null ? 0 : orderPayinfo.getPrePayRefundAmount().doubleValue()).add(
BigDecimal.valueOf(orderPayinfo.getPrePayAmount().doubleValue()));
orderPayinfo.setPrePayRefundAmount(demPrePayRefundAmount.doubleValue());
getOrderPayinfoDao().update(orderPayinfo);
......@@ -414,7 +414,7 @@ public class OpTourOrderService extends AbstractOpOrderService<TourOrderProcessB
Order order = getOrderDao().findById(tourOrderProcessBean.getOrderId());
TourBalanceTxn tourBalanceTxn = new TourBalanceTxn();
tourBalanceTxn.setOrderId(orderpayInfo.getOrderId());
tourBalanceTxn.setPrePayAmount(BigDecimal.valueOf(-orderpayInfo.getPrePayAmount()));
tourBalanceTxn.setPrePayAmount(BigDecimal.valueOf(-orderpayInfo.getPrePayAmount().doubleValue()));
tourBalanceTxn.setOperateType(PrepayAmtOperateTypeEnum.AMT_TXN.getKey());
tourBalanceTxn.setTourId(tourOrderItem.getTourId());
tourBalanceTxn.setOrderNo(order.getOrderNo());
......@@ -505,7 +505,7 @@ public class OpTourOrderService extends AbstractOpOrderService<TourOrderProcessB
OrderPayinfoBean payInfoBean = this.findPayInfo(orderListExcelBean.getOrderId(), payinfoList);
if (payInfoBean != null) {
orderListExcelBean.setPayeeName(payInfoBean.getPayeeName());
orderListExcelBean.setDepositAmount(BigDecimal.valueOf(payInfoBean.getPrePayAmount() == null ? 0 : payInfoBean.getPrePayAmount()));
orderListExcelBean.setDepositAmount(BigDecimal.valueOf(payInfoBean.getPrePayAmount() == null ? 0 : payInfoBean.getPrePayAmount().doubleValue()));
}
}
}
......@@ -546,14 +546,14 @@ public class OpTourOrderService extends AbstractOpOrderService<TourOrderProcessB
if (tourOrderProcessBean.getPrePayCardRefundAmount() != null) {
order.setPrePayCardRefundAmount(BigDecimal.valueOf(prePayCardRefundAmount.doubleValue() + tourOrderProcessBean.getPrePayCardRefundAmount()));
this.userExtDao.addAmount(order.getUid(), BigDecimal.valueOf(tourOrderProcessBean.getPrePayCardRefundAmount()));
this.userExtDao.addAmount(order.getUid(), BigDecimal.valueOf(tourOrderProcessBean.getPrePayCardRefundAmount().doubleValue()));
}
OrderPayinfo orderPayinfo = null;
if (tourOrderProcessBean.getPrePayRefundAmount() != null && tourOrderProcessBean.getPrePayRefundAmount() != 0) {
// 增加order预存款退款金额
orderPayinfo = getOrderPayinfoDao().getByOrderId(tourOrderProcessBean.getOrderId());
BigDecimal demPrePayRefundAmount = BigDecimal.valueOf(orderPayinfo.getPrePayRefundAmount() == null ? 0 : orderPayinfo.getPrePayRefundAmount()).add(
BigDecimal.valueOf(tourOrderProcessBean.getPrePayRefundAmount()));
BigDecimal demPrePayRefundAmount = BigDecimal.valueOf(orderPayinfo.getPrePayRefundAmount() == null ? 0 : orderPayinfo.getPrePayRefundAmount().doubleValue()).add(
BigDecimal.valueOf(tourOrderProcessBean.getPrePayRefundAmount().doubleValue()));
orderPayinfo.setPrePayRefundAmount(demPrePayRefundAmount.doubleValue());
getOrderPayinfoDao().update(orderPayinfo);
......
src/main/java/com/ctrip/fun/golf/service/order/TourOrderService.java
......@@ -268,8 +268,8 @@ public class TourOrderService extends AbstractOrderService<TourOrderBean, TourOr
} else {
for (TourPriceSupplier tourPriceSupplier : tourPriceSupplierForSaleList) {
addOrUpdateTourPriceSupplierMap(tourPriceSupplierMap, tourPriceSupplier.getSupplierId(),
tourPriceSupplier.getAdultBasePrice().multiply(BigDecimal.valueOf(tourOrderResourceBean.getAdultQuantity())),
tourPriceSupplier.getBabyBasePrice().multiply(BigDecimal.valueOf(tourOrderResourceBean.getBabyQuantity())), BigDecimal.ZERO, null);
tourPriceSupplier.getAdultBasePrice().multiply(BigDecimal.valueOf(tourOrderResourceBean.getAdultQuantity().longValue())),
tourPriceSupplier.getBabyBasePrice().multiply(BigDecimal.valueOf(tourOrderResourceBean.getBabyQuantity().longValue())), BigDecimal.ZERO, null);
}
}
// 2.3计算供应商额外资源的底价
......@@ -283,11 +283,11 @@ public class TourOrderService extends AbstractOrderService<TourOrderBean, TourOr
BigDecimal.ZERO,
BigDecimal.ZERO,
this.getExtralResourcePriceDao().findById(tourOrderExralResourceBean.getPriceId()).getBasePrice()
.multiply(BigDecimal.valueOf(tourOrderExralResourceBean.getNum())), String.format(extraFormatter, tourOrderExralResourceBean.getPriceId()));
.multiply(BigDecimal.valueOf(tourOrderExralResourceBean.getNum().longValue())), String.format(extraFormatter, tourOrderExralResourceBean.getPriceId()));
} else {
for (TourPriceSupplier tourPriceSupplier : tourPriceSupplierForExtraList) {
addOrUpdateTourPriceSupplierMap(tourPriceSupplierMap, tourPriceSupplier.getSupplierId(), BigDecimal.ZERO, BigDecimal.ZERO, tourPriceSupplier.getExtraBasePrice()
.multiply(BigDecimal.valueOf(tourOrderExralResourceBean.getNum())), null);
.multiply(BigDecimal.valueOf(tourOrderExralResourceBean.getNum().longValue())), null);
}
}
}
......
src/main/java/com/ctrip/fun/golf/service/order/VipMemberOrderService.java
......@@ -101,8 +101,8 @@ public class VipMemberOrderService extends AbstractOrderService<VipMemberOrderBe
JsonNode monthCard = root.get("monthCard");
monthCard.doubleValue();*/
JSONObject jsobj = JSONObject.parseObject(message);
monthCardAmount = BigDecimal.valueOf(jsobj.getDouble("monthCard"));
yearCardAmount = BigDecimal.valueOf(jsobj.getDouble("yearCard"));
monthCardAmount = BigDecimal.valueOf(jsobj.getDouble("monthCard").doubleValue());
yearCardAmount = BigDecimal.valueOf(jsobj.getDouble("yearCard").doubleValue());
} catch (Exception e) {
}
......@@ -166,8 +166,8 @@ public class VipMemberOrderService extends AbstractOrderService<VipMemberOrderBe
JsonNode monthCard = root.get("monthCard");
monthCard.doubleValue();*/
JSONObject jsobj = JSONObject.parseObject(message);
monthCardAmount = BigDecimal.valueOf(jsobj.getDouble("monthCard"));
yearCardAmount = BigDecimal.valueOf(jsobj.getDouble("yearCard"));
monthCardAmount = BigDecimal.valueOf(jsobj.getDouble("monthCard").doubleValue());
yearCardAmount = BigDecimal.valueOf(jsobj.getDouble("yearCard").doubleValue());
} catch (Exception e) {
}
......
src/main/java/com/ctrip/fun/mall/dao/order/MallSettlementDao.java
......@@ -213,7 +213,7 @@ public class MallSettlementDao extends GenericHibernateDao<MallSettlement, Integ
BigDecimal cashRebateAll = new BigDecimal(0);
for (Map<String, Object> map : orderList) {
Double cashRebate = (Double) map.get("cashRebate");
cashRebateAll = cashRebateAll.add(BigDecimal.valueOf(cashRebate));
cashRebateAll = cashRebateAll.add(BigDecimal.valueOf(cashRebate.doubleValue()));
}
mallSettlement.setCashRebate(cashRebateAll);
this.update(mallSettlement);
......
src/main/java/com/ctrip/fun/mall/service/order/MallAfterSalesOrderService.java
......@@ -405,7 +405,7 @@ public class MallAfterSalesOrderService extends GenericService<MallAfterSalesOrd
if (mallAfterSalesOrderBean.getPrePayCardRefundAmount() != null) {
order.setPrePayCardRefundAmount(BigDecimal.valueOf(prePayCardRefundAmount.doubleValue() + mallAfterSalesOrderBean.getPrePayCardRefundAmount()));
this.userExtDao.addAmount(order.getUid(), BigDecimal.valueOf(mallAfterSalesOrderBean.getPrePayCardRefundAmount()));
this.userExtDao.addAmount(order.getUid(), BigDecimal.valueOf(mallAfterSalesOrderBean.getPrePayCardRefundAmount().doubleValue()));
}
if (mallAfterSalesOrderBean.getRefundAmount() != null && mallAfterSalesOrderBean.getRefundAmount().doubleValue() != 0) {
......
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