Merge branch 'local_20221010' into huacheng_test

yanghui

2022-10-10 c60eea0ab4d74ab8f39a33f896e978dc591f1800

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WxCallbackApi.java

@@ -192,6 +192,20 @@
        }

    }
    @ApiOperation("ws洗车推送")
    @PostMapping("/wsPush")
    public R wsPush(@RequestBody String aesString){
        try {
            Map<String, String> aesMap= (Map<String, String>) JSON.parse(aesString);
            String desString=MyAESUtil.Decrypt(aesMap.get("aesString"),"Ryo7M3n8loC5Abcd");
            Map<String,String> desMap= (Map) JSON.parse(desString);
            return userService.wsPush(desMap.get("washer_mobile"),desMap.get("phone"),desMap.get("washer_name"),Integer.parseInt(desMap.get("order_status")));
        } catch (Exception e) {
            e.printStackTrace();
            return R.fail("推送失败");
        }

    }

    /**
     * 电动车商城商品购买支付回调
@@ -328,4 +342,9 @@
        buffer.append("</xml>");
        return buffer.toString();
    }

    @GetMapping("/settle")
    public R settle(String settleDate){
        return R.ok(umfPayUtil.settle(settleDate));
    }
}