Commit 6718285e by 周晓航

打印日志

Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
parent 06d20b29
......@@ -179,7 +179,7 @@ public class OrderSdkAdapter {
}
/**
* 老订单服务创建订单对象 转换成 新订单服务请求对象
* 老订单服务创建订单对象 转换成 新订单服务请求对象 fisherman
*/
public com.freemud.application.sdk.api.ordercenter.request.create.CreateOrderRequest convent2NEWCreateOrderRequest(BaseCreateOrderRequest requestVO) {
com.freemud.application.sdk.api.ordercenter.request.create.CreateOrderRequest request = new com.freemud.application.sdk.api.ordercenter.request.create.CreateOrderRequest();
......@@ -504,6 +504,7 @@ public class OrderSdkAdapter {
private Long convertCreateOrderCost(Long originalAmount, List<OrderSettlementCreateReq> orderSettlementCreateReqList, List<OrderCostCreateReq> orderCostCreateReqs, List<CreateOrderAccountRequest> accounts) {
if (!CollectionUtils.isEmpty(accounts)) {
ApiLog.info("fisherman 构建order_cost_detail数据",accounts,JSON.toJSONString(accounts));
for (CreateOrderAccountRequest accountRequest : accounts) {
//老订单服务 1=配送费;3=包装费
if (QueryOrderAccountType.DELIVERY_AMOUNT.equals(accountRequest.getAccountType())
......
......@@ -182,6 +182,7 @@ public class OrderAdapter {
ArrayList<CreateOrderAccountRequest> orderAccountDtos = new ArrayList<>();
long deliveryAmount = 0;
long discountDeliveryAmount = 0;
ApiLog.info("fisherman 计算discountDeliveryAmount 的操作 begin",shoppingCartGoodsDto,createOrderVo);
if (createOrderVo.getMenuType().equals(BusinessTypeEnum.SAAS_DELIVERY.getCode())) {
deliveryAmount = shoppingCartGoodsDto.getDeliveryAmount() == null ? 9l : shoppingCartGoodsDto.getDeliveryAmount();
discountDeliveryAmount = shoppingCartGoodsDto.getDeliveryAmount() == null ? 9l : shoppingCartGoodsDto.getDeliveryAmount();
......@@ -193,6 +194,7 @@ public class OrderAdapter {
discountDeliveryAmount = shoppingCartGoodsDto.getDeliveryAmount() == null ? 0 : shoppingCartGoodsDto.getDeliveryAmount();
}
Long packageAmount = shoppingCartGoodsDto.getPackageAmount() == null ? 0L : shoppingCartGoodsDto.getPackageAmount();
ApiLog.info("fisherman 计算discountDeliveryAmount 的操作 end",deliveryAmount,discountDeliveryAmount);
//商城实付无需加上配送费用和包装费
if( createOrderVo.getMenuType().equals(BusinessTypeEnum.SAAS_MALL.getCode())) {
createOrderDto.setAmount(shoppingCartGoodsDto.getTotalAmount());
......
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