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

donate-service/src/main/java/com/uas/service/donate/controller/AlipayController.java

@@ -191,8 +191,7 @@ public class AlipayController {
             newProjectRecode = this.createProjectRecode(jsonStr);
         } catch (Exception e) {
             e.printStackTrace();
-            response.setContentType("text/plain;charset=UTF-8");
-            response.getWriter().write("生成订单失败，请稍后再试！");
+            response.getWriter().write(e.getMessage());
             return;
         }
 
@@ -217,12 +216,10 @@ public class AlipayController {
 
         } catch (AlipayApiException e) {
             e.printStackTrace();
-            response.setContentType("text/plain;charset=UTF-8");
-            response.getWriter().write("创建订单失败，请稍后再试！");
+            response.getWriter().write(e.getMessage());
         } catch (IOException e) {
             e.printStackTrace();
-            response.setContentType("text/plain;charset=UTF-8");
-            response.getWriter().write("系统异常，请稍后再试！");
+            response.getWriter().write(e.getMessage());
         }
 
     }
@@ -547,7 +544,6 @@ public class AlipayController {
 
     private ProjectRecode createProjectRecode(String jsonStr) throws Exception {
         JSONObject jsonObject = JSONObject.parseObject(jsonStr);
-        jsonObject = null;
         String imid = jsonObject.getString("imid");
         logger.info("移动端imid=" + imid);
         Long uuid = null;
@@ -560,7 +556,7 @@ public class AlipayController {
             jsonObject.remove("imid");
             //TODO 通过imid获取uuid
             Object uuidObj = userService.getUserByImId(Long.parseLong(imid));
-            if (uuidObj !=null) {
+            if (uuidObj != null) {
                 uuid = (Long)uuidObj;
                 logger.info("移动端imid转为uuid，uuid=" + uuid);
             }