修改bug

puzhibing

2025-01-10 85384328c12fcc689e1f66f4deca77168859882d

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.account.api.feignClient.AppUserShopClient;
import com.ruoyi.account.api.model.AppUser;
@@ -33,10 +34,13 @@
import io.swagger.annotations.ApiParam;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.math.BigDecimal;
import java.math.MathContext;
import java.math.RoundingMode;
import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
@@ -79,6 +83,8 @@
    private TechnicianSubscribeService technicianSubscribeService;
    @Resource
    private TechnicianService technicianService;
    @Resource
    private ReceiverBankChannelService receiverBankChannelService;



@@ -182,6 +188,7 @@
        Shop shop = shopService.getById(id);
        shop.setDelFlag(1);
        shopService.updateById(shop);
        appUserClient.clearBindShop(shop.getId());
        UserShop userShop = new UserShop();
        userShop.setShopId(shop.getId());
        List<UserShop> data = userShopClient.getUserShop(userShop).getData();
@@ -424,8 +431,14 @@
                Double wgs84 = GeodesyUtil.getDistance(longitude + "," + latitude, shop.getLongitude() + "," + shop.getLatitude()).get("WGS84");
                shop.setDistance(wgs84);
                List<ShopScore> list = shopScoreService.list(new LambdaQueryWrapper<ShopScore>().eq(ShopScore::getShopId, shop.getId()));
                double v = list.stream().map(ShopScore::getScore).reduce(BigDecimal.ZERO, BigDecimal::add).doubleValue();
                double v = 5;
                if(list.size() > 0){
                    v = list.stream().map(ShopScore::getScore).reduce(BigDecimal.ZERO, BigDecimal::add)
                            .divide(new BigDecimal(list.size()), new MathContext(2, RoundingMode.HALF_EVEN)).doubleValue();
                }
                shop.setScore(v);
                ShopScore one = shopScoreService.getOne(new LambdaQueryWrapper<ShopScore>().eq(ShopScore::getAppUserId, userid).eq(ShopScore::getShopId, shop.getId()).last(" order by create_time desc limit 0, 1"));
                shop.setMyScore(null == one ? "0" : one.getScore().toString());
            }
            return R.ok(shopList);
        }
@@ -617,5 +630,29 @@
        List<Shop> list = shopService.list(new LambdaQueryWrapper<Shop>().eq(Shop::getDelFlag, 0).eq(Shop::getStatus, 1));
        return R.ok(list);
    }

    @ResponseBody
    @GetMapping("/verifyAccountConfiguration")
    @ApiOperation(value = "判断是否有提现账户", tags = {"门店后台-财务管理-提现明细"})
    public R verifyAccountConfiguration(){
        Long userid = tokenService.getLoginUser().getUserid();
        SysUser sysUser = sysUserClient.getSysUser(userid).getData();
        Shop shop = shopService.getById(sysUser.getObjectId());
        if(StringUtils.hasLength(shop.getReceiverAccountNoEnc())){
            return R.ok();
        }
        return R.fail("请先配置收款账户");
    }



    @ResponseBody
    @GetMapping("/getBankSerialNumber")
    @ApiOperation(value = "获取行联号", tags = {"门店后台-财务管理-提现明细"})
    public R<List<ReceiverBankChannel>> getBankSerialNumber(String name){
        List<ReceiverBankChannel> list = receiverBankChannelService.list(new LambdaQueryWrapper<ReceiverBankChannel>().like(ReceiverBankChannel::getName, name));
        return R.ok(list);
    }

}