修改bug

puzhibing

2025-01-04 0a92ccda431002d31f07a39821e48d670ffc3446

修改bug

 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/BaseSetting.java

@@ -9,6 +9,7 @@
import lombok.EqualsAndHashCode;

import java.io.Serializable;
import java.math.BigDecimal;

/**
 * <p>
@@ -34,5 +35,11 @@
    @TableField("content")
    private String content;

    @ApiModelProperty("是否可提现（0=否，1=是）")

    private Integer withdraw;

    @ApiModelProperty("最低提现金额")
    @TableField("withdrawalMinAmount")
    private BigDecimal withdrawalMinAmount;
}

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

@@ -29,10 +29,13 @@
public class UserCancellationLogController {
    @Resource
    private UserCancellationLogService cancellationLogService;




    @PostMapping("/page")
    @ApiOperation(value = "注销记录列表", tags = {"后台"})
    public R<IPage<UserCancellationLog>> page(@RequestBody UserCancelQuery agentQuery) {

        return R.ok(cancellationLogService.pageList(agentQuery));
    }


 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/dto/BalanceQuery.java

@@ -1,5 +1,6 @@
package com.ruoyi.account.dto;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -14,8 +15,9 @@
    private String userPhone;
    @ApiModelProperty("类型：1充值2提现3红包4分佣5商城购物")
    private Integer changeType;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDate localDate1;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDate localDate2;
    private Integer pageNum;
    private Integer pageSize;

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/dto/UserCancelQuery.java

@@ -1,6 +1,7 @@
package com.ruoyi.account.dto;

import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -9,14 +10,15 @@
@Data
public class UserCancelQuery {
    @ApiModelProperty("用户名称")
    private String name;
    private String userName;

    @ApiModelProperty("电话")
    private String phone;
    private String userPhone;

    private Integer vipId;

    @JsonFormat(pattern = "yyyy-MM-dd")
    private LocalDate localDate1;
    @JsonFormat(pattern = "yyyy-MM-dd")
    private LocalDate localDate2;
    private Integer pageNum;
    private Integer pageSize;

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/dto/UserChangeQuery.java

@@ -1,6 +1,7 @@
package com.ruoyi.account.dto;

import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -18,8 +19,9 @@
    @ApiModelProperty(value = "变更类型 0降级1升级")
    @TableField("change_type")
    private Integer changeType;

    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
    private LocalDateTime localDate1;
    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
    private LocalDateTime localDate2;
    private Integer pageNum;
    private Integer pageSize;

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

@@ -24,11 +24,11 @@
            from t_user_click_log t1
            left join t_app_user t2 on t1.app_user_id = t2.id
            <where>
                <if test="agentQuery.phone != null and agentQuery.phone != ''">
                    and t2.phone like concat('%',#{agentQuery.phone},'%')
                <if test="agentQuery.userPhone != null and agentQuery.userPhone != ''">
                    and t2.phone like concat('%',#{agentQuery.userPhone},'%')
                </if>
                <if test="agentQuery.name != null and agentQuery.name != ''">
                    and t2.name like concat('%',#{agentQuery.name},'%')
                <if test="agentQuery.userName != null and agentQuery.userName != ''">
                    and t2.name like concat('%',#{agentQuery.userName},'%')
                </if>
                <if test="agentQuery.vipId != null">
                    and t1.vip_id = #{agentQuery.vipId}

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/payment/TransferUtil.java

@@ -204,13 +204,13 @@
    
    
    
    public static String sign(JSONObject body) throws Exception{
    public static String sign(JSONObject body) {
        Set<Map.Entry<String, Object>> entries = body.entrySet();
        List<Map.Entry<String, Object>> infoIds = new ArrayList<Map.Entry<String, Object>>(entries);
        // 对所有传入参数按照字段名的 ASCII 码从小到大排序（字典序）
        Collections.sort(infoIds, new Comparator<Map.Entry<String, Object>>() {
            public int compare(Map.Entry<String, Object> o1, Map.Entry<String, Object> o2) {
                return (o1.getKey()).toString().compareTo(o2.getKey());
                return (o1.getKey()).compareTo(o2.getKey());
            }
        });
        // 构造签名键值对的格式
@@ -228,7 +228,4 @@
    }
    
    
    public static void main(String[] args) {
        com.ruoyi.order.util.payment.wechat.TransferUtil.accountBalanceQuery();
    }
}

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

@@ -4,9 +4,14 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.account.api.model.AppUser;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.other.api.domain.BaseSetting;
import com.ruoyi.other.api.domain.VipSetting;
import com.ruoyi.other.service.BaseSettingService;
import com.ruoyi.other.service.VipSettingService;
import com.ruoyi.other.vo.RefundPassSettingVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -30,6 +35,16 @@
    @Resource
    private BaseSettingService baseSettingService;
    
    @Resource
    private VipSettingService vipSettingService;

    @Resource
    private TokenService tokenService;

    @Resource
    private AppUserClient appUserClient;

	
    
    /**
     * 获取基础配置
@@ -41,6 +56,11 @@
    @ApiOperation(value = "获取基础配置", tags = {"管理后台-基础配置"})
    public R<BaseSetting> getBaseSetting(@RequestParam("id") Integer id){
        BaseSetting baseSetting = baseSettingService.getById(id);
        Long userid = tokenService.getLoginUserApplet().getUserid();
        AppUser appUser = appUserClient.getAppUserById(userid);
        VipSetting vipSetting = vipSettingService.getById(appUser.getVipId());
        baseSetting.setWithdraw(vipSetting.getVipWithdrawalRole());
        baseSetting.setWithdrawalMinAmount(vipSetting.getVipWithdrawalMinAmount());
        return R.ok(baseSetting);
    }


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

@@ -47,10 +47,11 @@
     */
    @GetMapping("/selectPhoneByShopId")
    @ApiOperation(value = "查询指定门店手机号", tags = {"小程序-首页-门店详情"})
    public R<List<Phone>> getPhoneByShopId(@ApiParam("门店id") @RequestParam Integer shopId) {
        return R.ok(phoneService.list(new LambdaQueryWrapper<Phone>()
    public R<Phone> getPhoneByShopId(@ApiParam("门店id") @RequestParam Integer shopId) {
        Phone list = phoneService.getOne(new LambdaQueryWrapper<Phone>()
                .eq(Phone::getType, PhoneType.SHOP.getCode())
                .eq(Phone::getShopId, shopId)));
                .eq(Phone::getShopId, shopId));
        return R.ok(list);
    }
    
    

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

@@ -33,6 +33,9 @@
    public R<List<RechargeSet>> list() {
        return R.ok(rechargeSetService.list());
    }



    @PostMapping("/set")
    @ApiOperation(value = "充值设置", tags = {"后台"})
    public R<List<RechargeSet>> detail(@RequestBody RechargeDto rechargeDto) {

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

@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.core.web.page.TableDataInfo;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.common.security.utils.SecurityUtils;
@@ -39,16 +40,13 @@

    @GetMapping("/shop/list")
    @ApiOperation(value = "预约列表", tags = {"门店-预约列表"})
    public TableDataInfo<TechnicianSubscribeVO> shoplist(@ApiParam(value = "状态") Integer status,
    public R<PageInfo<TechnicianSubscribeVO>> shoplist(@ApiParam(value = "状态") Integer status,
                                                         @ApiParam("电话")String phone,
                                                         @ApiParam("姓名")String name,
                                                         @ApiParam("服务方式：1=上门服务，2=到店服务")Integer serviceMode
                                                         ) {
                                @ApiParam("服务方式：1=上门服务，2=到店服务")Integer serviceMode, Integer pageCurr, Integer pageSize) {
        Integer objectId = tokenService.getLoginUser().getSysUser().getObjectId();
        startPage();
        List<TechnicianSubscribeVO> list = technicianSubscribeService
                .getTechnicianSubscribeByUserAndShop1(Long.valueOf(objectId),status,phone,name,serviceMode);
        return getDataTable(list);
        PageInfo<TechnicianSubscribeVO> pageInfo = technicianSubscribeService.getTechnicianSubscribeByUserAndShop1(Long.valueOf(objectId), status, phone, name, serviceMode, pageCurr, pageSize);
        return R.ok(pageInfo);
    }

    /**
@@ -56,12 +54,10 @@
     */
    @GetMapping("/list")
    @ApiOperation(value = "预约列表", notes = "预约列表", tags = {"小程序-个人中心-门店管理-预约列表"})
    public TableDataInfo<TechnicianSubscribeVO> list(@ApiParam(value = "状态") Integer status,
                              @ApiParam(value = "门店id") @RequestParam Long shopId) {
        startPage();
        List<TechnicianSubscribeVO> list = technicianSubscribeService
                .getTechnicianSubscribeByUserAndShop(shopId,status);
        return getDataTable(list);
    public R<PageInfo<TechnicianSubscribeVO>> list(@ApiParam(value = "状态") Integer status,
                              @ApiParam(value = "门店id") @RequestParam Long shopId, Integer current, Integer size) {
        PageInfo<TechnicianSubscribeVO> pageInfo = technicianSubscribeService.getTechnicianSubscribeByUserAndShop(shopId, status, current, size);
        return R.ok(pageInfo);
    }

    /**

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TechnicianSubscribeMapper.java

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.other.api.domain.TechnicianSubscribe;
import com.ruoyi.other.vo.TechnicianSubscribeVO;
import org.apache.ibatis.annotations.Param;
@@ -24,10 +25,10 @@
     * @param shopId
     * @return
     */
    List<TechnicianSubscribeVO> getTechnicianSubscribeByUserAndShop(
    List<TechnicianSubscribeVO> getTechnicianSubscribeByUserAndShop(PageInfo<TechnicianSubscribeVO> pageInfo,
                                                                    @Param("shopId") Long shopId,
                                                                    @Param("status") Integer status);
    List<TechnicianSubscribeVO> getTechnicianSubscribeByUserAndShop1(
    List<TechnicianSubscribeVO> getTechnicianSubscribeByUserAndShop1(PageInfo<TechnicianSubscribeVO> pageInfo,
                                                                    @Param("shopId") Long shopId,
                                                                    @Param("status") Integer status,@Param("phone")String phone,
                                                                    @Param("name")String name,

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TechnicianSubscribeService.java

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.other.api.domain.TechnicianSubscribe;
import com.ruoyi.other.vo.TechnicianSubscribeVO;
import io.swagger.annotations.ApiParam;
@@ -22,10 +23,10 @@
    /**
     * 查询用于指定门店的相关预约记录
     */
    List<TechnicianSubscribeVO> getTechnicianSubscribeByUserAndShop(Long shopId, Integer status);
    List<TechnicianSubscribeVO> getTechnicianSubscribeByUserAndShop1(Long shopId, Integer status ,String phone,
    PageInfo<TechnicianSubscribeVO> getTechnicianSubscribeByUserAndShop(Long shopId, Integer status, Integer pageCurr, Integer pageSize);
    PageInfo<TechnicianSubscribeVO> getTechnicianSubscribeByUserAndShop1(Long shopId, Integer status , String phone,
                                                                     String name,
                                                                     Integer serviceMode);
                                                                         Integer serviceMode, Integer pageCurr, Integer pageSize);

    IPage<TechnicianSubscribeVO> getTechnicianSubscribeByUser(Page<TechnicianSubscribe> page, Long userId, Integer status);


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

@@ -69,9 +69,8 @@
        if(goods.getAppointStore() == 1){
            List<Integer> shopIdList = goodsShopMapper.selectList(new LambdaQueryWrapper<GoodsShop>()
                    .eq(GoodsShop::getGoodsId, goodsId)).stream().map(GoodsShop::getShopId).collect(Collectors.toList());
            shops = shopMapper.selectObjs(new LambdaQueryWrapper<Shop>()
                    .select(Shop::getName)
                    .in(shopIdList.size() > 0, Shop::getId, shopIdList));
            shops = shopMapper.selectList(new LambdaQueryWrapper<Shop>()
                    .in(shopIdList.size() > 0, Shop::getId, shopIdList).eq(Shop::getDelFlag, 0));
        }else{
            shops = shopMapper.selectList(new LambdaUpdateWrapper<Shop>().eq(Shop::getDelFlag, 0));
        }

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

@@ -6,6 +6,7 @@
import com.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.account.api.model.AppUser;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.order.feignClient.RemoteOrderGoodsClient;
import com.ruoyi.other.api.domain.TechnicianSubscribe;
@@ -46,8 +47,9 @@
    

    @Override
    public List<TechnicianSubscribeVO> getTechnicianSubscribeByUserAndShop(Long shopId, Integer status) {
        List<TechnicianSubscribeVO> list = technicianSubscribeMapper.getTechnicianSubscribeByUserAndShop(shopId, status);
    public PageInfo<TechnicianSubscribeVO> getTechnicianSubscribeByUserAndShop(Long shopId, Integer status, Integer pageCurr, Integer pageSize) {
        PageInfo<TechnicianSubscribeVO> pageInfo = new PageInfo(pageCurr, pageSize);
        List<TechnicianSubscribeVO> list = technicianSubscribeMapper.getTechnicianSubscribeByUserAndShop(pageInfo, shopId, status);
        for (TechnicianSubscribeVO technicianSubscribeVO : list) {
            Long id = technicianSubscribeVO.getId();
            TechnicianSubscribe technicianSubscribe = this.getById(id);
@@ -55,13 +57,15 @@
            technicianSubscribeVO.setUserName(appUser.getName());
            technicianSubscribeVO.setPhone(appUser.getPhone());
        }
        return list;
        return pageInfo.setRecords(list);
    }
    @Override
    public List<TechnicianSubscribeVO> getTechnicianSubscribeByUserAndShop1(Long shopId, Integer status ,String phone,
    public PageInfo<TechnicianSubscribeVO> getTechnicianSubscribeByUserAndShop1(Long shopId, Integer status , String phone,
                                                                            String name,
                                                                            Integer serviceMode) {
        return technicianSubscribeMapper.getTechnicianSubscribeByUserAndShop1(shopId,status,phone,name,serviceMode);
                                                                                Integer serviceMode, Integer pageCurr, Integer pageSize) {
        PageInfo<TechnicianSubscribeVO> pageInfo = new PageInfo(pageCurr, pageSize);
        List<TechnicianSubscribeVO> technicianSubscribeByUserAndShop1 = technicianSubscribeMapper.getTechnicianSubscribeByUserAndShop1(pageInfo, shopId, status, phone, name, serviceMode);
        return pageInfo.setRecords(technicianSubscribeByUserAndShop1);
    }
    @Override
    public IPage<TechnicianSubscribeVO> getTechnicianSubscribeByUser(Page<TechnicianSubscribe> page, Long userId, Integer status) {