Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into master_saas

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

@@ -74,7 +74,7 @@ public interface VipGroupActivityDao extends BaseDAO<Integer, VipGroupActivity>
 	* @date 2021/10/25 13:46
 	*/
     List<DoubleEleven2021ActivityDto> countActivityStatis();
-    List<DoubleEleven2021ActivityDto> count2022ActivityStatis();
+    List<DoubleEleven2021ActivityDto> count2022ActivityStatis(@Param("organId") String organId);
 
 	/**
 	* @description: 双十一活动统计
@@ -95,7 +95,7 @@ public interface VipGroupActivityDao extends BaseDAO<Integer, VipGroupActivity>
     * @date 2021/10/25 15:44
     */
 	DoubleEleven2021Dto countDoubleEleven2021Statis();
-	DoubleEleven2021Dto countDoubleEleven2022Statis();
+	DoubleEleven2021Dto countDoubleEleven2022Statis(@Param("organId") String organId);
 
     /**
     * @description: 双十一活动统计

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/IndexErrorType.java

@@ -40,8 +40,8 @@ public enum IndexErrorType implements BaseEnum<String, IndexErrorType> {
     STUDENT_VISIT("STUDENT_VISIT", "回访任务未完成"),
 
     ATTENDANCE_SERVE("ATTENDANCE_SERVE", "考勤及服务"),
-    TEACHER_EXCEPTION_ATTENDANCE("TEACHER_EXCEPTION_ATTENDANCE", "老师课程考勤异常"),
-    STUDENT_EXCEPTION_ATTENDANCE("STUDENT_EXCEPTION_ATTENDANCE", "学员课程考勤异常"),
+    TEACHER_EXCEPTION_ATTENDANCE("TEACHER_EXCEPTION_ATTENDANCE", "老师考勤异常"),
+    STUDENT_EXCEPTION_ATTENDANCE("STUDENT_EXCEPTION_ATTENDANCE", "学员考勤异常"),
     TEACHER_NOT_A_CLASS("TEACHER_NOT_A_CLASS", "课程异常"),
     TEACHER_SERVE_ERROR("TEACHER_SERVE_ERROR", "服务指标异常"),
     HAS_FREE_COURSE_TIMES("HAS_FREE_COURSE_TIMES", "学员已排课时长未消耗完"),

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

@@ -97,7 +97,7 @@ public interface VipGroupActivityService extends BaseService<Integer, VipGroupAc
     * @author zx
     * @date 2021/10/25 12:07
     */
-    DoubleEleven2021Dto doubleEleven2022Statis();
+    DoubleEleven2021Dto doubleEleven2022Statis(String organId);
 
     /**
     * @description: 分部双11活动统计

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

@@ -1555,6 +1555,7 @@ public class ExportServiceImpl implements ExportService {
         }
         Map<String, Object> params = new HashMap<>();
         MapUtil.populateMap(params, queryInfo);
+        params.put("notGroupType","MALL_SELL");
         int count = studentPaymentOrderDao.queryCount(params);
         if (count <= 0) {
             return BaseController.failed("没有可导出的数据");

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

@@ -147,17 +147,17 @@ public class PayServiceImpl implements PayService {
 			
 			// 是否由平台收款
 			//String isPlatformCollection = sysConfigDao.findConfigValue(SysConfigService.IS_OPEN_SMALL_CLASS_INCOME_TO_PLATFORM);
-			String isPlatformCollection = "0";
+			String isPlatformCollection = "1";
 			
 			if (StringUtils.equals("1", isPlatformCollection) && !ignoreOrganList.contains(organId)) {
 	        	
-	        	String merNo = sysConfigDao.findConfigValue(SysConfigService.PLATFORM_PAYEE_ACCOUNT);
-	        	
+	        	//String merNo = sysConfigDao.findConfigValue(SysConfigService.PLATFORM_PAYEE_ACCOUNT);
+				String merNo = ConfigInit.merNo;
 	        	if(StringUtils.isBlank(merNo)){
 	        		throw new BizException("平台收款账户查询失败");
 	        	}
 	        	
-	        	Integer routeOrganId = 68;
+	        	Integer routeOrganId = 16;
 	        	
 	        	StudentPaymentRouteOrder studentPaymentRouteOrder = new StudentPaymentRouteOrder();
 	            studentPaymentRouteOrder.setOrderNo(orderNo);

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

@@ -299,14 +299,14 @@ public class VipGroupActivityServiceImpl extends BaseServiceImpl<Integer, VipGro
 	}
 
 	@Override
-	public DoubleEleven2021Dto doubleEleven2022Statis() {
-		DoubleEleven2021Dto doubleEleven2022Dto = vipGroupActivityDao.countDoubleEleven2022Statis();
+	public DoubleEleven2021Dto doubleEleven2022Statis(String organId) {
+		DoubleEleven2021Dto doubleEleven2022Dto = vipGroupActivityDao.countDoubleEleven2022Statis(organId);
 		if(doubleEleven2022Dto.getTotalBuyAmount().compareTo(ZERO) > 0){
 			doubleEleven2022Dto.setAvgBuyAmount(
 					doubleEleven2022Dto.getTotalBuyAmount().divide(new BigDecimal(doubleEleven2022Dto.getTotalBuyNum()),2,BigDecimal.ROUND_CEILING));
 		}
 		//获取活动成交数据
-		this.groupTypeConvert(vipGroupActivityDao.count2022ActivityStatis(),doubleEleven2022Dto);
+		this.groupTypeConvert(vipGroupActivityDao.count2022ActivityStatis(organId),doubleEleven2022Dto);
 		//获取赠送会员数
 		Integer giveMemberNum = tempBuyDoubleElevenUserLogDao.countGiveNum(null);
 		doubleEleven2022Dto.setGiveMemberNum(giveMemberNum==null?0l:giveMemberNum.longValue());

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

@@ -352,6 +352,9 @@
             <if test="orderEndDate != null">
                 AND DATE_FORMAT(spo.create_time_,'%Y-%m-%d') &lt;= #{orderEndDate}
             </if>
+            <if test="notGroupType != null and notGroupType != ''">
+                AND spo.group_type_ != #{notGroupType}
+            </if>
             <if test="paymentType != null">
                 AND spo.type_ = #{paymentType}
             </if>

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

@@ -413,7 +413,7 @@
 				 LEFT JOIN activity_user_mapper aum ON spo.id_ = aum.payment_order_id_ AND spo.user_id_ = aum.user_id_
 				 LEFT JOIN vip_group_activity vga ON vga.id_ = aum.activity_id_
 		WHERE spo.group_type_ = 'ACTIVITY' AND spo.type_ = 'SMALL_CLASS_TO_BUY' AND spo.status_ = 'SUCCESS' AND spo.memo_ = '2022双十一活动购买'
-		  AND spo.organ_id_ IN (10,11,12,13,14,19,21,23,26,28,34,1,7,9,17,20,37,40,6,3,57,58,8,15,16,4)
+		  AND FIND_IN_SET(spo.organ_id_,#{organId})
 		GROUP BY aum.activity_id_,aum.user_id_) c GROUP BY c.type_
 	</select>
 	<resultMap id="DoubleEleven2021Dto" type="com.ym.mec.biz.dal.dto.DoubleEleven2021Dto">
@@ -430,7 +430,7 @@
 	<select id="countDoubleEleven2022Statis" resultMap="DoubleEleven2021Dto">
 		SELECT SUM(spo.expect_amount_) total_buy_amount_,COUNT(DISTINCT spo.user_id_) total_buy_num_ FROM student_payment_order spo
 		WHERE spo.group_type_ = 'ACTIVITY' AND spo.type_ = 'SMALL_CLASS_TO_BUY' AND spo.status_ = 'SUCCESS' AND spo.memo_ = '2022双十一活动购买'
-		AND spo.organ_id_ IN (10,11,12,13,14,19,21,23,26,28,34,1,7,9,17,20,37,40,6,3,57,58,8,15,16,4)
+		AND FIND_IN_SET(spo.organ_id_,#{organId})
 	</select>
 	<select id="countGiveMemberNum" resultType="java.lang.Integer">
 		SELECT COUNT(DISTINCT student_id_) FROM cloud_teacher_order WHERE remark_ = '双十一活动赠送会员'

mec-student/src/main/java/com/ym/mec/student/controller/LuckDrawController.java

@@ -116,38 +116,11 @@ public class LuckDrawController extends BaseController {
 	}
 
 	private static String str = "[\n" +
-			"    {\"user\": {\"username\": \"陈昊然\"},\"luckDrawPrize\":{\"name\": \"瑞士双肩背带\"}},\n" +
-			"    {\"user\": {\"username\": \"王木槿\"},\"luckDrawPrize\":{\"name\": \"镀金号嘴\"}},\n" +
-			"    {\"user\": {\"username\": \"刘天钧\"},\"luckDrawPrize\":{\"name\": \"乐器清洁套装\"}},\n" +
-			"    {\"user\": {\"username\": \"刘天宇\"},\"luckDrawPrize\":{\"name\": \"精美长笛包\"}},\n" +
-			"    {\"user\": {\"username\": \"刘润玉\"},\"luckDrawPrize\":{\"name\": \"瑞夫纳帽卡\"}},\n" +
-			"    {\"user\": {\"username\": \"李暮词\"},\"luckDrawPrize\":{\"name\": \"弯得林优选笛头\"}},\n" +
-			"    {\"user\": {\"username\": \"陈叶开\"},\"luckDrawPrize\":{\"name\": \"瑞士双肩背带\"}},\n" +
-			"    {\"user\": {\"username\": \"赵崇光\"},\"luckDrawPrize\":{\"name\": \"镀金号嘴\"}},\n" +
-			"    {\"user\": {\"username\": \"赵绮年\"},\"luckDrawPrize\":{\"name\": \"乐器清洁套装\"}},\n" +
-			"    {\"user\": {\"username\": \"吴玉堂\"},\"luckDrawPrize\":{\"name\": \"瑞夫纳帽卡\"}},\n" +
-			"    {\"user\": {\"username\": \"吴勇师\"},\"luckDrawPrize\":{\"name\": \"弯得林优选笛头\"}},\n" +
-			"    {\"user\": {\"username\": \"陈康文\"},\"luckDrawPrize\":{\"name\": \"瑞士双肩背带\"}},\n" +
-			"    {\"user\": {\"username\": \"赵康健\"},\"luckDrawPrize\":{\"name\": \"镀金号嘴\"}},\n" +
-			"    {\"user\": {\"username\": \"赵高轩\"},\"luckDrawPrize\":{\"name\": \"乐器清洁套装\"}},\n" +
-			"    {\"user\": {\"username\": \"赵玉书\"},\"luckDrawPrize\":{\"name\": \"瑞夫纳帽卡\"}},\n" +
-			"    {\"user\": {\"username\": \"赵叶欢\"},\"luckDrawPrize\":{\"name\": \"弯得林优选笛头\"}},\n" +
-			"    {\"user\": {\"username\": \"李高兴\"},\"luckDrawPrize\":{\"name\": \"瑞士双肩背带\"}},\n" +
-			"    {\"user\": {\"username\": \"吴文瑞\"},\"luckDrawPrize\":{\"name\": \"镀金号嘴\"}},\n" +
-			"    {\"user\": {\"username\": \"高勇\"},\"luckDrawPrize\":{\"name\": \"乐器清洁套装\"}},\n" +
-			"    {\"user\": {\"username\": \"李艺彤\"},\"luckDrawPrize\":{\"name\": \"精美长笛包\"}},\n" +
-			"    {\"user\": {\"username\": \"邹辰悦\"},\"luckDrawPrize\":{\"name\": \"瑞夫纳帽卡\"}},\n" +
-			"    {\"user\": {\"username\": \"王笑笑\"},\"luckDrawPrize\":{\"name\": \"弯得林优选笛头\"}},\n" +
-			"    {\"user\": {\"username\": \"肖国庆\"},\"luckDrawPrize\":{\"name\": \"瑞士双肩背带\"}},\n" +
-			"    {\"user\": {\"username\": \"李红旗\"},\"luckDrawPrize\":{\"name\": \"镀金号嘴\"}},\n" +
-			"    {\"user\": {\"username\": \"王乐乐\"},\"luckDrawPrize\":{\"name\": \"乐器清洁套装\"}},\n" +
-			"    {\"user\": {\"username\": \"孙朵朵\"},\"luckDrawPrize\":{\"name\": \"瑞夫纳帽卡\"}},\n" +
-			"    {\"user\": {\"username\": \"孙雨轩\"},\"luckDrawPrize\":{\"name\": \"弯得林优选笛头\"}},\n" +
-			"    {\"user\": {\"username\": \"孙文睿\"},\"luckDrawPrize\":{\"name\": \"瑞士双肩背带\"}},\n" +
-			"    {\"user\": {\"username\": \"高可心\"},\"luckDrawPrize\":{\"name\": \"镀金号嘴\"}},\n" +
-			"    {\"user\": {\"username\": \"高可云\"},\"luckDrawPrize\":{\"name\": \"乐器清洁套装\"}},\n" +
-			"    {\"user\": {\"username\": \"王胜利\"},\"luckDrawPrize\":{\"name\": \"瑞夫纳帽卡\"}},\n" +
-			"    {\"user\": {\"username\": \"李木子\"},\"luckDrawPrize\":{\"name\": \"弯得林优选笛头\"}}\n" +
+			"    {\"user\": {\"username\": \"吴文瑞\"},\"luckDrawPrize\":{\"name\": \"三等奖\"}},\n" +
+			"    {\"user\": {\"username\": \"高勇\"},\"luckDrawPrize\":{\"name\": \"三等奖\"}},\n" +
+			"    {\"user\": {\"username\": \"李艺彤\"},\"luckDrawPrize\":{\"name\": \"二等奖\"}},\n" +
+			"    {\"user\": {\"username\": \"邹辰悦\"},\"luckDrawPrize\":{\"name\": \"三等奖\"}},\n" +
+			"    {\"user\": {\"username\": \"王笑笑\"},\"luckDrawPrize\":{\"name\": \"三等奖\"}},\n" +
 			"]";
 	private static String str2 = "[\n" +
 			"    {\"user\": {\"username\": \"陈昊然\"},\"luckDrawPrize\":{\"name\": \"SoonyAngle盲盒\"}},\n" +

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

@@ -80,7 +80,15 @@ public class VipGroupActivityController extends BaseController {
     @GetMapping("/doubleEleven2022Statis")
     @PreAuthorize("@pcs.hasPermissions('vipGroupActivity/doubleEleven2022Statis')")
     public HttpResponseResult doubleEleven2022Statis(){
-        return succeed(vipGroupActivityService.doubleEleven2022Statis());
+        String organId = "10,11,12,13,14,19,21,23,26,28,34,1,7,9,17,20,37,40,6,3,57,58,8,15,16";
+        return succeed(vipGroupActivityService.doubleEleven2022Statis(organId));
+    }
+    @ApiOperation(value = "双11活动统计")
+    @GetMapping("/doubleEleven2022Statis1")
+    @PreAuthorize("@pcs.hasPermissions('vipGroupActivity/doubleEleven2022Statis1')")
+    public HttpResponseResult doubleEleven2022Statis1(){
+        String organId = "4";
+        return succeed(vipGroupActivityService.doubleEleven2022Statis(organId));
     }
 
     @ApiOperation(value = "新增vip课活动方案")

mec-web/src/main/java/com/ym/mec/web/controller/education/ActivityController.java

@@ -94,7 +94,13 @@ public class ActivityController extends BaseController {
     @ApiOperation(value = "双11活动统计")
     @GetMapping("/doubleEleven2022Statis")
     public HttpResponseResult doubleEleven2022Statis(){
-        return succeed(vipGroupActivityService.doubleEleven2022Statis());
+        String organId = "10,11,12,13,14,19,21,23,26,28,34,1,7,9,17,20,37,40,6,3,57,58,8,15,16";
+        return succeed(vipGroupActivityService.doubleEleven2022Statis(organId));
+    }
+    @ApiOperation(value = "双11活动统计（杭州）")
+    @GetMapping("/doubleEleven2022Statis1")
+    public HttpResponseResult doubleEleven2022Statis1(){
+        return succeed(vipGroupActivityService.doubleEleven2022Statis("4"));
     }
 
     @ApiOperation(value = "分部双11活动统计")