添加订单虚拟号

xuhy

7 天以前 fd62966c143760e8c2affaaec614200bb732f4cc

 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/FranchiseeController.java

@@ -11,13 +11,13 @@
import com.alipay.api.AlipayApiException;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.admin.config.WeChatConfig;
import com.ruoyi.admin.entity.*;
import com.ruoyi.admin.service.*;
import com.ruoyi.admin.utils.MD5AndKL;
import com.ruoyi.admin.utils.WeChatUtil;
import com.ruoyi.admin.utils.util.CreateLinkStringByGet1;
import com.ruoyi.admin.utils.util.HttpRequester;
import com.ruoyi.admin.utils.util.HttpRespons;
@@ -29,18 +29,12 @@
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.wechat.pay.contrib.apache.httpclient.auth.PrivateKeySigner;
import com.wechat.pay.contrib.apache.httpclient.util.PemUtil;
import com.wechat.pay.java.core.exception.MalformedMessageException;
import com.wechat.pay.java.core.exception.ServiceException;
import com.wechat.pay.java.core.notification.NotificationParser;
import com.wechat.pay.java.service.partnerpayments.app.model.Transaction;
import com.wechat.pay.java.service.payments.jsapi.model.Amount;
import com.wechat.pay.java.service.payments.jsapi.JsapiService;
import com.wechat.pay.java.service.payments.jsapi.model.Payer;
import com. wechat. pay. java. service. payments. jsapi. model. PrepayRequest;
import com.wechat.pay.java.service.payments.jsapi.model.PrepayResponse;
import com.wechat.pay.java.service.payments.nativepay.NativePayService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -49,9 +43,9 @@
import lombok.Getter;
import org.apache.commons.codec.CharEncoding;
import org.apache.poi.util.IOUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

@@ -61,14 +55,12 @@
import java.io.*;
import java.math.BigDecimal;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.security.PrivateKey;
import java.security.SecureRandom;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;


/**
@@ -908,6 +900,11 @@
        if(!list1.isEmpty()){
            return R.passwordError("该管理员账号已存在！");
        }
        // 设置加盟商初始密码
        List<Franchisee> franchiseeList = franchiseeService.list();
        if (!CollectionUtils.isEmpty(franchiseeList)){
            franchisee.setPayPassword(franchiseeList.get(0).getPayPassword());
        }
        boolean save = franchiseeService.save(franchisee);
        // 生成sysUser账号
        SysUser sysUser = new SysUser();
@@ -1104,5 +1101,25 @@
        return R.ok();
    }

    /**
     * 设置加盟商是否显示司机信息
     *
     */
    @ApiOperation(value = "加盟商设置是否显示【202509】",notes = "id:加盟商id,isDisplay:是否显示 1=是 0=否", tags = {"后台-加盟商管理"})
    @PutMapping(value = "/setIsDisplay")
    public R<String> setIsDisplay(@RequestParam(value = "id") Integer id,
                                 @RequestParam(value = "isDisplay") Integer isDisplay) {
        Franchisee franchisee = franchiseeService.getById(id);
        franchisee.setIsDisplay(isDisplay);
        franchiseeService.updateById(franchisee);
        // 查询用户信息
        SysUser sysUser = sysUserService.getOne(Wrappers.lambdaQuery(SysUser.class)
                .eq(SysUser::getFranchiseeId, id));
        if (Objects.nonNull(sysUser)) {
            sysUser.setIsDisplay(isDisplay);
            sysUserService.updateById(sysUser);
        }
        return R.ok();
    }

}