fixed 编码问题

fuint-application/src/main/java/com/fuint/common/service/impl/OrderServiceImpl.java

@@ -118,7 +118,7 @@ public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implem
     /**
      * 会员等级服务接口
      * */
-    UserGradeService userGradeService;
+    private UserGradeService userGradeService;
 
     /**
      * 售后服务接口

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendMemberController.java

@@ -144,6 +144,9 @@ public class BackendMemberController extends BaseController {
         // 会员等级列表
         Map<String, Object> param = new HashMap<>();
         param.put("status", StatusEnum.ENABLED.getKey());
+        if (account.getMerchantId() != null && account.getMerchantId() > 0) {
+            param.put("MERCHANT_ID", account.getMerchantId());
+        }
         List<MtUserGrade> userGradeList = memberService.queryMemberGradeByParams(param);
 
         // 店铺列表

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendSubMessageController.java

@@ -241,7 +241,7 @@ public class BackendSubMessageController extends BaseController {
 
                 ParamDto para = new ParamDto();
                 String name = obj.get("name").toString();
-                if (!CommonUtil.isUtf8(name)) {
+                if (!CommonUtil.isUtf8(name) || CommonUtil.isErrCode(name)) {
                     name = new String(name.getBytes("ISO8859-1"), "UTF-8");
                 }
                 para.setName(name);

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

@@ -7,7 +7,6 @@ import com.fuint.common.enums.GenderEnum;
 import com.fuint.common.enums.MemberSourceEnum;
 import com.fuint.common.enums.StatusEnum;
 import com.fuint.common.service.*;
-import com.fuint.common.util.CommonUtil;
 import com.fuint.common.util.TokenUtil;
 import com.fuint.framework.exception.BusinessCheckException;
 import com.fuint.framework.web.BaseController;