Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

puzhibing

2024-01-30 c4addd15f7adca50420f7ced176c4a7192219273

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java

@@ -287,17 +287,9 @@
            return ERROR;
        }
    }
    public static void main(String[] args) {
        String bankName = "中国工商银行"; // 要转换为简写的银行名称

        Pattern pattern = Pattern.compile("([\\u4e00-\\u9fa5]+)(?=\\s+[A-Za-z]+$)");
        Matcher matcher = pattern.matcher(bankName);
        if (matcher.find()) {
            System.out.println(matcher.group()); // 输出结果："工商银行" -> "ICBC"
        } else {
            System.out.println("无法识别该银行名称！");
        }
    }


    /**
     * 支付宝商户认证提交
     */
@@ -398,6 +390,12 @@
        operatorAuth.setShopProvince(shopProvince);
        operatorAuth.setShopProvinceCode(shopProvinceCode);
        operatorAuth.setShopCityCode(shopCityCode);
        if(StringUtils.hasLength(province)&& province.equals("请选择省")){
            operatorAuth.setProvince(null);
        }
        if(StringUtils.hasLength(city)&& province.equals("请选择市")){
            operatorAuth.setCity(null);
        }
        operatorAuth.setProvince(province);
        operatorAuth.setProvinceCode(provinceCode);
        operatorAuth.setShopDistrict(shopDistrict);
@@ -443,7 +441,6 @@
                "      \"mobile\":\""+phone+"\"," +
                "    }" +
                "  ],";

        // todo 拼接
        String biz_cards="  \"biz_cards\":[" +
                "    {" +
@@ -493,6 +490,9 @@
        if (accountType.equals("bankCard")){
            request.setBizContent(param
                    + biz_cards+res);
        }else{
            request.setBizContent(param
                    +res);
        }
        AntMerchantExpandIndirectZftCreateResponse response = null;
        try {
@@ -507,6 +507,7 @@
            String order_no = json1.getString("order_id");
            System.err.println("订单号"+order_no);
            operatorAuth.setOrderNo(order_no);
            operatorAuth.setRefuseReason("");
            operatorAuthService.saveOrUpdate(operatorAuth);
            Integer userId = operatorService.getById(operatorId).getUserId();
            OperatorUser user = operatorUserService.getOne(new QueryWrapper<OperatorUser>().eq("userId", userId));
@@ -517,6 +518,7 @@
            }else{
                user.setAlipayType(1);
            }
            operatorUserService.saveOrUpdate(user);
        } else {
            if (response.getCode().equals("40004")){
                String subMsg = response.getSubMsg();
@@ -575,15 +577,10 @@
     */
    @RequestMapping(value = "/proportion")
    @ResponseBody
    public Object auth(Integer operatorIdOne ,String alipayProportion,String alipayNum,String wechatProportion,
                       String wechatNum) {
        Integer id1 = operatorService.getOne(new QueryWrapper<TOperator>().eq("id", operatorIdOne))
                .getUserId();
        OperatorUser id = operatorUserService.getOne(new QueryWrapper<OperatorUser>().eq("userId", id1));
    public Object auth(Integer operatorIdOne ,String alipayProportion,String wechatProportion) {
        OperatorUser id = operatorUserService.getOne(new QueryWrapper<OperatorUser>().eq("operatorId", operatorIdOne));
        id.setAlipayProportion(alipayProportion);
        id.setWechatProportion(wechatProportion);
        id.setAlipayNum(alipayNum);
        id.setWechatNum(wechatNum);
        operatorUserService.updateById(id);
        return SUCCESS_TIP;
    }