fixed h5端会员登录逻辑优化

fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientRefundController.java

@@ -1,6 +1,5 @@
 package com.fuint.module.clientApi.controller;
 
-import com.alibaba.fastjson.JSON;
 import com.fuint.common.dto.RefundDto;
 import com.fuint.common.dto.UserInfo;
 import com.fuint.common.dto.UserOrderDto;
@@ -118,7 +117,7 @@ public class ClientRefundController extends BaseController {
         }
         refundDto.setAmount(order.getPayAmount());
         if (images.size() > 0) {
-            refundDto.setImages(JSON.toJSONString(images));
+            refundDto.setImages(String.join(",", images));
         }
         MtRefund refundInfo = refundService.createRefund(refundDto);
 

fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientUserController.java

@@ -312,7 +312,7 @@ public class ClientUserController extends BaseController {
             mtUser.setPassword(password);
             modifyPassword = true;
         }
-        if (sex.equals(1) || sex.equals(0) || sex.equals(2)) {
+        if (sex != null && sex.equals(1) || sex.equals(0) || sex.equals(2)) {
             mtUser.setSex(sex);
         }
         if (StringUtil.isNotEmpty(birthday)) {

fuint-repository/src/main/resources/mapper/MtUserMapper.xml

@@ -9,10 +9,11 @@
     </select>
 
     <select id="queryMemberByName" resultType="com.fuint.repository.model.MtUser">
-        select * from mt_user t where t.NAME = #{name} and t.STATUS = 'A'
+        select * from mt_user t where (t.NAME = #{name} or t.mobile = #{name}) and t.STATUS = 'A'
         <if test="merchantId != null and merchantId > 0">
             AND t.MERCHANT_ID = #{merchantId}
         </if>
+        order by id asc
     </select>
 
     <select id="queryMemberByOpenId" resultType="com.fuint.repository.model.MtUser">