mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-04-27 06:25:13 +08:00
Merge branch 'dev' of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web into dev
# Conflicts: # jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java # jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java # jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java # jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
This commit is contained in:
@@ -22,10 +22,7 @@ import com.jsowell.pile.service.OrderSplitRecordService;
|
||||
import com.jsowell.pile.service.PileMerchantInfoService;
|
||||
import com.jsowell.pile.service.PileStationInfoService;
|
||||
import com.jsowell.pile.util.UserUtils;
|
||||
import com.jsowell.pile.vo.web.OrderListVO;
|
||||
import com.jsowell.pile.vo.web.SplitAggregateDataVO;
|
||||
import com.jsowell.pile.vo.web.SplitConfigOrderVO;
|
||||
import com.jsowell.pile.vo.web.SplitRecordInfoVO;
|
||||
import com.jsowell.pile.vo.web.*;
|
||||
import com.jsowell.service.OrderService;
|
||||
import org.apache.commons.collections4.CollectionUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
@@ -364,4 +361,23 @@ public class OrderBasicInfoController extends BaseController {
|
||||
logger.info("订单保险金额退款 params:{}, result:{}", JSON.toJSONString(orderBasicInfo), response);
|
||||
return response;
|
||||
}
|
||||
|
||||
/**
|
||||
* 订单数量与保险金额时间区统计
|
||||
* @param dto
|
||||
* @return
|
||||
*/
|
||||
@PostMapping("/queryOrderInsuranceAmountByTime")
|
||||
public RestApiResponse<?> queryOrderInsuranceAmountByTime(@RequestBody QueryOrderDTO dto) {
|
||||
RestApiResponse<?> response = null;
|
||||
try {
|
||||
OrderCountByTimeVO result = orderBasicInfoService.queryOrderInsuranceAmountByTime(dto);
|
||||
response = new RestApiResponse<>(result);
|
||||
} catch (Exception e) {
|
||||
logger.error("时间区间查询订单统计 error", e);
|
||||
}
|
||||
logger.info("时间区间查询订单统计 result:{}", response);
|
||||
return response;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user