Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -39,14 +39,17 @@ public class SporadicChargeInfoController extends BaseController {
 
 	@ApiOperation(value = "单查询")
 	@GetMapping("/get")
-	public Object get(Integer id) {
-//		SysUser sysUser = sysUserFeignService.queryUserInfo();
-//		if (sysUser == null) {
-//			return failed("用户不存在");
-//		}
+	public Object get(Integer id,Integer userId) {
+		if(userId == null){
+			SysUser sysUser = sysUserFeignService.queryUserInfo();
+			if (sysUser == null || sysUser.getId() == null) {
+				return failed("用户不存在");
+			}
+			userId = sysUser.getId();
+		}
 		SporadicChargeInfo chargeInfo = sporadicChargeInfoService.get(id);
 		if(chargeInfo != null){
-			SysUserCashAccount locked = sysUserCashAccountDao.getLocked(chargeInfo.getUserId());
+			SysUserCashAccount locked = sysUserCashAccountDao.getLocked(userId);
 			chargeInfo.setBalance(locked.getBalance());
 		}else {
 			throw new BizException("信息不存在");
@@ -58,19 +61,21 @@ public class SporadicChargeInfoController extends BaseController {
 	@ApiOperation(value = "零星支付")
 	@PostMapping("/sporadicPay")
 	public HttpResponseResult sporadicPay(@RequestBody SporadicPayDto sporadicPayDto) throws Exception {
-		SysUser sysUser = sysUserFeignService.queryUserInfo();
-		if (sysUser == null) {
-			return failed("用户不存在");
-		}
 		if(sporadicPayDto == null ||
 				sporadicPayDto.getSporadicId() == null ||
 				sporadicPayDto.getAmount() == null){
 			throw new BizException("参数校验失败");
 		}
-		if(sysUser.getUserType() != SysUserType.STUDENT){
-			return failed("用户信息异常");
+		if(sporadicPayDto.getUserId() == null){
+			SysUser sysUser = sysUserFeignService.queryUserInfo();
+			if (sysUser == null || sysUser.getId() == null) {
+				return failed("用户不存在");
+			}
+			if(sysUser.getUserType() != SysUserType.STUDENT){
+				return failed("用户信息异常");
+			}
+			sporadicPayDto.setUserId(sysUser.getId());
 		}
-		sporadicPayDto.setUserId(sysUser.getId());
 		Integer ingOrder = studentPaymentOrderService.findOrderByGroupType(sporadicPayDto.getUserId(),sporadicPayDto.getSporadicId(),"SPORADIC", DealStatusEnum.ING);
 		if (ingOrder != null && ingOrder > 0){
 			return failed("您有支付中的订单");

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

@@ -279,10 +279,12 @@ public class ExportController extends BaseController {
         PageInfo<MusicGroupStudentsDto> musicGroupStudentsDtoPageInfo = studentManageService.queryMusicGroupStudent(queryInfo);
         try {
             for (MusicGroupStudentsDto row : musicGroupStudentsDtoPageInfo.getRows()) {
-                if (row.getGender().equals("1")) {
-                    row.setGender("男");
-                } else {
-                    row.setGender("女");
+                if (row.getGender() != null) {
+                    if (row.getGender().equals("1")) {
+                        row.setGender("男");
+                    } else {
+                        row.setGender("女");
+                    }
                 }
                 if (row.getPaymentStatus() != null) {
                     if (row.getPaymentStatus().equals("PAID_COMPLETED")) {
@@ -312,9 +314,9 @@ public class ExportController extends BaseController {
                     row.setNextPaymentDateStr(DateUtil.format(row.getNextPaymentDate(), DateUtil.DEFAULT_PATTERN));
                 }
             }
-            String[] header = {"学员编号", "学员姓名", "性别", "联系电话", "年级","班级", "专业", "学员状态", "新增学员", "缴费金额",
+            String[] header = {"学员编号", "学员姓名", "性别", "联系电话", "年级", "班级", "专业", "学员状态", "新增学员", "缴费金额",
                     "下次缴费日期", "报名缴费", "是否激活"};
-            String[] body = {"userId", "realName", "gender", "phone", "currentGrade","currentClass", "subjectName", "studentStatus", "isNewStudentStr",
+            String[] body = {"userId", "realName", "gender", "phone", "currentGrade", "currentClass", "subjectName", "studentStatus", "isNewStudentStr",
                     "courseFee", "nextPaymentDateStr", "paymentStatus", "activeName"};
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, musicGroupStudentsDtoPageInfo.getRows());
             response.setContentType("application/octet-stream");