bug和二维码

jiangqs

2023-08-03 b95715d5cdc806cbb15cc7f49c538e61f5ab5dc6

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java

@@ -5,11 +5,14 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.constant.CacheConstants;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.bean.BeanUtils;
import com.ruoyi.common.core.utils.uuid.IdUtils;
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.shop.domain.dto.*;
import com.ruoyi.shop.domain.pojo.shop.*;
import com.ruoyi.shop.domain.pojo.task.ShopFile;
@@ -19,7 +22,6 @@
import com.ruoyi.shop.service.task.MemberTaskService;
import com.ruoyi.shop.service.task.ShopFileService;
import com.ruoyi.shop.service.task.ShopTaskService;
import com.ruoyi.shop.util.WxShopUtils;
import com.ruoyi.shop.util.dto.*;
import com.ruoyi.system.api.constant.AppErrorConstant;
import com.ruoyi.system.api.domain.dto.*;
@@ -105,7 +107,13 @@
    private RemoteSysStaffService remoteSysStaffService;

    @Resource
    private RemoteFileService remoteFileService;

    @Resource
    private ShopTaskService shopTaskService;

    @Resource
    private RedisService redisService;

    /**
     * 获取商户详情
@@ -295,6 +303,13 @@
        if(newShop){
            //生成商户关联记录
            initNewShop(shop,mgtEditShopDto.getUserId());
            CodeGetDto codeGetDto = new CodeGetDto();
            String url = "https://wxapp.hhhrt.cn/mini/activity?activityId="+shop.getShopId();
            codeGetDto.setUrl(url);
            codeGetDto.setFileName("shop-"+shop.getShopId());
            String codeUrl = remoteFileService.getAppOrderTotal(codeGetDto).getData();
            shop.setShopCode(codeUrl);
            this.saveOrUpdate(shop);
        }
    }

@@ -756,17 +771,26 @@
    }
    /**
     * 获取商户端
     * @param userId
     * @param merBaseDto
     * @return
     */
    @Override
    public MerHomeShopTotalVo getMerHomeTotal(Long userId){
    public MerHomeShopTotalVo getMerHomeTotal(MerBaseDto merBaseDto){
        Long userId = merBaseDto.getUserId();
        MerHomeShopTotalVo merHomeShopTotalVo = new MerHomeShopTotalVo();
        ShopRelUser shopRelUser = shopRelUserService.getByUserId(userId);
        Long shopId = shopRelUser.getShopId();
        //如果商户变动刷新token
        if(!shopId.equals(merBaseDto.getShopId())){
            String userKey = SecurityUtils.getUserKey();
            redisService.deleteObject(CacheConstants.LOGIN_TOKEN_KEY+userKey);
            throw new ServiceException("登录状态已过期",401);
        }
        merHomeShopTotalVo.setShopId(shopId);
        Shop shop = this.getById(shopId);
        merHomeShopTotalVo.setShopType(shop.getShopType());
        merHomeShopTotalVo.setPlatformCouponFlag(shop.getPlatformCouponFlag());
        merHomeShopTotalVo.setPlatformBirthdayFlag(shop.getPlatformBirthdayFlag());
        MerHomeShopTotalVo orderVo = remoteOrderService.getMerHomeTotal(merHomeShopTotalVo).getData();
        ShopTotal shopTotal = shopTotalService.getById(shopId);
        merHomeShopTotalVo.setShopId(shopId);
@@ -970,19 +994,24 @@
        submitInfo.setId_card_info(id_card_info);
        //企业填写
        if(shopAuthentication.getMainType()==2){
            submitInfo.setOwner(true);
            List<UboInfo> ubo_info_list = new ArrayList<>();
            UboInfo uboInfo = new UboInfo();
            uboInfo.setUbo_id_doc_type("IDENTIFICATION_TYPE_MAINLAND_IDCARD");
            uboInfo.setUbo_id_doc_copy(shopAuthentication.getUboIcFront());
            uboInfo.setUbo_id_doc_copy_back(shopAuthentication.getUboIcBack());
            uboInfo.setUbo_id_doc_name(shopAuthentication.getUboName());
            uboInfo.setUbo_id_doc_number(shopAuthentication.getUboIdCard());
            uboInfo.setUbo_id_doc_address(shopAuthentication.getUboIcAddress());
            uboInfo.setUbo_id_doc_period_begin(shopAuthentication.getUboIcStartDate());
            uboInfo.setUbo_id_doc_period_end(shopAuthentication.getUboIcEndDate());
            ubo_info_list.add(uboInfo);
            submitInfo.setUbo_info_list(ubo_info_list);
            //受益人
            if(shopAuthentication.getOwner()==1){
                submitInfo.setOwner(true);
            }else{
                submitInfo.setOwner(false);
                List<UboInfo> ubo_info_list = new ArrayList<>();
                UboInfo uboInfo = new UboInfo();
                uboInfo.setUbo_id_doc_type("IDENTIFICATION_TYPE_MAINLAND_IDCARD");
                uboInfo.setUbo_id_doc_copy(shopAuthentication.getUboIcFront());
                uboInfo.setUbo_id_doc_copy_back(shopAuthentication.getUboIcBack());
                uboInfo.setUbo_id_doc_name(shopAuthentication.getUboName());
                uboInfo.setUbo_id_doc_number(shopAuthentication.getUboIdCard());
                uboInfo.setUbo_id_doc_address(shopAuthentication.getUboIcAddress());
                uboInfo.setUbo_id_doc_period_begin(shopAuthentication.getUboIcStartDate());
                uboInfo.setUbo_id_doc_period_end(shopAuthentication.getUboIcEndDate());
                ubo_info_list.add(uboInfo);
                submitInfo.setUbo_info_list(ubo_info_list);
            }
        }
        //结算账户信息
        AccountInfo accountInfo = new AccountInfo();
@@ -1014,11 +1043,11 @@
        submitInfo.setBusiness_addition_pics(shopAuthentication.getBaPics());
        submitInfo.setBusiness_addition_desc(shopAuthentication.getBaDesc());
        //提交审核
        try {
        /*try {
            WxShopUtils.ApplymentSubMch(submitInfo);
        } catch (Exception e) {
            throw new RuntimeException(e);
        }
        }*/

    }