java/HongRuiTang.git

parent: 47b90193 | 补丁 | 提交 | ignore whitespace

Pu Zhibing

2025-10-31 1b9776f5cb4907fc6e86bac1d53b4ef4f2cae45f

修改阿里账号

8个文件已修改

	ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/OBSUploadUtils.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/util/MsgUtils.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/util/OBSUploadUtils.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/util/MsgUtils.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/util/HuiFuTianXiaUtil.java	102 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/util/MsgUtils.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/util/OBSUploadUtils.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/OBSUploadUtils.java

@@ -44,8 +44,8 @@
        // Endpoint以华东1（杭州）为例，其它Region请按实际情况填写。
        String endpoint = "https://oss-cn-beijing.aliyuncs.com";
        // 阿里云账号AccessKey拥有所有API的访问权限，风险很高。强烈建议您创建并使用RAM用户进行API访问或日常运维，请登录RAM控制台创建RAM用户。
        String accessKeyId = "LTAI5tAfKFuhyKFH12CTkXFj";
        String accessKeySecret = "tIBRuonHuQQPdcYrmlCdXlexOSwVXe";
        String accessKeyId = "LTAI5t9mHM7dhQhH7D6k5rmi";
        String accessKeySecret = "NYPl6J1Iyn241W12XooAUqIAuNpS3U";
        // 填写Bucket名称，例如examplebucket。
        String bucketName = "hongruitang";
        OSS ossClient = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret);

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/util/MsgUtils.java

@@ -27,8 +27,8 @@
    public static void sendMsg(String phoneNumber,Integer sendType,String sendContent) throws Exception {

        StaticCredentialProvider provider = StaticCredentialProvider.create(Credential.builder()
                .accessKeyId("LTAI5tAfKFuhyKFH12CTkXFj")
                .accessKeySecret("tIBRuonHuQQPdcYrmlCdXlexOSwVXe")
                .accessKeyId("LTAI5t9mHM7dhQhH7D6k5rmi")
                .accessKeySecret("NYPl6J1Iyn241W12XooAUqIAuNpS3U")
                .build());

        AsyncClient client = AsyncClient.builder()

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/util/OBSUploadUtils.java

@@ -44,8 +44,8 @@
        // Endpoint以华东1（杭州）为例，其它Region请按实际情况填写。
        String endpoint = "https://oss-cn-beijing.aliyuncs.com";
        // 阿里云账号AccessKey拥有所有API的访问权限，风险很高。强烈建议您创建并使用RAM用户进行API访问或日常运维，请登录RAM控制台创建RAM用户。
        String accessKeyId = "LTAI5tAfKFuhyKFH12CTkXFj";
        String accessKeySecret = "tIBRuonHuQQPdcYrmlCdXlexOSwVXe";
        String accessKeyId = "LTAI5t9mHM7dhQhH7D6k5rmi";
        String accessKeySecret = "NYPl6J1Iyn241W12XooAUqIAuNpS3U";
        // 填写Bucket名称，例如examplebucket。
        String bucketName = "hongruitang";
        OSS ossClient = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret);

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/util/MsgUtils.java

@@ -26,8 +26,8 @@
    public static void sendMsg(String phoneNumber,String templateCode,String sendContent) throws Exception {

        StaticCredentialProvider provider = StaticCredentialProvider.create(Credential.builder()
                .accessKeyId("LTAI5tAfKFuhyKFH12CTkXFj")
                .accessKeySecret("tIBRuonHuQQPdcYrmlCdXlexOSwVXe")
                .accessKeyId("LTAI5t9mHM7dhQhH7D6k5rmi")
                .accessKeySecret("NYPl6J1Iyn241W12XooAUqIAuNpS3U")
                .build());

        AsyncClient client = AsyncClient.builder()

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java

@@ -1184,9 +1184,9 @@
    public void mgtShopHFTXAuth(MgtShopHFTXAuthDto mgtShopHFTXAuthDto) {
        ShopAuthenticationHftx shopAuthenticationHftx = shopAuthenticationHftxService.getOne(new QueryWrapper<ShopAuthenticationHftx>()
                .eq("shop_id", mgtShopHFTXAuthDto.getShopId()).eq("is_delete", 0));
        if(null != shopAuthenticationHftx && Arrays.asList("U", "Y").contains(shopAuthenticationHftx.getAuditStatus())){
            throw new ServiceException("不能重复进件");
        }
//        if(null != shopAuthenticationHftx && Arrays.asList("U", "Y").contains(shopAuthenticationHftx.getAuditStatus())){
//            throw new ServiceException("不能重复进件");
//        }
        if(null == shopAuthenticationHftx){
            shopAuthenticationHftx = new ShopAuthenticationHftx();
            shopAuthenticationHftx.setIsDelete(0);

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/util/HuiFuTianXiaUtil.java

@@ -861,44 +861,56 @@
        data.put("mer_icp", "");
        data.put("open_licence_no", dto.getOpenLicenceNo());
        data.put("head_huifu_id", huifu_id);
        R<String> r = supplementaryPicture(dto.getRegAcctPic(), IdUtils.simpleUUID(), "F08");
        if(r.getCode() == 200){
            data.put("reg_acct_pic", r.getData());
            shopAuthenticationHftx.setRegAcctPicNo(r.getData());
        }else{
            return R.fail(r.getMsg());
        }
        if(!"0".equals(dto.getCardType())){
            r = supplementaryPicture(dto.getSettleCardFrontPic(), IdUtils.simpleUUID(), "F13");
        //企业进件
        if(dto.getType() == 2){
            R<String> r = supplementaryPicture(dto.getRegAcctPic(), IdUtils.simpleUUID(), "F08");
            if(r.getCode() == 200){
                data.put("settle_card_front_pic", r.getData());
                shopAuthenticationHftx.setSettleCardFrontPicNo(r.getData());
                data.put("reg_acct_pic", r.getData());
                shopAuthenticationHftx.setRegAcctPicNo(r.getData());
            }else{
                return R.fail(r.getMsg());
            }
            r = supplementaryPicture(dto.getSettleCertBackPic(), IdUtils.simpleUUID(), "F56");
            if(r.getCode() == 200){
                data.put("settle_cert_back_pic", r.getData());
                shopAuthenticationHftx.setSettleCertBackPicNo(r.getData());
            }else{
                return R.fail(r.getMsg());
            }
            r = supplementaryPicture(dto.getSettleCertFrontPic(), IdUtils.simpleUUID(), "F55");
            if(r.getCode() == 200){
                data.put("settle_cert_front_pic", r.getData());
                shopAuthenticationHftx.setSettleCertFrontPicNo(r.getData());
            }else{
                return R.fail(r.getMsg());
            }
            r = supplementaryPicture(dto.getTaxRegPic(), IdUtils.simpleUUID(), "F58");
            if(r.getCode() == 200){
                data.put("tax_reg_pic", r.getData());
                shopAuthenticationHftx.setTaxRegPicNo(r.getData());
            }else{
                return R.fail(r.getMsg());
            }
            r = supplementaryPicture(dto.getLicensePic(), IdUtils.simpleUUID(), "F07");
            if(r.getCode() == 200){
                data.put("license_pic", r.getData());
                shopAuthenticationHftx.setLicensePicNo(r.getData());
            }else{
                return R.fail(r.getMsg());
            }
            r = supplementaryPicture(dto.getSettleAgreePic(), IdUtils.simpleUUID(), "F116");
            if(r.getCode() == 200){
                JSONObject extended_material = new JSONObject();
                extended_material.put("file_id", r.getData());
                extended_material.put("file_type", "F480");
                extended_material_list.add(extended_material);
                shopAuthenticationHftx.setSettleAgreePicNo(r.getData());
            }else{
                return R.fail(r.getMsg());
            }
        }
        r = supplementaryPicture(dto.getSettleCertBackPic(), IdUtils.simpleUUID(), "F56");
        if(r.getCode() == 200){
            data.put("settle_cert_back_pic", r.getData());
            shopAuthenticationHftx.setSettleCertBackPicNo(r.getData());
        }else{
            return R.fail(r.getMsg());
        }
        r = supplementaryPicture(dto.getSettleCertFrontPic(), IdUtils.simpleUUID(), "F55");
        if(r.getCode() == 200){
            data.put("settle_cert_front_pic", r.getData());
            shopAuthenticationHftx.setSettleCertFrontPicNo(r.getData());
        }else{
            return R.fail(r.getMsg());
        }
        r = supplementaryPicture(dto.getTaxRegPic(), IdUtils.simpleUUID(), "F58");
        if(r.getCode() == 200){
            data.put("tax_reg_pic", r.getData());
            shopAuthenticationHftx.setTaxRegPicNo(r.getData());
        }else{
            return R.fail(r.getMsg());
        }
        r = supplementaryPicture(dto.getLegalCertBackPic(), IdUtils.simpleUUID(), "F03");

        R<String> r = supplementaryPicture(dto.getLegalCertBackPic(), IdUtils.simpleUUID(), "F03");
        if(r.getCode() == 200){
            data.put("legal_cert_back_pic", r.getData());
            shopAuthenticationHftx.setLegalCertBackPicNo(r.getData());
@@ -912,22 +924,14 @@
        }else{
            return R.fail(r.getMsg());
        }
        r = supplementaryPicture(dto.getLicensePic(), IdUtils.simpleUUID(), "F07");
        if(r.getCode() == 200){
            data.put("license_pic", r.getData());
            shopAuthenticationHftx.setLicensePicNo(r.getData());
        }else{
            return R.fail(r.getMsg());
        }
        r = supplementaryPicture(dto.getSettleAgreePic(), IdUtils.simpleUUID(), "F116");
        if(r.getCode() == 200){
            JSONObject extended_material = new JSONObject();
            extended_material.put("file_id", r.getData());
            extended_material.put("file_type", "F480");
            extended_material_list.add(extended_material);
            shopAuthenticationHftx.setSettleAgreePicNo(r.getData());
        }else{
            return R.fail(r.getMsg());
        if(!"0".equals(dto.getCardType())){
            r = supplementaryPicture(dto.getSettleCardFrontPic(), IdUtils.simpleUUID(), "F13");
            if(r.getCode() == 200){
                data.put("settle_card_front_pic", r.getData());
                shopAuthenticationHftx.setSettleCardFrontPicNo(r.getData());
            }else{
                return R.fail(r.getMsg());
            }
        }
        if(!"0".equals(dto.getCardType()) && !dto.getLegalName().equals(dto.getCardName())){
            r = supplementaryPicture(dto.getAuthEnturstPic(), IdUtils.simpleUUID(), "F15");

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/util/MsgUtils.java

@@ -27,8 +27,8 @@
    public static void sendMsg(String phoneNumber,String templateCode,String sendContent) throws Exception {

        StaticCredentialProvider provider = StaticCredentialProvider.create(Credential.builder()
                .accessKeyId("LTAI5tAfKFuhyKFH12CTkXFj")
                .accessKeySecret("tIBRuonHuQQPdcYrmlCdXlexOSwVXe")
                .accessKeyId("LTAI5t9mHM7dhQhH7D6k5rmi")
                .accessKeySecret("NYPl6J1Iyn241W12XooAUqIAuNpS3U")
                .build());

        AsyncClient client = AsyncClient.builder()

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/util/OBSUploadUtils.java

@@ -22,8 +22,8 @@
        // Endpoint以华东1（杭州）为例，其它Region请按实际情况填写。
        String endpoint = "https://oss-cn-beijing.aliyuncs.com";
        // 阿里云账号AccessKey拥有所有API的访问权限，风险很高。强烈建议您创建并使用RAM用户进行API访问或日常运维，请登录RAM控制台创建RAM用户。
        String accessKeyId = "LTAI5tAfKFuhyKFH12CTkXFj";
        String accessKeySecret = "tIBRuonHuQQPdcYrmlCdXlexOSwVXe";
        String accessKeyId = "LTAI5t9mHM7dhQhH7D6k5rmi";
        String accessKeySecret = "NYPl6J1Iyn241W12XooAUqIAuNpS3U";
        // 填写Bucket名称，例如examplebucket。
        String bucketName = "hongruitang";
        OSS ossClient = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret);

			@@ -44,8 +44,8 @@
			// Endpoint以华东1（杭州）为例，其它Region请按实际情况填写。
			String endpoint = "https://oss-cn-beijing.aliyuncs.com";
			// 阿里云账号AccessKey拥有所有API的访问权限，风险很高。强烈建议您创建并使用RAM用户进行API访问或日常运维，请登录RAM控制台创建RAM用户。
			String accessKeyId = "LTAI5tAfKFuhyKFH12CTkXFj";
			String accessKeySecret = "tIBRuonHuQQPdcYrmlCdXlexOSwVXe";
			String accessKeyId = "LTAI5t9mHM7dhQhH7D6k5rmi";
			String accessKeySecret = "NYPl6J1Iyn241W12XooAUqIAuNpS3U";
			// 填写Bucket名称，例如examplebucket。
			String bucketName = "hongruitang";
			OSS ossClient = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret);

			@@ -27,8 +27,8 @@
			public static void sendMsg(String phoneNumber,Integer sendType,String sendContent) throws Exception {

			StaticCredentialProvider provider = StaticCredentialProvider.create(Credential.builder()
			.accessKeyId("LTAI5tAfKFuhyKFH12CTkXFj")
			.accessKeySecret("tIBRuonHuQQPdcYrmlCdXlexOSwVXe")
			.accessKeyId("LTAI5t9mHM7dhQhH7D6k5rmi")
			.accessKeySecret("NYPl6J1Iyn241W12XooAUqIAuNpS3U")
			.build());

			AsyncClient client = AsyncClient.builder()

			@@ -26,8 +26,8 @@
			public static void sendMsg(String phoneNumber,String templateCode,String sendContent) throws Exception {

			StaticCredentialProvider provider = StaticCredentialProvider.create(Credential.builder()
			.accessKeyId("LTAI5tAfKFuhyKFH12CTkXFj")
			.accessKeySecret("tIBRuonHuQQPdcYrmlCdXlexOSwVXe")
			.accessKeyId("LTAI5t9mHM7dhQhH7D6k5rmi")
			.accessKeySecret("NYPl6J1Iyn241W12XooAUqIAuNpS3U")
			.build());

			AsyncClient client = AsyncClient.builder()

			@@ -1184,9 +1184,9 @@
			public void mgtShopHFTXAuth(MgtShopHFTXAuthDto mgtShopHFTXAuthDto) {
			ShopAuthenticationHftx shopAuthenticationHftx = shopAuthenticationHftxService.getOne(new QueryWrapper<ShopAuthenticationHftx>()
			.eq("shop_id", mgtShopHFTXAuthDto.getShopId()).eq("is_delete", 0));
			if(null != shopAuthenticationHftx && Arrays.asList("U", "Y").contains(shopAuthenticationHftx.getAuditStatus())){
			throw new ServiceException("不能重复进件");
			}
			// if(null != shopAuthenticationHftx && Arrays.asList("U", "Y").contains(shopAuthenticationHftx.getAuditStatus())){
			// throw new ServiceException("不能重复进件");
			// }
			if(null == shopAuthenticationHftx){
			shopAuthenticationHftx = new ShopAuthenticationHftx();
			shopAuthenticationHftx.setIsDelete(0);

			@@ -861,44 +861,56 @@
			data.put("mer_icp", "");
			data.put("open_licence_no", dto.getOpenLicenceNo());
			data.put("head_huifu_id", huifu_id);
			R<String> r = supplementaryPicture(dto.getRegAcctPic(), IdUtils.simpleUUID(), "F08");
			if(r.getCode() == 200){
			data.put("reg_acct_pic", r.getData());
			shopAuthenticationHftx.setRegAcctPicNo(r.getData());
			}else{
			return R.fail(r.getMsg());
			}
			if(!"0".equals(dto.getCardType())){
			r = supplementaryPicture(dto.getSettleCardFrontPic(), IdUtils.simpleUUID(), "F13");
			//企业进件
			if(dto.getType() == 2){
			R<String> r = supplementaryPicture(dto.getRegAcctPic(), IdUtils.simpleUUID(), "F08");
			if(r.getCode() == 200){
			data.put("settle_card_front_pic", r.getData());
			shopAuthenticationHftx.setSettleCardFrontPicNo(r.getData());
			data.put("reg_acct_pic", r.getData());
			shopAuthenticationHftx.setRegAcctPicNo(r.getData());
			}else{
			return R.fail(r.getMsg());
			}
			r = supplementaryPicture(dto.getSettleCertBackPic(), IdUtils.simpleUUID(), "F56");
			if(r.getCode() == 200){
			data.put("settle_cert_back_pic", r.getData());
			shopAuthenticationHftx.setSettleCertBackPicNo(r.getData());
			}else{
			return R.fail(r.getMsg());
			}
			r = supplementaryPicture(dto.getSettleCertFrontPic(), IdUtils.simpleUUID(), "F55");
			if(r.getCode() == 200){
			data.put("settle_cert_front_pic", r.getData());
			shopAuthenticationHftx.setSettleCertFrontPicNo(r.getData());
			}else{
			return R.fail(r.getMsg());
			}
			r = supplementaryPicture(dto.getTaxRegPic(), IdUtils.simpleUUID(), "F58");
			if(r.getCode() == 200){
			data.put("tax_reg_pic", r.getData());
			shopAuthenticationHftx.setTaxRegPicNo(r.getData());
			}else{
			return R.fail(r.getMsg());
			}
			r = supplementaryPicture(dto.getLicensePic(), IdUtils.simpleUUID(), "F07");
			if(r.getCode() == 200){
			data.put("license_pic", r.getData());
			shopAuthenticationHftx.setLicensePicNo(r.getData());
			}else{
			return R.fail(r.getMsg());
			}
			r = supplementaryPicture(dto.getSettleAgreePic(), IdUtils.simpleUUID(), "F116");
			if(r.getCode() == 200){
			JSONObject extended_material = new JSONObject();
			extended_material.put("file_id", r.getData());
			extended_material.put("file_type", "F480");
			extended_material_list.add(extended_material);
			shopAuthenticationHftx.setSettleAgreePicNo(r.getData());
			}else{
			return R.fail(r.getMsg());
			}
			}
			r = supplementaryPicture(dto.getSettleCertBackPic(), IdUtils.simpleUUID(), "F56");
			if(r.getCode() == 200){
			data.put("settle_cert_back_pic", r.getData());
			shopAuthenticationHftx.setSettleCertBackPicNo(r.getData());
			}else{
			return R.fail(r.getMsg());
			}
			r = supplementaryPicture(dto.getSettleCertFrontPic(), IdUtils.simpleUUID(), "F55");
			if(r.getCode() == 200){
			data.put("settle_cert_front_pic", r.getData());
			shopAuthenticationHftx.setSettleCertFrontPicNo(r.getData());
			}else{
			return R.fail(r.getMsg());
			}
			r = supplementaryPicture(dto.getTaxRegPic(), IdUtils.simpleUUID(), "F58");
			if(r.getCode() == 200){
			data.put("tax_reg_pic", r.getData());
			shopAuthenticationHftx.setTaxRegPicNo(r.getData());
			}else{
			return R.fail(r.getMsg());
			}
			r = supplementaryPicture(dto.getLegalCertBackPic(), IdUtils.simpleUUID(), "F03");

			R<String> r = supplementaryPicture(dto.getLegalCertBackPic(), IdUtils.simpleUUID(), "F03");
			if(r.getCode() == 200){
			data.put("legal_cert_back_pic", r.getData());
			shopAuthenticationHftx.setLegalCertBackPicNo(r.getData());
			@@ -912,22 +924,14 @@
			}else{
			return R.fail(r.getMsg());
			}
			r = supplementaryPicture(dto.getLicensePic(), IdUtils.simpleUUID(), "F07");
			if(r.getCode() == 200){
			data.put("license_pic", r.getData());
			shopAuthenticationHftx.setLicensePicNo(r.getData());
			}else{
			return R.fail(r.getMsg());
			}
			r = supplementaryPicture(dto.getSettleAgreePic(), IdUtils.simpleUUID(), "F116");
			if(r.getCode() == 200){
			JSONObject extended_material = new JSONObject();
			extended_material.put("file_id", r.getData());
			extended_material.put("file_type", "F480");
			extended_material_list.add(extended_material);
			shopAuthenticationHftx.setSettleAgreePicNo(r.getData());
			}else{
			return R.fail(r.getMsg());
			if(!"0".equals(dto.getCardType())){
			r = supplementaryPicture(dto.getSettleCardFrontPic(), IdUtils.simpleUUID(), "F13");
			if(r.getCode() == 200){
			data.put("settle_card_front_pic", r.getData());
			shopAuthenticationHftx.setSettleCardFrontPicNo(r.getData());
			}else{
			return R.fail(r.getMsg());
			}
			}
			if(!"0".equals(dto.getCardType()) && !dto.getLegalName().equals(dto.getCardName())){
			r = supplementaryPicture(dto.getAuthEnturstPic(), IdUtils.simpleUUID(), "F15");

			@@ -22,8 +22,8 @@
			// Endpoint以华东1（杭州）为例，其它Region请按实际情况填写。
			String endpoint = "https://oss-cn-beijing.aliyuncs.com";
			// 阿里云账号AccessKey拥有所有API的访问权限，风险很高。强烈建议您创建并使用RAM用户进行API访问或日常运维，请登录RAM控制台创建RAM用户。
			String accessKeyId = "LTAI5tAfKFuhyKFH12CTkXFj";
			String accessKeySecret = "tIBRuonHuQQPdcYrmlCdXlexOSwVXe";
			String accessKeyId = "LTAI5t9mHM7dhQhH7D6k5rmi";
			String accessKeySecret = "NYPl6J1Iyn241W12XooAUqIAuNpS3U";
			// 填写Bucket名称，例如examplebucket。
			String bucketName = "hongruitang";
			OSS ossClient = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret);