商户管理调整

jiangqs

2023-06-02 25314d6c4fe5155691a75f9ea2be8608efeca359

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

@@ -1,8 +1,10 @@
package com.ruoyi.shop.service.impl.shop;
import java.math.BigDecimal;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.common.core.utils.uuid.IdUtils;
import com.ruoyi.shop.domain.dto.*;
import com.ruoyi.shop.domain.pojo.shop.*;
@@ -74,6 +76,14 @@

    @Resource
    private ShopStaffService shopStaffService;

    @Resource
    private ShopAccountService shopAccountService;

    @Resource
    private ShopAuthenticationService shopAuthenticationService;


    /**
     * 获取商户详情
     * @param shopId
@@ -116,9 +126,10 @@
    @Override
    public void createShop(MgtEditShopDto MGTEditShopDto){
        Shop shop = new Shop();
        Boolean newShop = false;
        if(MGTEditShopDto.getShopId()!=null){
            shop = this.getById(MGTEditShopDto.getShopId());
            shop.setUpdateTime(new Date());
            shop.setUpdateTime(DateUtils.getNowDate());
            shop.setUpdateUserId(MGTEditShopDto.getUserId());
            shop.setShopTags(null);
            //清空关联记录
@@ -129,9 +140,12 @@
            shopRelUserService.deleteByShopId(shop.getShopId());
            shopStaffService.clearShopStaffRelation(shop.getShopId());
        }else{
            shop.setShopStatus(2);
            shop.setCreateTime(new Date());
            shop.setShopStatus(3);
            shop.setCreateTime(DateUtils.getNowDate());
            shop.setCreateUserId(MGTEditShopDto.getUserId());
            shop.setFrozenFlag(0);
            shop.setCooperativeFlag(0);
            newShop = true;
        }
        BeanUtils.copyProperties(MGTEditShopDto,shop);
        this.saveOrUpdate(shop);
@@ -205,6 +219,23 @@
                shopFileService.save(shopFile);
            }
        }
        if(newShop){
            ShopAccount shopAccount = new ShopAccount();
            shopAccount.setShopId(shop.getShopId());
            shopAccount.setDelFlag(0);
            shopAccount.setTotalIncome(new BigDecimal("0"));
            shopAccount.setTotalDisburse(new BigDecimal("0"));
            shopAccount.setTotalRefund(new BigDecimal("0"));
            shopAccount.setTotalProfitsharing(new BigDecimal("0"));
            shopAccount.setTotalMoney(new BigDecimal("0"));
            shopAccountService.saveOrUpdate(shopAccount);
            String authId = IdUtils.simpleUUID();
            ShopAuthentication shopAuthentication = new ShopAuthentication();
            shopAuthentication.setAuthId(authId);
            shopAuthentication.setDelFlag(0);
            shopAuthentication.setShopId(shop.getShopId());
            shopAuthenticationService.saveOrUpdate(shopAuthentication);
        }
    }

    /**
@@ -220,7 +251,7 @@
        try {
            Date coopStartDate = simpleDateFormat.parse(coopStartTime);
            Date coopEndDate = simpleDateFormat.parse(coopEndTime);
            Date nowTime = new Date();
            Date nowTime = DateUtils.getNowDate();
            shop.setCooperationStartTime(coopStartDate);
            shop.setCooperationEndTime(coopEndDate);
            Boolean inTime = false;