| | |
|---|
| | | map.put("shopAmount",data1); |
|---|
| | | BigDecimal data2 = vipOrderService.getSumAmout(sixBefore); |
|---|
| | | map.put("vipAmount",data2); |
|---|
| | | List<TChargingOrder> list = chargingOrderService.lambdaQuery().between(TChargingOrder::getCreateTime, sixBefore, LocalDate.now()).list(); |
|---|
| | | BigDecimal serviceCharge = new BigDecimal("0"); |
|---|
| | | BigDecimal commissionAmount = new BigDecimal("0"); |
|---|
| | | |
|---|
| | | for (TChargingOrder chargingOrder : list) { |
|---|
| | | if (chargingOrder.getOrderSource().equals(2)){ |
|---|
| | | serviceCharge = serviceCharge.add(chargingOrder.getServiceCharge()!=null?chargingOrder.getServiceCharge().multiply(new BigDecimal("0.2")).setScale(2,BigDecimal.ROUND_DOWN):new BigDecimal("0")); |
|---|
| | | commissionAmount = commissionAmount.add(chargingOrder.getServiceCharge()!=null?chargingOrder.getServiceCharge().multiply(new BigDecimal("0.2")).setScale(2,BigDecimal.ROUND_DOWN):new BigDecimal("0")); |
|---|
| | | }else{ |
|---|
| | | serviceCharge = serviceCharge.add(chargingOrder.getServiceCharge()); |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | } |
|---|
| | | map.put("service_charge",serviceCharge); |
|---|
| | | map.put("commission_amount",commissionAmount); |
|---|
| | | return R.ok(map); |
|---|
| | | } |
|---|
| | | |
|---|
