1、新增产权登记2、修复采购管理关于流程调拨采购领用bug

sangzhigang

2021-11-05 5d7054c42cfee40abbe28be89e151c13f5d04f5f

 service-api/src/main/java/com/java110/api/smo/DefaultAbstractComponentSMO.java

@@ -2,12 +2,16 @@

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
import com.java110.api.properties.WechatAuthProperties;
import com.java110.core.component.AbstractComponentSMO;
import com.java110.core.context.IPageData;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.basePrivilege.BasePrivilegeDto;
import com.java110.dto.user.UserDto;
import com.java110.entity.component.ComponentValidateResult;
import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.utils.cache.PrivilegeCache;
import com.java110.utils.constant.CommonConstant;
import com.java110.utils.constant.ResponseConstant;
@@ -30,9 +34,9 @@
    private static final Logger logger = LoggerFactory.getLogger(DefaultAbstractComponentSMO.class);
    protected static final String DEFAULT_PAY_ADAPT = "wechatPayAdapt";// 默认微信通用支付
    private static final String URL_API =  "";

    @Autowired
    private IGetCommunityStoreInfoSMO getCommunityStoreInfoSMOImpl;


    @Autowired
    private WechatAuthProperties wechatAuthProperties;
@@ -42,6 +46,9 @@

    @Autowired
    private RestTemplate restTemplate;

    @Autowired
    private IUserInnerServiceSMO userInnerServiceSMOImpl;

    //微信支付
    public static final String DOMAIN_WECHAT_PAY = "WECHAT_PAY";
@@ -432,6 +439,17 @@
     */
    protected ComponentValidateResult validateStoreStaffCommunityRelationship(IPageData pd, RestTemplate restTemplate) {

        //获取用户id
        String userId = pd.getUserId();
        if (StringUtil.isEmpty(userId)) {
            return new ComponentValidateResult(null, null, null, null, null);
        }
        UserDto userDto = new UserDto();
        userDto.setUserId(userId);
        //查询当前用户信息
        List<UserDto> users = userInnerServiceSMOImpl.getUsers(userDto);
        Assert.listOnlyOne(users, "查询用户信息错误！");
        if (!StringUtil.isEmpty(users.get(0).getLevelCd()) && !users.get(0).getLevelCd().equals("02")) { //02表示普通用户
        // 校验 员工和商户是否有关系
        ResponseEntity responseEntity = getStoreInfo(pd, restTemplate);
        if (responseEntity.getStatusCode() != HttpStatus.OK) {
@@ -452,6 +470,15 @@
            checkStoreEnterCommunity(pd, storeId, storeTypeCd, communityId, restTemplate);
        }
        return new ComponentValidateResult(storeId, storeTypeCd, communityId, pd.getUserId(), pd.getUserName());
        } else {
            JSONObject paramIn = JSONObject.parseObject(pd.getReqData());

            String communityId = "";
            if (paramIn.containsKey("communityId") && !StringUtil.isEmpty(paramIn.getString("communityId"))) {
                communityId = paramIn.getString("communityId");
            }
            return new ComponentValidateResult(null, null, communityId, pd.getUserId(), pd.getUserName());
        }
    }

    /**