| | |
|---|
| | | @PostMapping("/confirmDelivery") |
|---|
| | | @ApiOperation(value = "已发货操作", tags = {"管理后台-订单管理"}) |
|---|
| | | public R confirmDelivery(@RequestBody ConfirmDelivery confirmDelivery){ |
|---|
| | | return orderService.confirmDelivery(confirmDelivery.getOrderId(), confirmDelivery.getCode()); |
|---|
| | | return orderService.confirmDelivery(confirmDelivery); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | |
|---|
| | | if (order.getOrderType().equals(1)) { |
|---|
| | | serviceTotal++; |
|---|
| | | serviceTotalMoney = serviceTotalMoney.add(order.getPaymentAmount()); |
|---|
| | | }else if (order.getOrderType().equals(2)){ |
|---|
| | | total++; |
|---|
| | | totalMoney = totalMoney.add(order.getPaymentAmount()); |
|---|
| | | }else if (order.getOrderType().equals(2) && 1 == order.getDistributionMode()){ |
|---|
| | | singleTotal++; |
|---|
| | | singleTotalMoney = singleTotalMoney.add(order.getPaymentAmount()); |
|---|
| | | total++; |
|---|
| | | totalMoney = totalMoney.add(order.getPaymentAmount()); |
|---|
| | | } |
|---|
| | | total++; |
|---|
| | | totalMoney = totalMoney.add(order.getPaymentAmount()); |
|---|
| | | } |
|---|
| | | orderStatisticsDetail.setDate(key); |
|---|
| | | orderStatisticsDetail.setServiceTotal(serviceTotal); |
|---|
