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

fs-admin/src/main/java/com/fs/his/controller/FsUserAddressController.java

@@ -1,32 +1,21 @@
 package com.fs.his.controller;
 
-import java.util.List;
-
 import com.alibaba.fastjson.JSON;
-import com.fs.common.core.domain.R;
-import com.fs.common.utils.ParseUtils;
-import com.fs.common.utils.SecurityUtils;
-import com.fs.his.dto.AddressInfoDTO;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
+import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
+import com.fs.common.utils.SecurityUtils;
+import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.his.domain.FsUserAddress;
+import com.fs.his.dto.AddressInfoDTO;
 import com.fs.his.service.IFsUserAddressService;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.common.core.page.TableDataInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
 
-import static com.fs.his.utils.PhoneUtil.decryptAutoPhoneMk;
+import java.util.List;
 
 /**
  * 用户地址Controller
@@ -51,8 +40,10 @@ public class FsUserAddressController extends BaseController
         startPage();
         List<FsUserAddress> list = fsUserAddressService.selectFsUserAddressList(fsUserAddress);
         for (FsUserAddress userAddress : list) {
-            userAddress.setPhone(decryptAutoPhoneMk(userAddress.getPhone()));
-            userAddress.setDetail(ParseUtils.parseAddress(userAddress.getDetail()));
+//            userAddress.setPhone(decryptAutoPhoneMk(userAddress.getPhone()));
+            userAddress.setPhone(userAddress.getPhone());
+//            userAddress.setDetail(ParseUtils.parseAddress(userAddress.getDetail()));
+            userAddress.setDetail(userAddress.getDetail());
         }
         return getDataTable(list);
     }
@@ -87,8 +78,10 @@ public class FsUserAddressController extends BaseController
     public AjaxResult getInfo(@PathVariable("addressId") Long addressId)
     {
         FsUserAddress fsUserAddress = fsUserAddressService.selectFsUserAddressByAddressId(addressId);
-        fsUserAddress.setPhone(ParseUtils.parsePhone(fsUserAddress.getPhone()));
-        fsUserAddress.setDetail(ParseUtils.parseAddress(fsUserAddress.getDetail()));
+//        fsUserAddress.setPhone(ParseUtils.parsePhone(fsUserAddress.getPhone()));
+        fsUserAddress.setPhone(fsUserAddress.getPhone());
+//        fsUserAddress.setDetail(ParseUtils.parseAddress(fsUserAddress.getDetail()));
+        fsUserAddress.setDetail(fsUserAddress.getDetail());
         return AjaxResult.success(fsUserAddress);
     }
 

fs-service/src/main/java/com/fs/his/service/impl/FsUserAddressServiceImpl.java

@@ -1,26 +1,23 @@
 package com.fs.his.service.impl;
 
-import java.lang.reflect.Field;
-import java.net.URLEncoder;
-import java.security.MessageDigest;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import cn.hutool.http.HttpUtil;
 import com.fs.common.exception.CustomException;
 import com.fs.common.utils.DateUtils;
 import com.fs.his.config.FsSysConfig;
-import com.fs.his.param.FsStoreOrderParam;
+import com.fs.his.domain.FsUserAddress;
+import com.fs.his.mapper.FsUserAddressMapper;
+import com.fs.his.service.IFsUserAddressService;
 import com.fs.his.utils.ConfigUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.fs.his.mapper.FsUserAddressMapper;
-import com.fs.his.domain.FsUserAddress;
-import com.fs.his.service.IFsUserAddressService;
 import org.springframework.util.Base64Utils;
 
-import static com.fs.his.utils.PhoneUtil.encryptPhone;
+import java.lang.reflect.Field;
+import java.net.URLEncoder;
+import java.security.MessageDigest;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 用户地址Service业务层处理
@@ -84,11 +81,11 @@ public class FsUserAddressServiceImpl implements IFsUserAddressService
     public int updateFsUserAddress(FsUserAddress fsUserAddress)
     {
         fsUserAddress.setUpdateTime(DateUtils.getNowDate());
-        if (fsUserAddress.getPhone()!=null&&fsUserAddress.getPhone().length()==11&&fsUserAddress.getPhone().matches("\\d+")){
-            fsUserAddress.setPhone(encryptPhone(fsUserAddress.getPhone()));
-        }else {
-            fsUserAddress.setPhone(null);
-        }
+//        if (fsUserAddress.getPhone()!=null&&fsUserAddress.getPhone().length()==11&&fsUserAddress.getPhone().matches("\\d+")){
+//            fsUserAddress.setPhone(encryptPhone(fsUserAddress.getPhone()));
+//        }else {
+//            fsUserAddress.setPhone(null);
+//        }
         return fsUserAddressMapper.updateFsUserAddress(fsUserAddress);
     }