Merge remote-tracking branch 'origin/system_fee' into system_fee

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

@@ -13,6 +13,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.MemberRankPrivilegesDao;
 import com.ym.mec.biz.dal.dao.MemberRankSettingDao;
 import com.ym.mec.biz.dal.entity.MemberFeeSetting;
@@ -37,7 +39,6 @@ import com.ym.mec.biz.service.SysUserCashAccountService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
-import com.ym.mec.util.date.DateUtil;
 
 @Service
 public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, MemberRankSetting> implements MemberRankSettingService {
@@ -64,6 +65,9 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
 
 	@Autowired
 	private ContractService contractService;
+	
+	@Autowired
+	private SysUserFeignService sysUserFeignService;
 
 	private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
@@ -117,8 +121,10 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
 		if (student == null) {
 			throw new BizException("非法访问");
 		}
+		
+		SysUser user = sysUserFeignService.queryUserById(userId);
 
-		Integer organId = student.getOrganId();
+		Integer organId = user.getOrganId();
 		if (organId == null) {
 			throw new BizException("学生没有分部编号");
 		}

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

@@ -273,7 +273,6 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
             throw new BizException("学员信息不存在");
         }
         Date nowDate = new Date();
-        student.setMemberRankSettingId(rankSettingId);
         if (student.getMemberRankSettingId() == null) {
             student.setMembershipEndTime(DateUtil.addMonths(nowDate, 6));
             student.setMembershipStartTime(nowDate);
@@ -284,6 +283,7 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
                 student.setMembershipEndTime(DateUtil.addMonths(student.getMembershipEndTime(), 6));
             }
         }
+        student.setMemberRankSettingId(rankSettingId);
         student.setUpdateTime(nowDate);
         this.update(student);
     }

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

@@ -58,13 +58,13 @@ public class MemberRankController extends BaseController {
 
 	@ApiOperation(value = "购买会员")
 	@PostMapping("/buy")
-	public Object buy(Integer memberRankId, PeriodEnum periodEnum, BigDecimal amount, boolean isUseBalance) {
+	public Object buy(Integer memberRankId, PeriodEnum periodEnum, BigDecimal amount, boolean isUseBalance) throws Exception {
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if (sysUser == null) {
 			return failed(HttpStatus.FORBIDDEN, "请登录");
 		}
 
-		return succeed();
+		return succeed(memberRankSettingService.buy(sysUser.getId(), memberRankId, periodEnum, amount, isUseBalance));
 	}
 
 }