双十一活动

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

@@ -22,6 +22,16 @@ public class LuckDrawQueryInfo extends QueryInfo {
 
 	private Boolean defaultFlag;
 
+	private Boolean allFlag = true;
+
+	public Boolean getAllFlag() {
+		return allFlag;
+	}
+
+	public void setAllFlag(Boolean allFlag) {
+		this.allFlag = allFlag;
+	}
+
 	public Boolean getDefaultFlag() {
 		return defaultFlag;
 	}

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

@@ -5156,8 +5156,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         //是否消耗课程余额
         if(activity.isPayToBalance() && !giveFlag){
             ActivityUserMapper activityUserMapper = activityUserMappers.get(0);
-            StudentPaymentOrder order = studentPaymentOrderDao.get(activityUserMapper.getPaymentOrderId());
-            sysUserCashAccountService.appendCourseBalance(studentId,order.getExpectAmount().negate(),PlatformCashAccountDetailTypeEnum.PAY_FEE,"活动排课消耗课程余额");
+            sysUserCashAccountService.appendCourseBalance(studentId,activityUserMapper.getActualPrice().negate(),PlatformCashAccountDetailTypeEnum.PAY_FEE,"活动排课消耗课程余额");
         }
 
         //创建班级信息

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

@@ -1335,9 +1335,8 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		//是否消耗课程余额
 		if(activity.isPayToBalance() && !giveFlag){
 			ActivityUserMapper activityUserMapper = activityUserMappers.get(0);
-			StudentPaymentOrder order = studentPaymentOrderDao.get(activityUserMapper.getPaymentOrderId());
 			for (Integer studentId : studentIdList) {
-				sysUserCashAccountService.appendCourseBalance(studentId,order.getExpectAmount().negate(),
+				sysUserCashAccountService.appendCourseBalance(studentId,activityUserMapper.getActualPrice().negate(),
 						PlatformCashAccountDetailTypeEnum.PAY_FEE,"活动排课消耗课程余额");
 			}
 		}

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

@@ -38,6 +38,10 @@ public class LuckDrawController extends BaseController {
 	@ApiOperation(value = "查询抽奖记录")
 	@GetMapping(value = "/list")
 	public Object list(LuckDrawQueryInfo queryInfo) {
+		if(!queryInfo.getAllFlag()){
+			SysUser sysUser = sysUserFeignService.queryUserInfo();
+			queryInfo.setUserId(sysUser.getId());
+		}
 		PageInfo<LuckDrawLog> pageInfo = luckDrawLogService.queryPage(queryInfo);
 		for (LuckDrawLog log : pageInfo.getRows()) {
 			log.getUser().setPhone(ValueUtil.fuzzyMobile(log.getUser().getPhone()));