From 64c9ab17a187d6087acbda902c01d14f5707922a Mon Sep 17 00:00:00 2001 From: houruijun <411269194@kidgrow.com> Date: Sun, 28 Jun 2020 16:34:36 +0800 Subject: [PATCH] 1.调整扣费业务支持feign调用 2.更新运营平台支持统一格式化时间 3.修改zuu网关,增加请求头doctorId字段,修改departmentId字段的取值 --- kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/mapper/ProductOrderDetailMapper.java | 22 ++++++++++++++++++---- 1 files changed, 18 insertions(+), 4 deletions(-) diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/mapper/ProductOrderDetailMapper.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/mapper/ProductOrderDetailMapper.java index 3ea3515..19db86d 100644 --- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/mapper/ProductOrderDetailMapper.java +++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/mapper/ProductOrderDetailMapper.java @@ -1,8 +1,10 @@ package com.kidgrow.oprationcenter.mapper; -import com.kidgrow.oprationcenter.model.ProductOrderDetail; -import com.kidgrow.db.mapper.SuperMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.kidgrow.db.mapper.SuperMapper; +import com.kidgrow.oprationcenter.model.ProductOrderDetail; +import com.kidgrow.oprationcenter.vo.GroupProductDetail; +import com.kidgrow.oprationcenter.vo.ProductOrderJoinDetail; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -24,11 +26,23 @@ * @return */ List<ProductOrderDetail> findList(Page<ProductOrderDetail> page, @Param("p") Map<String, Object> params); - + /** + * 查询产品/明显的充值记录列表 + * @param params + * @return + */ + List<ProductOrderJoinDetail> findAllList(@Param("p") Map<String, Object> params); /** * 根据ProductOrderDetail对象当做查询条件进行查询 * @param * @return ProductOrderDetail对象 */ - ProductOrderDetail findByObject(@Param("p") ProductOrderDetail productOrderDetail); + ProductOrderDetail findByObject(@Param("p") ProductOrderDetail productOrderDetail);/** + * 统计产品使用量 + * @param + * @return ProductOrderDetail对象 + */ + List<GroupProductDetail> groupProductDetail(Page<GroupProductDetail> page, @Param("p") Map<String, Object> params); + + List<ProductOrderJoinDetail> getTypeByUser(Long id); } -- Gitblit v1.8.0