Merge branch 'master' of http://git.dayaedu.com/yonge/mec

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentPaymentOrderDao.java

@@ -204,47 +204,52 @@ public interface StudentPaymentOrderDao extends BaseDAO<Long, StudentPaymentOrde
     int countSporadicPage(Map<String, Object> params);
 
     List<OrderStatisDto> getLuckStatis();
-    
+
     /**
      * 统计收入信息
+     *
      * @param organId
      * @return
      */
     Map<String, Object> queryIncomeStatisticsWithCurrentMonth(@Param("organId") String organId);
 
     /**
+     * @param userId:     用户编号
+     * @param vipGroupId: 小课编号
+     * @return int
      * @describe 统计学员购买小课成功的订单数量
      * @author Joburgess
      * @date 2020/2/3
-     * @param userId: 用户编号
-     * @param vipGroupId: 小课编号
-     * @return int
      */
     int countUserBuyVipGroupSuccessOrder(@Param("userId") Integer userId,
                                          @Param("vipGroupId") Integer vipGroupId);
 
     /**
+     * @param userId:     用户编号
+     * @param vipGroupId: 小课编号
+     * @return java.util.List<com.ym.mec.biz.dal.entity.StudentPaymentOrder>
      * @describe 获取学员购买小课的订单
      * @author Joburgess
      * @date 2020/2/5
-     * @param userId: 用户编号
-     * @param vipGroupId: 小课编号
-     * @return java.util.List<com.ym.mec.biz.dal.entity.StudentPaymentOrder>
      */
     List<StudentPaymentOrder> findUserBuyVipGroupOrder(@Param("userId") Integer userId,
                                                        @Param("vipGroupId") Integer vipGroupId);
 
     /**
-     * @describe 获取用户的团体订单
-     * @author Joburgess
-     * @date 2020/2/21
      * @param userId:
      * @param groupId:
      * @param groupType:
      * @return java.util.List<com.ym.mec.biz.dal.entity.StudentPaymentOrder>
+     * @describe 获取用户的团体订单
+     * @author Joburgess
+     * @date 2020/2/21
      */
     List<StudentPaymentOrder> findUserGroupOrders(@Param("userId") Integer userId,
                                                   @Param("groupId") String groupId,
                                                   @Param("groupType") GroupType groupType,
                                                   @Param("status") DealStatusEnum orderStatus);
+
+    StudentPaymentOrder getOrderMoneyAmount(Map<String, Object> params);
+
+    List<StudentPaymentOrder> queryPageOrder(Map<String, Object> params);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/PageInfoOrder.java

@@ -0,0 +1,38 @@
+package com.ym.mec.biz.dal.dto;
+
+import com.ym.mec.common.page.PageInfo;
+
+import java.math.BigDecimal;
+
+public class PageInfoOrder<T> extends PageInfo<T> {
+
+    private BigDecimal totalExpectAmount =BigDecimal.ZERO;
+    private BigDecimal totalActualAmount =BigDecimal.ZERO;
+
+    public PageInfoOrder() {
+    }
+
+    public PageInfoOrder(Integer pageNo) {
+        super(pageNo);
+    }
+
+    public PageInfoOrder(Integer pageNo, int pageSize) {
+        super(pageNo, pageSize);
+    }
+
+    public BigDecimal getTotalExpectAmount() {
+        return totalExpectAmount;
+    }
+
+    public void setTotalExpectAmount(BigDecimal totalExpectAmount) {
+        this.totalExpectAmount = totalExpectAmount;
+    }
+
+    public BigDecimal getTotalActualAmount() {
+        return totalActualAmount;
+    }
+
+    public void setTotalActualAmount(BigDecimal totalActualAmount) {
+        this.totalActualAmount = totalActualAmount;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/service/StudentPaymentOrderService.java

@@ -1,9 +1,8 @@
 package com.ym.mec.biz.service;
 
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
+import com.ym.mec.biz.dal.dto.PageInfoOrder;
 import com.ym.mec.biz.dal.dto.SporadicChargeInfoDto;
 import com.ym.mec.biz.dal.dto.StudentPaymentOrderExportDto;
 import com.ym.mec.biz.dal.entity.Goods;
@@ -13,8 +12,12 @@ import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.biz.dal.enums.OrderDetailTypeEnum;
 import com.ym.mec.biz.dal.enums.OrderTypeEnum;
 import com.ym.mec.biz.dal.page.SporadicOrderQueryInfo;
+import com.ym.mec.biz.dal.page.StudentPaymentOrderQueryInfo;
 import com.ym.mec.common.page.PageInfo;
+import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.common.service.BaseService;
+import com.ym.mec.util.collection.MapUtil;
+import org.apache.poi.ss.formula.functions.T;
 
 public interface StudentPaymentOrderService extends BaseService<Long, StudentPaymentOrder> {
 
@@ -97,4 +100,11 @@ public interface StudentPaymentOrderService extends BaseService<Long, StudentPay
 	 * @return
 	 */
 	PageInfo<SporadicChargeInfoDto> sporadicQueryPage(SporadicOrderQueryInfo queryInfo);
+
+
+	StudentPaymentOrder getOrderMoneyAmount(StudentPaymentOrderQueryInfo queryInfo);
+
+
+	PageInfoOrder<StudentPaymentOrder> OrderQueryPage(StudentPaymentOrderQueryInfo queryInfo);
+
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentPaymentOrderServiceImpl.java

@@ -3,6 +3,7 @@ package com.ym.mec.biz.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.huifu.adapay.model.payment.Payment;
 import com.ym.mec.biz.dal.dao.StudentPaymentOrderDao;
+import com.ym.mec.biz.dal.dto.PageInfoOrder;
 import com.ym.mec.biz.dal.dto.SporadicChargeInfoDto;
 import com.ym.mec.biz.dal.dto.StudentPaymentOrderExportDto;
 import com.ym.mec.biz.dal.entity.Goods;
@@ -12,9 +13,11 @@ import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.biz.dal.enums.OrderDetailTypeEnum;
 import com.ym.mec.biz.dal.enums.OrderTypeEnum;
 import com.ym.mec.biz.dal.page.SporadicOrderQueryInfo;
+import com.ym.mec.biz.dal.page.StudentPaymentOrderQueryInfo;
 import com.ym.mec.biz.service.*;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.page.PageInfo;
+import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.thirdparty.adapay.Pay;
 import com.ym.mec.thirdparty.yqpay.Msg;
@@ -23,6 +26,7 @@ import com.ym.mec.thirdparty.yqpay.YqPayFeignService;
 import com.ym.mec.thirdparty.yqpay.YqPayUtil;
 import com.ym.mec.util.collection.MapUtil;
 
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
@@ -60,11 +64,11 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
     }
 
     @Override
-	public List<StudentPaymentOrder> queryByCondition(GroupType groupType, String musicGroupId, Integer userId, DealStatusEnum status, OrderTypeEnum type) {
-		return studentPaymentOrderDao.queryByCondition(groupType, musicGroupId, userId, status, type);
-	}
+    public List<StudentPaymentOrder> queryByCondition(GroupType groupType, String musicGroupId, Integer userId, DealStatusEnum status, OrderTypeEnum type) {
+        return studentPaymentOrderDao.queryByCondition(groupType, musicGroupId, userId, status, type);
+    }
 
-	@Override
+    @Override
     public StudentPaymentOrder findMusicGroupApplyOrderByStatus(Integer userId, String musicGroupId, DealStatusEnum status) {
         return studentPaymentOrderDao.findMusicGroupApplyOrderByStatus(userId, musicGroupId, status);
     }
@@ -194,16 +198,16 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
             vipGroupService.orderCallback(order);
         } else if (order.getType().equals(OrderTypeEnum.RENEW)) {
             musicGroupService.renewForCallback(order);
-        }else if (order.getType().equals(OrderTypeEnum.SPORADIC)||order.getType().equals(OrderTypeEnum.LUCK)){
+        } else if (order.getType().equals(OrderTypeEnum.SPORADIC) || order.getType().equals(OrderTypeEnum.LUCK)) {
             sporadicChargeInfoService.renewForCallback(order);
-        }else if (order.getType().equals(OrderTypeEnum.PRACTICE_GROUP_BUY)){
+        } else if (order.getType().equals(OrderTypeEnum.PRACTICE_GROUP_BUY)) {
             practiceGroupService.orderCallback(order);
         }
     }
 
     @Override
     public Integer findOrderByGroupType(Integer userId, Integer sporadicId, String sporadic, DealStatusEnum status) {
-        return studentPaymentOrderDao.findOrderByGroupType(userId,sporadicId,sporadic,status);
+        return studentPaymentOrderDao.findOrderByGroupType(userId, sporadicId, sporadic, status);
     }
 
 
@@ -227,9 +231,9 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
                     vipGroupService.orderCallback(order);
                 } else if (order.getType().equals(OrderTypeEnum.RENEW)) {
                     musicGroupService.renewForCallback(order);
-                }else if (order.getType().equals(OrderTypeEnum.SPORADIC)||order.getType().equals(OrderTypeEnum.LUCK)){
+                } else if (order.getType().equals(OrderTypeEnum.SPORADIC) || order.getType().equals(OrderTypeEnum.LUCK)) {
                     sporadicChargeInfoService.renewForCallback(order);
-                }else if (order.getType().equals(OrderTypeEnum.PRACTICE_GROUP_BUY)){
+                } else if (order.getType().equals(OrderTypeEnum.PRACTICE_GROUP_BUY)) {
                     practiceGroupService.orderCallback(order);
                 }
             } catch (Exception e) {
@@ -264,4 +268,31 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
         pageInfo.setRows(dataList);
         return pageInfo;
     }
+
+    @Override
+    public StudentPaymentOrder getOrderMoneyAmount(StudentPaymentOrderQueryInfo queryInfo) {
+        Map<String, Object> params = new HashMap<String, Object>();
+        MapUtil.populateMap(params, queryInfo);
+        return studentPaymentOrderDao.getOrderMoneyAmount(params);
+    }
+
+    @Override
+    public PageInfoOrder<StudentPaymentOrder> OrderQueryPage(StudentPaymentOrderQueryInfo queryInfo) {
+        PageInfoOrder<StudentPaymentOrder> pageInfo = new PageInfoOrder<>(queryInfo.getPage(), queryInfo.getRows());
+        Map<String, Object> params = new HashMap<String, Object>();
+        MapUtil.populateMap(params, queryInfo);
+
+        List<StudentPaymentOrder> dataList = new ArrayList<>();
+        int count = this.findCount(params);
+        StudentPaymentOrder orderMoneyAmount = studentPaymentOrderDao.getOrderMoneyAmount(params);
+        pageInfo.setTotalExpectAmount(orderMoneyAmount.getExpectAmount());
+        pageInfo.setTotalActualAmount(orderMoneyAmount.getActualAmount());
+        if (count > 0) {
+            pageInfo.setTotal(count);
+            params.put("offset", pageInfo.getOffset());
+            dataList = studentPaymentOrderDao.queryPageOrder(params);
+        }
+        pageInfo.setRows(dataList);
+        return pageInfo;
+    }
 }

mec-biz/src/main/resources/config/mybatis/StudentPaymentOrderMapper.xml

@@ -520,4 +520,18 @@
             and status_=#{status, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
         </if>
     </select>
+
+    <select id="getOrderMoneyAmount" parameterType="map" resultMap="StudentPaymentOrder">
+        SELECT SUM(spo.expect_amount_) expect_amount_,SUM(actual_amount_) actual_amount_ FROM student_payment_order spo
+        <include refid="queryPaymentOrder"/>
+    </select>
+
+    <!-- 分页查询 -->
+    <select id="queryPageOrder" resultMap="PaymentOrderAndStudentInfo" parameterType="map">
+        SELECT spo.*,u.username_,u.phone_ FROM student_payment_order spo
+        left join sys_user u on spo.user_id_ = u.id_
+        <include refid="queryPaymentOrder"/>
+        ORDER BY spo.id_ DESC
+        <include refid="global.limit"/>
+    </select>
 </mapper>

mec-web/src/main/java/com/ym/mec/web/controller/StudentPaymentOrderController.java

@@ -66,7 +66,7 @@ public class StudentPaymentOrderController extends BaseController {
             }
         }
 
-        PageInfo<StudentPaymentOrder> studentPaymentOrderPageInfo = studentPaymentOrderService.queryPage(queryInfo);
+        PageInfo<StudentPaymentOrder> studentPaymentOrderPageInfo = studentPaymentOrderService.OrderQueryPage(queryInfo);
 
         int openHideMode = Integer.parseInt(sysConfigDao.findConfigValue("open_hide_mode"));
         if (openHideMode == 1) {
@@ -129,7 +129,7 @@ public class StudentPaymentOrderController extends BaseController {
         }
         queryInfo.setOrderType("1");
 
-        PageInfo<StudentPaymentOrder> studentPaymentOrderPageInfo = studentPaymentOrderService.queryPage(queryInfo);
+        PageInfo<StudentPaymentOrder> studentPaymentOrderPageInfo = studentPaymentOrderService.OrderQueryPage(queryInfo);
 
         for (StudentPaymentOrder row : studentPaymentOrderPageInfo.getRows()) {
             BigDecimal balancePaymentAmount = row.getBalancePaymentAmount() == null ? BigDecimal.ZERO : row.getBalancePaymentAmount();
@@ -165,7 +165,7 @@ public class StudentPaymentOrderController extends BaseController {
         }
         queryInfo.setOrderType("2");
 
-        PageInfo<StudentPaymentOrder> studentPaymentOrderPageInfo = studentPaymentOrderService.queryPage(queryInfo);
+        PageInfo<StudentPaymentOrder> studentPaymentOrderPageInfo = studentPaymentOrderService.OrderQueryPage(queryInfo);
 
         for (StudentPaymentOrder row : studentPaymentOrderPageInfo.getRows()) {
             BigDecimal balancePaymentAmount = row.getBalancePaymentAmount() == null ? BigDecimal.ZERO : row.getBalancePaymentAmount();