fix(server): 支付

front/project/www/components/Login/index.js

@@ -127,7 +127,7 @@ export default class Login extends Component {
         }
       })
       .catch(err => {
-        if (err.message !== '') {
+        if (err.message !== '登录失败') {
           asyncSMessage(err.message, 'error');
         }
       });

server/gateway-api/src/main/java/com/qxgmat/controller/api/CourseController.java

@@ -277,6 +277,9 @@ public class CourseController {
                 dto.setNoteNumber(noteNumber);
                 dto.setAskNumber(askNumber);
                 dto.setAnswerNumber(answerNumber);
+
+                // 签名信息：同pdfHelp
+
             }
 
 

server/gateway-api/src/main/java/com/qxgmat/controller/gateway/PayController.java

@@ -59,6 +59,21 @@ public class PayController {
         }
     }
 
+    @RequestMapping(value = "/wechat_js", method = RequestMethod.POST)
+    @ApiOperation(value = "微信公众号支付", httpMethod = "POST")
+    public void wechatJs(HttpServletRequest request, HttpServletResponse response) {
+        try {
+            ResultInfo info = tradeService.notifyPay(PayChannel.WECHAT_JS, request);
+            logger.debug(JSON.toJSONString(info));
+            Pay pay = payService.getByNo(info.getNo());
+            response.getWriter().write(tradeService.server(pay, info));
+        }catch (InsideException e){
+            logger.error(e.getMessage());
+        }catch (Exception e){
+            logger.error(e.getMessage());
+        }
+    }
+
     @RequestMapping("/return/wechat_qr")
     @ResponseBody
     public Response<Pay> wechatQrReturn(@RequestBody String content){

server/gateway-api/src/main/java/com/qxgmat/service/UsersService.java

@@ -149,13 +149,13 @@ public class UsersService extends AbstractService {
         }
         User mm = User.builder().build();
 
-        if (openUser ==null || openUser.getAvatar() == null || openUser.getAvatar().isEmpty()) {
+        if (data.getAvatar() != null && (openUser ==null || openUser.getAvatar() == null || openUser.getAvatar().isEmpty())) {
             mm.setAvatar(data.getAvatar());
             if(openUser != null){
                 openUser.setAvatar(data.getAvatar());
             }
         }
-        if (openUser == null || openUser.getNickname() == null|| openUser.getNickname().isEmpty() || openUser.getNickname().equals("qx"+openUser.getMobile())){
+        if (data.getNickName() != null && (openUser == null || openUser.getNickname() == null|| openUser.getNickname().isEmpty() || openUser.getNickname().equals("qx"+openUser.getMobile()))){
             mm.setNickname(getSubString(data.getNickName(), 14));
             if(openUser != null){
                 openUser.setNickname(getSubString(data.getNickName(), 14));