Merge remote-tracking branch 'origin/master'

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

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.dal.dao;
 
 import java.util.List;
+import java.util.Map;
 
 import org.apache.ibatis.annotations.Param;
 
@@ -40,4 +41,6 @@ public interface TenantPaymentOrderDao extends BaseDAO<Long, TenantPaymentOrder>
 	 * @return
 	 */
 	List<TenantPaymentOrder> findOrdersByStatus(@Param("status") DealStatusEnum status, @Param("paymentChannel") String paymentChannel);
+
+	TenantPaymentOrder getOrderMoneyAmount(Map<String, Object> params);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/page/PracticeGroupQueryInfo.java

@@ -26,8 +26,18 @@ public class PracticeGroupQueryInfo extends QueryInfo {
 
     private Boolean hasEducationalTeacherId;
 
+    private Boolean firstOrRenew;
+
     private boolean isExport = false;
 
+    public Boolean getFirstOrRenew() {
+        return firstOrRenew;
+    }
+
+    public void setFirstOrRenew(Boolean firstOrRenew) {
+        this.firstOrRenew = firstOrRenew;
+    }
+
     public Boolean getHasEducationalTeacherId() {
         return hasEducationalTeacherId;
     }

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

@@ -3,6 +3,7 @@ package com.ym.mec.biz.service;
 import java.util.Map;
 
 import com.ym.mec.biz.dal.entity.TenantPaymentOrder;
+import com.ym.mec.biz.dal.page.TenantPaymentOrderQueryInfo;
 import com.ym.mec.common.service.BaseService;
 
 public interface TenantPaymentOrderService extends BaseService<Long, TenantPaymentOrder> {
@@ -33,4 +34,6 @@ public interface TenantPaymentOrderService extends BaseService<Long, TenantPayme
 	 * @return
 	 */
 	public TenantPaymentOrder queryByOrderNo(String orderNo);
+
+	Object queryTenanPaymentPage(TenantPaymentOrderQueryInfo queryInfo);
 }

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

@@ -1521,13 +1521,21 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 imFeignService.groupQuit(new ImGroupModel(classGroupId.toString(), imGroupMembers, classGroup.getName()));
             }
         }
+
         List<ClassGroupTeacherMapper> newTeacherMapperList = classGroup4MixDto.getClassGroupTeacherMapperList();
-        newTeacherMapperList.forEach(e->{
-            if(e.getTeacherRole() == TeachTypeEnum.BISHOP){
+        if(newTeacherMapperList.size() > 0){
+            //获取之前的班级老师
+            Set<Integer> groupTeacher = classGroupDao.findGroupTeacher(classGroupId);
+            groupTeacher.forEach(e->{
+                ImGroupMember[] imGroupMembers = {new ImGroupMember(e.toString())};
+                imFeignService.groupQuit(new ImGroupModel(classGroupId.toString(), imGroupMembers, classGroup.getName()));
+            });
+            newTeacherMapperList.forEach(e->{
                 ImGroupMember[] imGroupMembers = {new ImGroupMember(e.getUserId().toString())};
                 imFeignService.groupJoin(new ImGroupModel(classGroupId.toString(), imGroupMembers, classGroup.getName()));
-            }
-        });
+            });
+        }
+
         if (classGroup4MixDto.getCourseAddType().equals("onlyUpdateTeacher")) {
 			List<Integer> classGroupIds = new ArrayList<Integer>();
 			classGroupIds.add(classGroupId);

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

@@ -10,7 +10,12 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import com.ym.mec.biz.dal.dto.PageInfoOrder;
+import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
 import com.ym.mec.biz.dal.enums.PaymentChannelEnum;
+import com.ym.mec.biz.dal.page.TenantPaymentOrderQueryInfo;
+import com.ym.mec.common.page.PageInfo;
+import com.ym.mec.util.collection.MapUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -331,4 +336,25 @@ public class TenantPaymentOrderServiceImpl extends BaseServiceImpl<Long, TenantP
 	public TenantPaymentOrder queryByOrderNo(String orderNo) {
 		return tenantPaymentOrderDao.findOrderByOrderNo(orderNo);
 	}
+
+	@Override
+	public Object queryTenanPaymentPage(TenantPaymentOrderQueryInfo queryInfo) {
+		PageInfoOrder<TenantPaymentOrder> pageInfo = new PageInfoOrder<>(queryInfo.getPage(), queryInfo.getRows());
+		Map<String, Object> params = new HashMap<String, Object>();
+		MapUtil.populateMap(params, queryInfo);
+		List<TenantPaymentOrder> dataList = new ArrayList<>();
+		int count = this.findCount(params);
+		if (count > 0) {
+			TenantPaymentOrder orderMoneyAmount = tenantPaymentOrderDao.getOrderMoneyAmount(params);
+			if(orderMoneyAmount != null){
+				pageInfo.setTotalExpectAmount(orderMoneyAmount.getExpectAmount() !=null? orderMoneyAmount.getExpectAmount():BigDecimal.ZERO);
+				pageInfo.setTotalActualAmount(orderMoneyAmount.getActualAmount() !=null? orderMoneyAmount.getActualAmount():BigDecimal.ZERO);
+			}
+			pageInfo.setTotal(count);
+			params.put("offset", pageInfo.getOffset());
+			dataList = tenantPaymentOrderDao.queryPage(params);
+		}
+		pageInfo.setRows(dataList);
+		return pageInfo;
+	}
 }

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

@@ -246,6 +246,12 @@
             <if test="educationalTeacherId!=null">
                 AND pg.educational_teacher_id_=#{educationalTeacherId}
             </if>
+            <if test="firstOrRenew != null and firstOrRenew == true">
+                AND pg.be_renew_group_id_ IS NULL
+            </if>
+            <if test="firstOrRenew != null and firstOrRenew == false">
+                AND pg.be_renew_group_id_ IS NOT NULL
+            </if>
         </where>
     </sql>
 

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

@@ -198,4 +198,8 @@
           AND payment_channel_ = #{paymentChannel}
         LIMIT 100
     </select>
+	<select id="getOrderMoneyAmount" resultMap="TenantPaymentOrder">
+		SELECT SUM(expect_amount_) expect_amount_,SUM(actual_amount_) actual_amount_ FROM tenant_payment_order tpo
+		<include refid="queryPaymentOrder"/>
+	</select>
 </mapper>

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

@@ -24,7 +24,7 @@ public class TenantPaymentOrderController extends BaseController {
     @ApiOperation(value = "分页查询订单")
     @GetMapping("/queryPage")
     public Object queryPage(TenantPaymentOrderQueryInfo queryInfo){
-        return succeed(tenantPaymentOrderService.queryPage(queryInfo));
+        return succeed(tenantPaymentOrderService.queryTenanPaymentPage(queryInfo));
     }
 
     @ApiOperation(value = "查询订单明细")