双十一活动

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

@@ -416,5 +416,5 @@ public interface PracticeGroupService extends BaseService<Long, PracticeGroup> {
 	* @author zx
 	* @date 2021/10/20 10:39
 	*/
-    Object buyDoubleEleven2021(BuyDoubleEleven2021Dto buyDoubleEleven2021Dto) throws Exception;
+	HttpResponseResult buyDoubleEleven2021(BuyDoubleEleven2021Dto buyDoubleEleven2021Dto) throws Exception;
 }

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

@@ -5606,7 +5606,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
 
     @Override
     @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class,isolation = Isolation.READ_COMMITTED)
-    public Object buyDoubleEleven2021(BuyDoubleEleven2021Dto buyDoubleEleven2021Dto) throws Exception {
+    public HttpResponseResult buyDoubleEleven2021(BuyDoubleEleven2021Dto buyDoubleEleven2021Dto) throws Exception {
         String activityIdList = buyDoubleEleven2021Dto.getActivityIdList();
         List<VipGroupActivity> vipGroupActivities = vipGroupActivityDao.queryByIds(activityIdList);
         Date now = new Date();
@@ -5707,7 +5707,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
             notifyMap.put("channelType", channelType);
             notifyMap.put("orderNo", "");
             studentPaymentOrderService.updateOrder(notifyMap);
-            return notifyMap;
+            return BaseController.failed(HttpStatus.CREATED, notifyMap,"恭喜您,购买成功!");
         }
 
         String orderSubject = "2021双十一活动";
@@ -5732,6 +5732,6 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         studentPaymentOrder.setPaymentChannel((String) payMap.get("type"));
         studentPaymentOrder.setUpdateTime(nowDate);
         studentPaymentOrderService.update(studentPaymentOrder);
-        return payMap;
+        return BaseController.succeed(payMap);
     }
 }

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

@@ -113,7 +113,7 @@ public class ActivityController extends BaseController {
         }
         buyDoubleEleven2021Dto.setOrganId(sysUser.getOrganId());
         buyDoubleEleven2021Dto.setUserId(sysUser.getId());
-        return succeed(practiceGroupService.buyDoubleEleven2021(buyDoubleEleven2021Dto));
+        return practiceGroupService.buyDoubleEleven2021(buyDoubleEleven2021Dto);
     }
 
     @ApiOperation(value = "学员已购买的双十一活动信息")