fix: 修复整体样式问题

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/member/front/advich/MemberEnquiryController.java

@@ -162,7 +162,7 @@ public class MemberEnquiryController extends BaseController {
 
                 }
                 memberEnquiry.setItemName(itemName);
-                vos.add(new MemberEnquiryVO(memberEnquiry));
+                vos.add(new MemberEnquiryVO(memberEnquiry, webSite));
             });
         }
         return SldResponse.success(new PageVO<>(vos, example.getPager()));
@@ -176,6 +176,7 @@ public class MemberEnquiryController extends BaseController {
      */
     @GetMapping("phoneCode")
     public JsonResult<List<CountryPhoneCodeVO>> getPhoneCode(HttpServletRequest request) {
+        String  webSite = WebUtil.getWebSite(request);
         CountryExample example = new CountryExample();
         example.setOrderBy("id asc");
         ArrayList<CountryPhoneCodeVO> vos = new ArrayList<>();
@@ -188,9 +189,19 @@ public class MemberEnquiryController extends BaseController {
                 return Collator.getInstance(Locale.UK).compare(s1, s2);
             }
         });
+        if (!WebSiteConstant.MEMBER_OVERSEA.equals(webSite)){
+            Collections.sort(list,new Comparator<Country>(){
+                @Override
+                public int compare(Country o1, Country o2) {
+                    String s1=o1.getZhName();
+                    String s2=o2.getZhName();
+                    return Collator.getInstance(Locale.SIMPLIFIED_CHINESE).compare(s1, s2);
+                }
+            });
+        }
         if (!CollectionUtils.isEmpty(list)) {
             list.forEach(country -> {
-                vos.add(new CountryPhoneCodeVO(country));
+                vos.add(new CountryPhoneCodeVO(country, webSite));
             });
         }
         return SldResponse.success(vos);

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/vo/member/CountryPhoneCodeVO.java

@@ -1,5 +1,6 @@
 package com.slodon.b2b2c.vo.member;
 
+import com.slodon.b2b2c.enums.WebSiteConstant;
 import com.slodon.b2b2c.system.pojo.Country;
 import lombok.Data;
 
@@ -17,8 +18,11 @@ public class CountryPhoneCodeVO implements Serializable {
 
     private String value;
 
-    public CountryPhoneCodeVO(Country country) {
+    public CountryPhoneCodeVO(Country country, String webSite) {
         label = country.getName();
+        if (!WebSiteConstant.MEMBER_OVERSEA.equals(webSite)) {
+            label = country.getZhName();
+        }
         value = country.getPhoneCode();
     }
 }

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/vo/member/MemberEnquiryVO.java

@@ -1,6 +1,7 @@
 package com.slodon.b2b2c.vo.member;
 
 import com.slodon.b2b2c.core.i18n.Language;
+import com.slodon.b2b2c.enums.WebSiteConstant;
 import com.slodon.b2b2c.member.pojo.MemberEnquiry;
 import lombok.Data;
 import org.springframework.util.StringUtils;
@@ -47,7 +48,7 @@ public class MemberEnquiryVO implements Serializable {
 
     private Long storeId;
 
-    public MemberEnquiryVO(MemberEnquiry memberEnquiry) {
+    public MemberEnquiryVO(MemberEnquiry memberEnquiry,String webSite) {
         id = memberEnquiry.getId();
         name = memberEnquiry.getName();
         email = memberEnquiry.getEmail();
@@ -60,7 +61,10 @@ public class MemberEnquiryVO implements Serializable {
         createTime = memberEnquiry.getCreateTime();
         pageUrl = memberEnquiry.getPageUrl();
         itemType = memberEnquiry.getItemType();
-        itemTypeStr = getEnquiryTypeText(memberEnquiry.getItemType());
+        itemTypeStr = memberEnquiry.getItemType();
+        if(!WebSiteConstant.MEMBER_OVERSEA.equals(webSite)){
+            itemTypeStr = getEnquiryTypeText(memberEnquiry.getItemType());
+        }
         itemId = memberEnquiry.getItemId();
         itemName = memberEnquiry.getItemName();
         storeId = memberEnquiry.getStoreId();