Merge remote-tracking branch 'origin/master'

mitao

2025-11-22 f85face731c824dab846a152900457662cf75d3a

 DriverJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/CallbackController.java

@@ -104,6 +104,49 @@
        }
    }

    @ResponseBody
    @PostMapping("/DGReassignZfb")
    public void DGReassignZfb(HttpServletRequest request, HttpServletResponse response){
        try {
            String sign =request.getParameter("sign");
            String resp_data = request.getParameter("resp_data");
            System.out.println(sign);
            System.out.println(resp_data);
            resp_data =  resp_data.replaceAll("& #40;", "(").replaceAll("& #41;",")");
            boolean verify = RsaUtils.verify(resp_data, "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsWrruP9JBxrUd8uEX5Z8y7pg/UIr5RNHSgDnHqNI1hbi2MfTzB5vZ275wSFFaLDD9BesgDWqsUepPS/opROlDCg9y6WYH8mkN23NmHL9F8kT48OMmH722am+Hp0XVMMwXqA0oNt4f7oW6kDemjZW8/RT4vIE7cyxoxSsVRvjqSpx9wDgFLPWh3o0pHQaoxLyeUsGBATHFrxEDlosBvsuXjMcgjPKXALrcemzKOhBmBkLgyxNVmh61ZK+FNXd+/X4PeZlnWf54NRQAUKe1308E6IIaszo+CjneKuhj1m/X4f7AIvxAqlhuCV5E/DfKRmGopxaWqdtE960Y/H4SmBh2wIDAQAB", sign);
//            Map<String, String> map = payMoneyUtil.weixinpayCallback(request);


            if(verify){
                JSONObject jsonObject = JSONObject.parseObject(resp_data);
                String order_id = jsonObject.get("out_trans_id").toString();
                String out_trade_no = jsonObject.get("req_seq_id").toString();
                String trans_stat = jsonObject.get("trans_stat").toString();
                if("S".equals(trans_stat)){
                    // TODO 司机云闪付 改派微信回调支付充值
//                    String[] s = id.split("_");
//                    if(Integer.valueOf(s[1]) == 3) {//跨城订单
//                        System.out.println("跨城订单");
//                        String[] split1 = s[0].split(",");
//                        List<Reassign> reassigns = reassignService.selectBatchIds(Arrays.asList(split1));
//                        cloudPay(reassigns.get(0).getOriginalDriverId(),map.get("total_fee"),map.get("transaction_id"),1);
//                    }else {
//                        Reassign reassign = reassignService.selectById(s[0]);
//                        cloudPay(reassign.getOriginalDriverId(),map.get("total_fee"),map.get("transaction_id"),1);
//                    }
                    PrintWriter out = response.getWriter();
                    out.write(200);
                    out.flush();
                    out.close();
                    String[] split = out_trade_no.split("_");
                    reassignService.payReassign(split[0], order_id, 2);
                }
            }
        }catch (Exception e){
            e.printStackTrace();
        }
    }