乐理课活动

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

@@ -513,9 +513,11 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
         List<StudentPaymentOrder> ordersOverTime = findOrdersOverTime(orderNoList, DealStatusEnum.ING, beforeDate);
         for (StudentPaymentOrder order : ordersOverTime) {
             try {
+                TenantContextHolder.setTenantId(order.getTenantId());
                 order.setStatus(DealStatusEnum.FAILED);
                 order.setMemo("超时未支付关闭");
                 callOrderCallBack(order);
+                TenantContextHolder.clearTenantId();
             } catch (Exception e) {
                 e.printStackTrace();
                 continue;

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

@@ -288,6 +288,22 @@ public class PracticeGroupController extends BaseController {
         return succeed(practiceGroupService.buyActivityPracticeGroup(practiceGroupBuyParams));
     }
 
+    @ApiOperation("通用营销活动购买")
+    @PostMapping(value = "/buyActivity1")
+    @AuditLogAnnotation(operateName = "通用营销活动购买")
+    public HttpResponseResult buyActivity1(@RequestBody PracticeGroupBuyParamsDto practiceGroupBuyParams) throws Exception {
+//        if(CollectionUtils.isNotEmpty(practiceGroupBuyParams.getCouponIdList())){
+//            throw new BizException("当前活动不支持优惠券");
+//        }
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (null == sysUser) {
+            return failed(HttpStatus.FORBIDDEN, "请登录");
+        }
+        practiceGroupBuyParams.setUserId(sysUser.getId());
+        practiceGroupBuyParams.setOrganId(sysUser.getOrganId());
+        return succeed(practiceGroupService.buyActivityPracticeGroup(practiceGroupBuyParams));
+    }
+
     @ApiOperation(value = "购买指导老师创建的网管课")
     @PostMapping("/buyTeacherPracticeGroup")
     @AuditLogAnnotation(operateName = "购买指导老师创建的网管课")