Merge remote-tracking branch 'origin/master'

xuhy

2025-01-14 87a597dd71f67e05367169640f862bcef809e720

Merge remote-tracking branch 'origin/master'

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/OrderDetailVO.java

@@ -63,7 +63,7 @@
    private BigDecimal paymentAmount;

    @ApiModelProperty(value = "配送方式（1=自提，2=快递）")
    private String distributionMode;
    private Integer distributionMode;

    @ApiModelProperty(value = "门店名称")
    private String shopName;

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/SysUserFallbackFactory.java

@@ -65,6 +65,11 @@
            }
    
            @Override
            public R<SysUser> queryUserByUserNameAndRoleType(String userName, Integer roleType) {
                return R.fail("通过账号和账号权限查询用户失败：" + cause.getMessage());
            }
    
            @Override
            public R addSysUser(SysUser user) {
                return R.fail("添加用户失败:" + cause.getMessage());
            }

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java

@@ -74,6 +74,14 @@
    R<SysUser>  queryUserByUserName(@RequestBody String userName);
    
    /**
     * 通过账号和账号权限查询用户
     * @param userName
     * @return
     */
    @PostMapping("/user/queryUserByUserNameAndRoleType")
    R<SysUser>  queryUserByUserNameAndRoleType(@RequestParam("roleType") String userName, @RequestParam("roleType") Integer roleType);
    
    /**
     * 新增加用户信息
     * @param user
     */

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java

@@ -571,6 +571,8 @@
    public R<SysUser> queryUserByUserName(@RequestBody String userName){
        SysUser user = userService.getOne(Wrappers.lambdaQuery(SysUser.class)
                .eq(SysUser::getUserName, userName)
                .eq(SysUser::getDelFlag, "0")
                .eq(SysUser::getStatus, 0)
                .last("LIMIT 1"));
        return R.ok(user);
    }
@@ -696,4 +698,22 @@
        Set<String> rolePerms = menuService.selectMenuPermsByRoleId(roleId);
        return R.ok(rolePerms);
    }
    
    
    
    /**
     * 通过账号和账号权限查询用户
     * @param userName
     * @return
     */
    @PostMapping("/queryUserByUserNameAndRoleType")
    public R<SysUser>  queryUserByUserNameAndRoleType(@RequestParam("roleType") String userName, @RequestParam("roleType") Integer roleType){
        SysUser user = userService.getOne(Wrappers.lambdaQuery(SysUser.class)
                .eq(SysUser::getUserName, userName)
                .eq(SysUser::getDelFlag, "0")
                .eq(SysUser::getStatus, 0)
                .eq(SysUser::getRoleType, roleType)
                .last("LIMIT 1"));
        return R.ok(user);
    }
}

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AgentApplicationController.java

@@ -14,7 +14,9 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.bean.BeanUtils;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.other.api.domain.BaseSetting;
import com.ruoyi.other.api.domain.VipSetting;
import com.ruoyi.other.api.feignClient.BaseSettingClient;
import com.ruoyi.other.api.feignClient.VipSettingClient;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -37,6 +39,8 @@
    private AgentApplicationService agentApplicationService;
    @Resource
    private AppUserService appUserService;
    @Resource
    private BaseSettingClient baseSettingClient;

    @PostMapping("/apply")
    @ApiOperation(value = "会员申请", tags = {"会员中心-小程序"})
@@ -95,9 +99,40 @@
        //变更会员等级
        byId1.setVipId(byId.getApplicationVipId());
        appUserService.updateById(byId1);

        // 当用户为合伙人时，计算合伙人积分和培育积分
        Integer vipId = byId1.getVipId();
        if (vipId == 7){
            // 当前用户计算合伙人积分
            R<VipSetting> vipSetting = vipSettingClient.getVipSetting(vipId);
            setPoint(vipSetting, byId1, byId1.getShopPoint(), byId1.getSharePoint());
            // 上级计算培育积分
            Long inviteUserId = byId1.getInviteUserId();
            AppUser byId2 = appUserService.getById(inviteUserId);
            if (byId2 != null){
                setPoint(vipSetting, byId2, byId1.getShopPoint(), byId1.getSharePoint());
            }
        }
        return R.ok(byId);
    }

    private void setPoint(R<VipSetting> vipSetting, AppUser appUser, Integer shopPoint, Integer sharePoint) {
        VipSetting vipSettingData = vipSetting.getData();
        Integer vipLevelUpShopRole = vipSettingData.getVipLevelUpShopRole();
        if (vipLevelUpShopRole == 1){
            Integer vipLevelUpShop = vipSettingData.getVipLevelUpShop();
            Integer vipLevelUpShare = vipSettingData.getVipLevelUpShare();
            if (shopPoint >=vipLevelUpShop && sharePoint >= vipLevelUpShare) {
                R<BaseSetting> baseSetting = baseSettingClient.getBaseSetting(1);
                BaseSetting data = baseSetting.getData();
                if (data != null){
                    appUser.setPartPoint(Integer.parseInt(data.getContent()));
                    appUserService.updateById(appUser);
                }
            }
        }
    }


}


 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java

@@ -524,6 +524,7 @@
        AppUser byId = appUserService.lambdaQuery()
                .eq(AppUser::getPhone, phone)
                .eq(AppUser::getDelFlag,0)
                .eq(AppUser::getStatus,1)
                .one();
        if (byId == null) {
            return R.fail("搜索失败，手机号错误。");

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java

@@ -132,26 +132,34 @@
    @ApiOperation(value = "已领取列表", tags = {"管理后台-优惠劵"})
    public R<Page<UserCoupon>> list1(@RequestParam Integer pageNum,
                                     @RequestParam Integer pageSize,
                                     String userName,
                                     @ApiParam("1未使用2已使用3已过期") Integer status,
                                     String phone,
                                     Integer id) {

        List<Long> appUserIds = null;
        if (!StringUtils.isEmpty(phone)){
            List<AppUser> appUserList = appUserService.list(new LambdaQueryWrapper<AppUser>()
                    .like(AppUser::getPhone, phone));
            if (!CollectionUtils.isEmpty(appUserList)){
                appUserIds = appUserList.stream().map(AppUser::getId).collect(Collectors.toList());
            }else {
                return R.ok(Page.of(pageNum, pageSize));
            }
        LambdaQueryWrapper<AppUser> queryWrapper = new LambdaQueryWrapper<>();

        if (!StringUtils.isEmpty(phone)) {
            queryWrapper.like(AppUser::getPhone, phone);
        }
        if (!StringUtils.isEmpty(userName)) {
            queryWrapper.like(AppUser::getName, userName);
        }

        List<AppUser> appUserList = appUserService.list(queryWrapper);

        if (CollectionUtils.isEmpty(appUserList)) {
            return R.ok(Page.of(pageNum, pageSize));
        }

        List<Long> appUserIds = appUserList.stream().map(AppUser::getId).distinct().collect(Collectors.toList());


        Page<UserCoupon> page = userCouponService.lambdaQuery()
                .isNull(status!=null&&(status==1||status==3),UserCoupon::getUseTime)
                .isNotNull(status!=null&&status==2,UserCoupon::getUseTime)
                .eq(UserCoupon::getCouponId, id)
                .in(appUserIds != null,UserCoupon::getAppUserId, appUserIds)
                .in(!CollectionUtils.isEmpty(appUserIds),UserCoupon::getAppUserId, appUserIds)
                .lt(status!=null&&status==3,UserCoupon::getEndTime, LocalDateTime.now()).page(Page.of(pageNum-1, pageSize));
        for (UserCoupon record : page.getRecords()) {
            record.setIdStr(record.getId().toString());

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/BalanceChangeRecordServiceImpl.java

@@ -54,14 +54,16 @@
        // 过滤商城购物
        List<BalanceChangeRecord> collect = balanceChangeRecordIPage.getRecords().stream().filter(e -> e.getChangeType() != 5).collect(Collectors.toList());
        for (BalanceChangeRecord changeRecord : collect) {
            BigDecimal subtract = changeRecord.getBeforeAmount().subtract(changeRecord.getAfterAmount());
            if (subtract.compareTo(BigDecimal.ZERO)>0){
                // 减少
                changeRecord.setChangeAmountString("-￥"+changeRecord.getChangeAmount());
            }else if (subtract.compareTo(BigDecimal.ZERO)<0){
                changeRecord.setChangeAmountString("+￥"+changeRecord.getChangeAmount());
            }else{
                changeRecord.setChangeAmountString("￥"+changeRecord.getChangeAmount());
            if (changeRecord.getBeforeAmount()!=null && changeRecord.getAfterAmount()!=null){
                BigDecimal subtract = changeRecord.getBeforeAmount().subtract(changeRecord.getAfterAmount());
                if (subtract.compareTo(BigDecimal.ZERO)>0){
                    // 减少
                    changeRecord.setChangeAmountString("-￥"+changeRecord.getChangeAmount());
                }else if (subtract.compareTo(BigDecimal.ZERO)<0){
                    changeRecord.setChangeAmountString("+￥"+changeRecord.getChangeAmount());
                }else{
                    changeRecord.setChangeAmountString("￥"+changeRecord.getChangeAmount());
                }
            }
        }
        balanceChangeRecordIPage.setRecords(collect);

 ruoyi-service/ruoyi-account/src/main/resources/mapper/account/BalanceChangeRecordMapper.xml

@@ -29,7 +29,9 @@
            tau.phone userPhone,
            tbcr.change_type,
            tbcr.create_time,
            tbcr.change_amount
            tbcr.change_amount,
        tbcr.before_amount,
        tbcr.after_amount
        FROM
            t_balance_change_record tbcr
                LEFT JOIN t_app_user tau ON tbcr.app_user_id = tau.id

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java

@@ -91,9 +91,9 @@
        if(Arrays.asList(2, 3).contains(refundPass.getStatus())){
            return R.fail("售后取消失败");
        }
//        refundPass.setDelFlag(1);
        refundPassService.removeById(id);
        order.setOrderStatus(4);
        refundPass.setDelFlag(1);
        refundPassService.updateById(refundPass);
        order.setOrderStatus(order.getOldOrderStatus());
        orderService.updateById(order);
        return R.ok();
    }

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/CommissionServiceImpl.java

@@ -313,7 +313,7 @@
                //添加积分明细
                if(!shopAppUser.getLavePoint().equals(lavePoint)){
                    UserPoint userPoint = new UserPoint();
                    userPoint.setType(9);
                    userPoint.setType(8);
                    userPoint.setHistoricalPoint(lavePoint);
                    userPoint.setVariablePoint(hxmd_point);
                    userPoint.setBalance(shopAppUser.getLavePoint());

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java

@@ -174,13 +174,7 @@
            orderActivityInfo = JSONObject.parseObject(activityJson, OrderActivityInfo.class);
        }
        OrderDetailVO orderDetailVO = new OrderDetailVO();

        if (CollectionUtil.isNotEmpty(orderGoods)){
            String goodJson = orderGoods.get(0).getGoodJson();
            Goods goods = JSONObject.parseObject(goodJson, Goods.class);
            orderDetailVO.setDistributionMode(goods.getDistributionMode());
        }

        orderDetailVO.setDistributionMode(order.getDistributionMode());
        Technician technician = new Technician();
        if (order.getTechnicianId() != null){
            R<Technician> shopdetail = technicianClient.shopdetail(order.getTechnicianId());
@@ -215,6 +209,13 @@
        orderDetailVO.setShopId(shop.getId());
        orderDetailVO.setTechnicianName(technician.getName());
        orderDetailVO.setTechnicianId(technician.getId());
        if(order.getOrderType() == 1){
            List<TechnicianSubscribe> data = technicianSubscribeClient.getTechnicianSubscribeList(order.getId()).getData();
            if(data.size() > 0){
                Long id = data.get(0).getId();
                orderDetailVO.setTechnicianSubscribeId(id.toString());
            }
        }
        return orderDetailVO;
    }


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

@@ -155,6 +155,7 @@
        if (StringUtils.isNotEmpty(goodsEvaluate.getPhone())&&StringUtils.isNotEmpty(goodsEvaluate.getUserName())){
            // 取交集
            usersNameList.retainAll(usersPhoneList);
            if (usersNameList.isEmpty())usersNameList.add(-1L);
        }else{
            usersNameList.addAll(usersPhoneList);
        }

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

@@ -134,13 +134,15 @@
            throw new RuntimeException("添加失败");
        }
        //添加门店后台账号和门店关系数据
        SysUser sysUser = sysUserClient.queryUserByUserName(phone).getData();
        SysUser sysUser = sysUserClient.queryUserByUserNameAndRoleType(phone, 2).getData();
        if(null != sysUser){
            sysUser.setAppUserId(appUser.getId());
            sysUserClient.updateUser(sysUser);
            
            UserShop userShop = new UserShop();
            userShop.setUserId(sysUser.getUserId());
            userShop.setShopId(shopId);
            userShop.setRoleType(1);
            userShop.setNickName(sysUser.getNickName());
            List<UserShop> data = userShopClient.getUserShop(userShop).getData();
            if(null == data || data.size() == 0){
                userShop = new UserShop();
@@ -148,6 +150,7 @@
                userShop.setShopId(shopId);
                userShop.setRoleType(1);
                userShop.setRoleId(2L);
                userShop.setNickName(sysUser.getNickName());
                userShop.setCreateTime(LocalDateTime.now());
                userShopClient.saveUserShop(userShop);
            }
@@ -173,6 +176,8 @@
            userShop.setShopId(shopId);
            userShop.setRoleType(1);
            userShop.setRoleId(2L);
            userShop.setNickName(sysUser.getNickName());
            userShop.setCreateTime(LocalDateTime.now());
            userShopClient.saveUserShop(userShop);
        }


 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsBargainPriceServiceImpl.java

@@ -94,6 +94,7 @@
        //添加明细
        List<GoodsBargainPriceDetail> list = vo.getList();
        for (GoodsBargainPriceDetail goodsBargainPriceDetail : list) {
            goodsBargainPriceDetail.setId(null);
            goodsBargainPriceDetail.setGoodsBargainPriceId(bargainPrice.getId());
        }
        goodsBargainPriceDetailService.saveBatch(list);

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TechnicianSubscribeServiceImpl.java

@@ -98,12 +98,16 @@

    @Override
    public void switchingTechnician(TechnicianSubscribe technicianSubscribe) {
        TechnicianSubscribe subscribe = this.getById(technicianSubscribe.getId());
        if(subscribe.getTechnicianId().equals(technicianSubscribe.getTechnicianId())){
            throw new RuntimeException("不能切换相同的技师");
        List<TechnicianSubscribe> list = this.list(new LambdaQueryWrapper<TechnicianSubscribe>().eq(TechnicianSubscribe::getOrderId, technicianSubscribe.getOrderId())
                .eq(TechnicianSubscribe::getDelFlag, 0).eq(TechnicianSubscribe::getStatus, 0));
        for (TechnicianSubscribe subscribe : list) {
            if(subscribe.getTechnicianId().equals(technicianSubscribe.getTechnicianId())){
                throw new RuntimeException("不能切换相同的技师");
            }
            subscribe.setTechnicianId(technicianSubscribe.getTechnicianId());
            this.updateById(subscribe);
        }
        subscribe.setTechnicianId(technicianSubscribe.getTechnicianId());
        this.updateById(subscribe);

    }

    /**