Merge branch 'huacheng_test' into huacheng

101captain

2022-06-24 21900bb8a3d70c02ba1165b73cdffcd64c8bba1d

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/umf/UmfPayUtil.java

@@ -25,8 +25,8 @@
        Map respMap = instance.miniProgramPayMap(reqMapPublic);
        return respMap;
    }
    public Map repay(String orderid,String merdate,String amount,String refundNo,String refundAmount,String orgAmount){
        Map reqMapPublic=prepareRepay(orderid,merdate,amount,refundNo,refundAmount,orgAmount);
    public Map repay(String orderid,String merdate,String refundNo,String refundAmount,String orgAmount){
        Map reqMapPublic=prepareRepay(orderid,merdate,refundNo,refundAmount,orgAmount);
        UmfService instance = new UmfServiceImpl("53461",file);
        Map respMap=instance.generalRefundMap(reqMapPublic);
        return respMap;
@@ -50,12 +50,11 @@
        return reqMap;
    }
    //小程序支付请求参数
    public static Map prepareRepay(String orderid,String merdate,String amount,String refundNo,String refundAmount,String orgAmount) {
    public static Map prepareRepay(String orderid,String merdate,String refundNo,String refundAmount,String orgAmount) {
        Map reqMap = new HashMap();
        reqMap.put("mer_id","53461");
        reqMap.put("order_id",orderid);
        reqMap.put("mer_date",merdate);
        reqMap.put("amount",amount);
        reqMap.put("refund_no",refundNo);
        reqMap.put("refund_amount",refundAmount);
        reqMap.put("org_amount",orgAmount);