Merge branch 'developer'

935090232@qq.com

2022-02-22 bbe0a2fd03063316e50cf141986bda984599bbda

 zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSkinCheckAction.java

@@ -1,10 +1,10 @@
package com.matrix.system.shopXcx.api.action;

import com.matrix.biz.bean.BizUser;
import com.matrix.component.redis.RedisUserLoginUtils;
import com.matrix.system.common.init.UserCacheManager;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.pojo.PaginationVO;
import com.matrix.core.tools.StringUtils;
import com.matrix.system.common.interceptor.HostInterceptor;
import com.matrix.system.hive.bean.SysSkinCheckRecord;
import com.matrix.system.hive.bean.SysSkinDetail;
import com.matrix.system.hive.bean.SysVipInfo;
@@ -41,19 +41,19 @@
    private SysVipInfoDao vipInfoDao;

    @Autowired
    private RedisUserLoginUtils redisUserLoginUtils;
    private UserCacheManager userCacheManager;

    @Autowired
    private ShopProductDao shopProductDao;

    @RequestMapping(value = "/showSkinList")
    public @ResponseBody AjaxResult showSkinList(@RequestBody SkinCheckDTO skinCheckDTO) {
        BizUser bizUser = redisUserLoginUtils.getLoginUser(BizUser.class);
        SysVipInfo sysVipInfo = userCacheManager.getLoginUser();
        PaginationVO pageVo = new PaginationVO();
        pageVo.setLimit(skinCheckDTO.getLimit());
        pageVo.setOffset(skinCheckDTO.getOffset());
        SysSkinCheckRecord skinCheckRecord = new SysSkinCheckRecord();
        skinCheckRecord.setTelphone(bizUser.getPhoneNumber());
        skinCheckRecord.setTelphone(sysVipInfo.getPhone());
        List<SysSkinCheckRecord> dataList = sysSkinCheckRecordDao.selectInPage(skinCheckRecord, pageVo);
        AjaxResult result = new AjaxResult(AjaxResult.STATUS_SUCCESS, dataList,
                sysSkinCheckRecordDao.selectTotalRecord(skinCheckRecord));
@@ -78,7 +78,7 @@
        });

        sysSkinCheckRecord.setSkinDetails(detailList);
        SysVipInfo vipInfo = vipInfoDao.selectByPhone(sysSkinCheckRecord.getTelphone());
        SysVipInfo vipInfo = vipInfoDao.selectByPhone(sysSkinCheckRecord.getTelphone(), HostInterceptor.getCompanyId());
        AjaxResult result=AjaxResult.buildSuccessInstance(Arrays.asList(sysSkinCheckRecord));
        result.putInMap("vipInfo",vipInfo);
        return result;