商户端和管理台联调bug

jiangqs

2023-06-26 b4882b114f082e010d4cc3359d78d18095ef3b83

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

@@ -10,11 +10,13 @@
import com.ruoyi.common.core.utils.uuid.IdUtils;
import com.ruoyi.common.security.utils.CodeFactoryUtil;
import com.ruoyi.shop.domain.dto.*;
import com.ruoyi.shop.domain.pojo.ShopTotal;
import com.ruoyi.shop.domain.pojo.shop.*;
import com.ruoyi.shop.domain.pojo.task.ShopFile;
import com.ruoyi.shop.domain.vo.*;
import com.ruoyi.shop.mapper.shop.ShopMapper;
import com.ruoyi.shop.service.shop.*;
import com.ruoyi.shop.service.task.MemberTaskService;
import com.ruoyi.shop.service.task.ShopFileService;
import com.ruoyi.system.api.constant.AppErrorConstant;
import com.ruoyi.system.api.domain.dto.*;
@@ -90,6 +92,12 @@
    @Resource
    private RemoteConfigService remoteConfigService;

    @Resource
    private ShopTotalService shopTotalService;

    @Resource
    private MemberTaskService memberTaskService;

    /**
     * 获取商户详情
     * @param shopId
@@ -133,6 +141,7 @@
    public void createShop(MgtEditShopDto mgtEditShopDto){
        Shop shop = new Shop();
        Boolean newShop = false;
        BigDecimal zeroBig = BigDecimal.ZERO;
        Shop shopSame = this.getOne(new LambdaQueryWrapper<Shop>().eq(Shop::getDelFlag,0).eq(Shop::getShopName,mgtEditShopDto.getShopName()));
        if(mgtEditShopDto.getShopId()!=null){
            if(shopSame!=null&&!Objects.equals(shopSame.getShopId(),mgtEditShopDto.getShopId())){
@@ -262,6 +271,41 @@
            shopProportion.setUpdateTime(new Date());
            shopProportion.setUpdateUserId(mgtEditShopDto.getUserId());
            shopProportionService.save(shopProportion);
            //商户统计
            ShopTotal shopTotal = new ShopTotal();
            shopTotal.setShopId(shop.getShopId());
            shopTotal.setDelFlag(0);
            shopTotal.setLastPayMoney(zeroBig);
            shopTotal.setTotalActivityCount(0);
            shopTotal.setTotalOrder(0);
            shopTotal.setTotalCycleOrder(0);
            shopTotal.setToltaExperienceOrder(0);
            shopTotal.setTotalServiceOrder(0);
            shopTotal.setTotalGoodsOrder(0);
            shopTotal.setTotalServiceCount(0);
            shopTotal.setUsedServiceCount(0);
            shopTotal.setUseableServiceCount(0);
            shopTotal.setTotalCycleService(0);
            shopTotal.setUsedCycleService(0);
            shopTotal.setUseableCycleService(0);
            shopTotal.setTotalCyclePerson(0);
            shopTotal.setUseableCyclePerson(0);
            shopTotal.setTotalServiceService(0);
            shopTotal.setUsedServiceService(0);
            shopTotal.setUseableServiceService(0);
            shopTotal.setTotalServicePerson(0);
            shopTotal.setUseableServicePerson(0);
            shopTotal.setTotalExperienceService(0);
            shopTotal.setUsedExperienceService(0);
            shopTotal.setUseableExperienceService(0);
            shopTotal.setTotalExperiencePerson(0);
            shopTotal.setUseableExperiencePerson(0);
            shopTotal.setTotalOrderMoney(zeroBig);
            shopTotal.setTotalCycleMoney(zeroBig);
            shopTotal.setTotalExperienceMoney(zeroBig);
            shopTotal.setTotalServiceMoney(zeroBig);
            shopTotal.setTotalGoodsMoney(zeroBig);
            shopTotalService.save(shopTotal);
        }
    }

@@ -542,7 +586,16 @@
        Shop shop = this.getById(shopId);
        merHomeShopTotalVo.setShopType(shop.getShopType());
        MerHomeShopTotalVo orderVo = remoteOrderService.getMerHomeTotal(merHomeShopTotalVo).getData();

        ShopTotal shopTotal = shopTotalService.getById(shopId);
        merHomeShopTotalVo.setShopId(shopId);
        merHomeShopTotalVo.setShopType(shop.getShopType());
        merHomeShopTotalVo.setTodayShop(orderVo.getTodayShop());
        merHomeShopTotalVo.setUnHandleOrder(orderVo.getUnHandleOrder());
        Integer taskCount = memberTaskService.getMemberIngTotal(shopId);
        merHomeShopTotalVo.setTask(taskCount);
        merHomeShopTotalVo.setShopTurnover(orderVo.getShopTurnover());
        merHomeShopTotalVo.setCycleSurp(shopTotal.getUseableCyclePerson());
        merHomeShopTotalVo.setExplorationSurp(shopTotal.getUseableExperiencePerson());
        return merHomeShopTotalVo;
    }

@@ -840,4 +893,20 @@
        BeanUtils.copyProperties(shopAuthentication, shopAuthGetVo);
        return shopAuthGetVo;
    }

    /**
     * @description  获取商户验证信息
     * @author  jqs
     * @date    2023/6/26 10:38
     * @param authId
     * @return  MgtShopAuthCodeVo
     */
    @Override
    public MgtShopAuthCodeVo getMgtShopAuthCode(String authId){
        MgtShopAuthCodeVo mgtShopAuthCodeVo = new MgtShopAuthCodeVo();
        ShopAuthentication shopAuthentication = shopAuthenticationService.getById(authId);
        mgtShopAuthCodeVo.setSignUrl(shopAuthentication.getSignUrl());
        mgtShopAuthCodeVo.setLegalValidationUrl(shopAuthentication.getLegalValidationUrl());
        return mgtShopAuthCodeVo;
    }
}