Browse Source

fix 零星收费

周箭河 5 years ago
parent
commit
2fd0e17a96

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

@@ -58,19 +58,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("您有支付中的订单");