Merge remote-tracking branch 'origin/dev' into dev

无关风月

2025-08-13 983a116ee7ac71f921aa64fdf71197655c8b4aa0

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

@@ -294,8 +294,8 @@
        dataMap.put("trans_amt", money+"");
        Map<String, String> wx_data = new LinkedHashMap<String, String>(); // 使用LinkedHashMap保持顺序
        // todo
        dataMap.put("sub_appid", wechatPayConfig.getAppId());
        dataMap.put("sub_openid", data.getOpenId());
        wx_data.put("sub_appid", wechatPayConfig.getAppId());
        wx_data.put("sub_openid", data.getOpenId());

        dataMap.put("wx_data", wx_data);

@@ -360,14 +360,20 @@
        return R.ok(response.toString());
    }
    public static void main(String[] args) throws IOException {
        SimpleDateFormat date = new SimpleDateFormat("yyyyMMdd");

        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
        String code = sdf.format(new Date()) + UUIDUtil.getNumberRandom(5);



//        return wechatPayService.unifiedOrderApplet(servicePay.getId()+"",code, site.getAnnualServiceFee()+"", "服务费缴纳",data.getOpenId(), "/other/wx/serviceCallback");
        SimpleDateFormat date = new SimpleDateFormat("yyyyMMdd");


        String key = "MIIEwAIBADANBgkqhkiG9w0BAQEFAASCBKowggSmAgEAAoIBAQDAna1TkFL4MRjBiPpGqBbvRy8ojVglU306o01wibafNiE7pvAVjn9aUShSzCA9OkvMld35XLpO4o8ZhetFK5W9mlVGgCVyOSCcApEyadBH8zfRGpL96vQDynhY7QP0Ffgrua5jKXvbIxcqwGO0kdHqQULJFjDoqwknTy+LUWX/IhuViY4hzS79RoQhCmvTM8BaPUY3cGLA7XbRHMgYkkoRrRzfIio2rwEtq+2s2sajPsdM/g0D4ilCOFYUO36+H26uzBWlwBprjEkoPujcdAo93Y3JxkC7ZcVP3ytyFVQTUwNbmeLdK8XPet95ngbmRQyAgN//QItLvIukAJjJp8zNAgMBAAECggEBAJ3QkvKkjVZM47uuP2Ek16W07S6MoGv0u+YPZqOOMdLAxvnZDVycJDwbwq4UEVYZLYGySOzGzN9VQWnoD5vc2hM/IB9jX0r3A4DPmad0ivJolJL+8vCYUNXKTlCN4W9bkLpCqF8W3iPt3E1q1EZeM197mPyo8emwOQ+8EXhUeP1PyJDHGu6EXMApaobGFZy00ggke8h0P7/OZbrf0o9G0u004fH9bfHHREwsa31LsYkQrGBOXXWSO6KGc0wcjK3gIV06DyA9uQNAi8Afd7ga3M/QzTNdg0G5GwVBBIlcg8NA5FFJO6fxmS9kPhWeij7C20iHJfqqc4CEC4ig2w4IgQECgYEA5+tYwnuiFyaiZsdlrSkb7z7NiYPBjtDRz0ZgfT51LMzO3UvegpwpuxZgJFIpL4k5EFfHrkLztUCDzsPdaDFnPKqVzRgBNSFbZ4iTAht9CgX/RSHuBHwiRBZRoWWlL3bKUAIXXHtwpx12nweh+iRE8feGd7VJwrMY3QOqAqtN3YMCgYEA1J2bE2cp0aNZxAYc1CmV6nJxPniQlNV+pCQv3usUaGMJzxqXG1N6ViuB1VxC6WLvy8cp3uMu57Pjae71AcBgjULv5KcCg1cJctwvcv+7ZteJUhg7chr4nLGjdip85UyRqmoTF7EnIPqmDm8aGvWBDCPRTION59G88zgUNEFFa28CgYEAj9JxTtpg4L6Cw/4v3by6qBloWTkuFaUGF+Zq/AB5pfi06KOeL50se+saYCvbgrE0hCALotO+Us7ZbqYkbfMFNKgNEg0q4on3JzOZBxuI5Whmr7ak5n8cuOCmatKgJ9khCZDib+XVLK2m3GRdXMSVRQDdkOsJ/QYYCye0jMczGIUCgYEAlUTtSesErhyr+fZ8qOtlSAr+vGgywXs+BQku3qdWVY8qpM87RUEPQ44aAexbQbVnOz7hg40mMh/WSlosgwVIBAT5nSMvnXwuswgo++jU7ffmfc9rdMnAv2nrpBtiQi3GmskMDHcgTIQMr1eLEWBJMHe5CqnVp+pVaMB3VtR4Y1sCgYEAqg43xBxz6P/3K/PfCMmx4Vh2xpT+V3JLGA7DcnEHOUjG5M9jwkkXBuOp0gdtojEoIlI1c2xd4RFZsl451RKZOc4+YsVS2LzCJQrP0PcMlvMVVCIddm7v//ec7s+hAL5g+VuMyq7YKMXXWfA9a+H2thvrAVagihMho2SNAh+LYn8=";

        // 构建data部分
        Map<String, String> dataMap = new LinkedHashMap<String, String>(); // 使用LinkedHashMap保持顺序
        Map<String, Object> dataMap = new LinkedHashMap<String, Object>(); // 使用LinkedHashMap保持顺序
        dataMap.put("goods_desc", "积分充值");
        dataMap.put("huifu_id", "6666000174575407");
        dataMap.put("notify_url", "http://221.182.45.100:8084/other/wx/integralCallback");
@@ -375,6 +381,12 @@
        dataMap.put("req_seq_id", code);
        dataMap.put("trade_type", "T_MINIAPP");
        dataMap.put("trans_amt", "0.01");
        Map<String, String> wx_data = new LinkedHashMap<String, String>(); // 使用LinkedHashMap保持顺序
        // todo
        wx_data.put("sub_appid", "wx049faf9c5234f31c");
        wx_data.put("sub_openid", "oJiKr7cxOTJAVkOJSYDSOh9kynKE");

        dataMap.put("wx_data", wx_data);

        // 将dataMap转化为json对象

@@ -490,8 +502,13 @@
        if (data != null && data.getSiteId() != null) {
            if (data.getRoleType() == 1) {
                // 平台
                TIntegralRule res = integralRuleService.lambdaQuery().eq(TIntegralRule::getSiteId, 0).one();
                return R.ok(res);
                SysConfig data1 = sysConfigClient.getInfo(8L).getData();
                sysConfigClient.update(data1);
                TIntegralRule tIntegralRule = new TIntegralRule();
                tIntegralRule.setChargeCredit(data1.getConfigValue());
                tIntegralRule.setContent(data1.getRemark());
                tIntegralRule.setSiteId(0);
                return R.ok(tIntegralRule);
            } else if (data.getRoleType() == 3){
                TIntegralRule res = integralRuleService.lambdaQuery().eq(TIntegralRule::getSiteId, data.getSiteId()).one();
                return R.ok(res);
@@ -516,21 +533,24 @@
    public R saveSet(@RequestBody TIntegralRule dto) {
        Long userid = tokenService.getLoginUser().getUserid();
        SysUser data = sysUserClient.getSysUser(userid).getData();
        TIntegralRule one;

        if (data.getRoleType() == 1) {
            one = integralRuleService.lambdaQuery().eq(TIntegralRule::getSiteId, 0).one();
            SysConfig data1 = sysConfigClient.getInfo(8L).getData();
            data1.setConfigValue(dto.getChargeCredit());
            data1.setRemark(dto.getContent());
            sysConfigClient.update(data1);
        } else {
            one = integralRuleService.lambdaQuery().eq(TIntegralRule::getSiteId, data.getSiteId()).one();
            TIntegralRule  one = integralRuleService.lambdaQuery().eq(TIntegralRule::getSiteId, data.getSiteId()).one();
            if (one != null) {
                dto.setId(one.getId());
                dto.setSiteId(data.getSiteId());
                integralRuleService.saveOrUpdate(dto);
            } else {
                dto.setSiteId(data.getSiteId());
                integralRuleService.saveOrUpdate(dto);
            }
        }
        if (one != null) {
            dto.setId(one.getId());
            dto.setSiteId(data.getSiteId());
            integralRuleService.saveOrUpdate(dto);
        } else {
            dto.setSiteId(data.getSiteId());
            integralRuleService.saveOrUpdate(dto);
        }

        return R.ok();
    }