update:订单手机和地址权限，fix:代服推送订单

fs-admin/src/main/java/com/fs/hisStore/controller/FsStoreHealthOrderScrmController.java

@@ -7,6 +7,8 @@ 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.domain.R;
+import com.fs.common.core.domain.entity.SysRole;
+import com.fs.common.core.domain.entity.SysUser;
 import com.fs.common.core.domain.model.LoginUser;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
@@ -26,6 +28,7 @@ import com.fs.hisStore.dto.StoreOrderProductDTO;
 import com.fs.hisStore.param.FsStoreOrderParam;
 import com.fs.hisStore.service.*;
 import com.fs.hisStore.vo.*;
+import com.fs.system.service.ISysRoleService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -103,9 +106,10 @@ public class FsStoreHealthOrderScrmController extends BaseController {
             dataTable.setMsg("knt");
         }
         if (list != null) {
+            SysRole sysRole = isCheckPermission();
             LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
             for (FsStoreOrderVO vo : list) {
-                if(vo.getPhone()!=null){
+                if(vo.getPhone()!=null && sysRole.getIsCheckPhone() != 1){
                     vo.setPhone(vo.getPhone().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
                     vo.setUserPhone(vo.getUserPhone().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
                 }
@@ -156,6 +160,25 @@ public class FsStoreHealthOrderScrmController extends BaseController {
         return vo;
     }
 
+    @Autowired
+    private ISysRoleService sysRoleService;
+    private SysRole isCheckPermission() {
+        SysRole sysRole = new SysRole();
+        SysUser user = getLoginUser().getUser();
+        boolean flag = user.isAdmin();
+        if (flag) {
+            sysRole.setIsCheckPhone(1);
+            sysRole.setIsCheckAddress(1);
+        } else {
+            List<SysRole> roles = user.getRoles();
+            if (roles != null && !roles.isEmpty()) {
+                Long[] roleIds = roles.stream().map(SysRole::getRoleId).toArray(Long[]::new);
+                return sysRoleService.getIsCheckPermission(roleIds);
+            }
+        }
+        return sysRole;
+    }
+
     /**
      * 导出健康商城列表
      */
@@ -186,11 +209,12 @@ public class FsStoreHealthOrderScrmController extends BaseController {
         List<FsStoreOrderErpExportVO> list = fsStoreOrderService.selectFsStoreOrderListVOByExport(param);
         //对手机号脱敏
         if (list != null) {
+            SysRole sysRole = isCheckPermission();
             for (FsStoreOrderExportVO vo : list) {
-                if (vo.getPhone() != null) {
+                if (vo.getPhone() != null && sysRole.getIsCheckPhone() != 1) {
                     vo.setPhone(vo.getPhone().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
                 }
-                if (vo.getUserPhone() != null) {
+                if (vo.getUserPhone() != null && sysRole.getIsCheckPhone() != 1) {
                     vo.setUserPhone(vo.getUserPhone().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
                 }
 
@@ -293,8 +317,9 @@ public class FsStoreHealthOrderScrmController extends BaseController {
         //对手机号脱敏
         if (list != null) {
             LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+            SysRole sysRole = isCheckPermission();
             for (FsStoreOrderItemExportVO vo : list) {
-                if (vo.getUserPhone() != null) {
+                if (vo.getUserPhone() != null && sysRole.getIsCheckPhone() != 1) {
                     String phone = vo.getUserPhone().replaceAll("(\\d{3})\\d*(\\d{1})", "$1****$2");
                     vo.setUserPhone(phone);
                 }

fs-admin/src/main/java/com/fs/hisStore/controller/FsStoreOrderScrmController.java

@@ -202,9 +202,10 @@ public class FsStoreOrderScrmController extends BaseController {
             dataTable.setMsg("knt");
         }
         if (list != null) {
+            SysRole sysRole = isCheckPermission();
             LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
             for (FsStoreOrderVO vo : list) {
-                if(vo.getPhone()!=null){
+                if(vo.getPhone()!=null && sysRole.getIsCheckPhone() != 1){
                     vo.setPhone(vo.getPhone().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
                     vo.setUserPhone(vo.getUserPhone().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
                 }
@@ -638,8 +639,16 @@ public class FsStoreOrderScrmController extends BaseController {
     @GetMapping(value = "/{id}")
     public R getInfo(@PathVariable("id") Long id) {
         FsStoreOrderScrm order = fsStoreOrderService.selectFsStoreOrderById(id);
-        order.setUserPhone(ParseUtils.parsePhone(order.getUserPhone()));
-        order.setUserAddress(ParseUtils.parseAddress(order.getUserAddress()));
+        SysRole sysRole = isCheckPermission();
+        String userPhone = order.getUserPhone();
+        if (StringUtils.isNotBlank(userPhone) && sysRole.getIsCheckPhone() != 1) {
+            order.setUserPhone(ParseUtils.parsePhone(userPhone));
+        }
+        String userAddress = order.getUserAddress();
+        if (StringUtils.isNotBlank(userAddress) && sysRole.getIsCheckAddress() != 1) {
+            order.setUserAddress(ParseUtils.parseAddress(userAddress));
+        }
+
         FsUser user = userService.selectFsUserById(order.getUserId());
         if (user != null) {
             user.setPhone(ParseUtils.parsePhone(user.getPhone()));

fs-company/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 server:
-  port: 7773
+  port: 8006
 # Spring配置
 spring:
   profiles:

fs-service/src/main/java/com/fs/erp/service/impl/DfOrderServiceImpl.java

@@ -477,7 +477,7 @@ public class DfOrderServiceImpl implements IErpOrderService {
             if (OrderContextHolder.hasIntegralOrder())
                 order = new FsStoreOrderScrm();
             if (order != null) {
-                String mailNumber = order.getDeliverySn();
+                String mailNumber = order.getDeliveryId();
                 Long dfAccountId = getSFAccountIndex(order.getId());
                 //积分商城逻辑
                 if (OrderContextHolder.hasIntegralOrder()){
@@ -1485,7 +1485,7 @@ public class DfOrderServiceImpl implements IErpOrderService {
         } else { // 如果是线上付款
             orderPayMethod = 2;
             // 货到付款金额 = 订单剩余支付金额
-            vo.setCollectingMoney(fsStoreOrder.getDeliveryPayMoney().doubleValue());
+            vo.setCollectingMoney(fsStoreOrder.getPayDelivery().doubleValue());
             vo.setCollectionCardNumber(dfAccount.getMonthlyCard()); // 就是月结账号
         }
         //订单付款方式 1:在线支付 2:货到付款