Merge remote-tracking branch 'origin/master'

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

@@ -37,9 +37,15 @@ public class SysTenantAccountServiceImpl extends BaseServiceImpl<Integer, SysTen
 	@Override
 	@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
 	public boolean update(Integer userId, int minutes, String orderNo, TransType type, String transNo, BigDecimal cashAmount, String memo) {
+
+		Date date = new Date();
 		SysTenantAccount tenantAccount = sysTenantAccountDao.getLocked(userId);
 		if (tenantAccount == null) {
-			throw new BizException("用户[{}]现金账户不存在", userId);
+			tenantAccount = new SysTenantAccount();
+			tenantAccount.setUserId(userId);
+			tenantAccount.setCreateTime(date);
+			tenantAccount.setUpdateTime(date);
+			sysTenantAccountDao.insert(tenantAccount);
 		}
 
 		if (tenantAccount.getStatus() != AccountStatus.NORMAL) {
@@ -50,8 +56,6 @@ public class SysTenantAccountServiceImpl extends BaseServiceImpl<Integer, SysTen
 			throw new BizException("账户[{}]可用时间不足，可用时间剩{}分钟", userId, tenantAccount.getAvailableMinutes());
 		}
 
-		Date date = new Date();
-
 		tenantAccount.setAvailableMinutes(balance);
 		tenantAccount.setUpdateTime(date);
 		sysTenantAccountDao.update(tenantAccount);

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

@@ -29,6 +29,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -631,7 +632,7 @@ public class ExportController extends BaseController {
     @ApiOperation(value = "评论列表导出")
     @RequestMapping("export/courseReviews")
     @PreAuthorize("@pcs.hasPermissions('export/courseReviews')")
-    public void export(CourseReviewQueryInfo queryInfo, HttpServletResponse response) {
+    public void export(CourseReviewQueryInfo queryInfo, HttpServletResponse response) throws IOException {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (!sysUser.getIsSuperAdmin()) {
             Employee employee = employeeDao.get(sysUser.getId());
@@ -640,7 +641,10 @@ public class ExportController extends BaseController {
         queryInfo.setRows(99999);
         PageInfo<CourseReviewDto> practiceGroupReviews = courseReviewService.findPracticeGroupReviews(queryInfo);
         if(practiceGroupReviews.getTotal() <= 0){
-            response.setStatus(404);
+            response.setStatus(500);
+            response.setContentType("Content-Type: application/json;charset=UTF-8");
+            response.getOutputStream().write("{\"data\": null, \"code\": 500, \"status\": false, \"msg\": \"没有可导出的记录\"}".getBytes());
+            response.flushBuffer();
             return;
         }
         try {